diff options
| author | Ricardo Neri <ricardo.neri@ti.com> | 2012-10-15 16:53:33 -0500 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-11-27 11:42:53 +0800 |
| commit | 21ebcd0cd32789dd9ce87e7246a91cd9f59bda13 (patch) | |
| tree | 8c1bcb2e6f4e7141eeaffbb621a5eb930a6b3e7b | |
| parent | 1f1c941e2f6cd16b139291b00646286277c0b0a1 (diff) | |
ARM: OMAP4+: Relocate the creation of HDMI device to board files
The purpose of the device being relocated is to describe how the
HDMI output is wired on the 4430SDP and OMAP4 Panda boards. Hence,
it makes sense to relocate them on the applicable board files.
This device is used by the ASoC OMAP HDMI machine driver.
Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 17 |
3 files changed, 12 insertions, 17 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 5bd04b2b766..5828a469ace 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -391,6 +391,11 @@ static struct platform_device sdp4430_hdmi_audio_codec = { .id = -1, }; +static struct platform_device sdp4430_hdmi_tpd12s015_audio = { + .name = "omap-hdmi-tpd12s015-audio", + .id = -1, +}; + static struct platform_device sdp4430_spdif_dit_codec = { .name = "spdif-dit", .id = -1, @@ -433,6 +438,7 @@ static struct platform_device *sdp4430_devices[] __initdata = { &sdp4430_spdif_dit_codec, &sdp4430_abe_audio, &sdp4430_hdmi_audio_codec, + &sdp4430_hdmi_tpd12s015_audio, }; static struct omap_musb_board_data musb_board_data = { diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 0d8bb566e04..a1fdebebd2b 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -132,6 +132,11 @@ static struct platform_device panda_hdmi_audio_codec = { .id = -1, }; +static struct platform_device panda_hdmi_tpd12s015_audio = { + .name = "omap-hdmi-tpd12s015-audio", + .id = -1, +}; + static struct platform_device panda_spdif_dit_codec = { .name = "spdif-dit", .id = -1, @@ -147,6 +152,7 @@ static struct platform_device *panda_devices[] __initdata = { &wl1271_device, &panda_abe_audio, &panda_hdmi_audio_codec, + &panda_hdmi_tpd12s015_audio, &panda_spdif_dit_codec, &btwilink_device, }; diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 56f3948f954..e150a84e9e3 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -383,22 +383,6 @@ static void __init omap_init_dmic(void) static inline void omap_init_dmic(void) {} #endif -#if defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI) || \ - defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI_MODULE) - -static struct platform_device omap_hdmi_audio = { - .name = "omap-hdmi-audio", - .id = -1, -}; - -static void __init omap_init_hdmi_audio(void) -{ - platform_device_register(&omap_hdmi_audio); -} -#else -static inline void omap_init_hdmi_audio(void) {} -#endif - #if defined(CONFIG_SND_OMAP_SOC_ABE) || \ defined(CONFIG_SND_OMAP_SOC_ABE_MODULE) @@ -749,7 +733,6 @@ static int __init omap2_init_devices(void) if (!of_have_populated_dt()) { omap_init_aess(); omap_init_dmic(); - omap_init_hdmi_audio(); omap_init_mcpdm(); omap_init_mcspi(); } |