On 26/06/14 22:20, Jyri Sarha wrote: > Integrate ASoC DAI component driver in to the OMAP hdmi driver. The > patch also updates the relevant entry in ti,omap5-dss DT binding > document. The driver registers a dummy hdmi codec driver and a > simple-card driver to produce a fully functional ALSA device. The DAI > driver is implemented in hdmi_audio.c, but it still needs to be > registered from hdmi4.c or hdmi5.c. > > Signed-off-by: Jyri Sarha <jsarha@xxxxxx> > --- > drivers/video/fbdev/omap2/dss/Makefile | 2 + > drivers/video/fbdev/omap2/dss/hdmi.h | 38 +++- > drivers/video/fbdev/omap2/dss/hdmi_audio.c | 317 ++++++++++++++++++++++++++++ > 3 files changed, 355 insertions(+), 2 deletions(-) > create mode 100644 drivers/video/fbdev/omap2/dss/hdmi_audio.c > > diff --git a/drivers/video/fbdev/omap2/dss/Makefile b/drivers/video/fbdev/omap2/dss/Makefile > index 245f933..8260987 100644 > --- a/drivers/video/fbdev/omap2/dss/Makefile > +++ b/drivers/video/fbdev/omap2/dss/Makefile > @@ -14,5 +14,7 @@ omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o > omapdss-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \ > hdmi_phy.o > omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o > +omapdss-$(CONFIG_OMAP4_DSS_HDMI_AUDIO) += hdmi_audio.o > omapdss-$(CONFIG_OMAP5_DSS_HDMI) += hdmi5.o hdmi5_core.o > +omapdss-$(CONFIG_OMAP5_DSS_HDMI_AUDIO) += hdmi_audio.o This adds the hdmi_audio.o twice. I'm not sure what the linker does, but I don't think that's correct. Maybe have a internal CONFIG_OMAP_DSS_HDMI_AUDIO option, which is selected if OMAP4 or OMAP5 HDMI AUDIO is selected by the user. That same internal option could be used in the code also (where is applies), instead of "if OMAP4_AUDIO || OMAP5_AUDIO". Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature
