[alsa-devel] [PATCH 04/12] OMAPDSS: hdmi_audio: Integrated ASoC DAI component driver implementation

[Jyri Sarha]

On 06/27/2014 02:57 PM, Tomi Valkeinen wrote:
> On 26/06/14 22:20, Jyri Sarha wrote:
...
>> --- 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.
>

Well, it works, but it is ugly.

> 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".
>

I'll implement your suggestion.

Cheers,
Jyri