diff options
author | Sekhar Nori <nsekhar@ti.com> | 2016-07-12 10:16:13 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 08:44:43 -0400 |
commit | 933b11aeeda111c6af7a7350cbe0bc331b833d41 (patch) | |
tree | 05e2e6f87edf1420fc2fda76f2b2506171c59132 | |
parent | efea375fa93bde40214421ba176221438176cd06 (diff) |
ARM: davinci: fix build break because of undeclared dm365_evm_snd_data
commit 6bce5efd4424 ("ARM: davinci: remove unused davinci-i2s pdata")
removed all instances of davinci-i2s pdata. However, on DM365 EVM,
the same platform data is passed to the voicecodec present on that
device.
This causes build breakage when voicecodec support is enabled:
arch/arm/mach-davinci/board-dm365-evm.c:764:17: error: 'dm365_evm_snd_data' undeclared (first use in this function)
voicecodec driver does not use the platform data as well, and
it is safe to remove it.
Fixes: 6bce5efd4424 ("ARM: davinci: remove unused davinci-i2s pdata")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-davinci/board-dm365-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/davinci.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/dm365.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index e832949bc767..0464999b7137 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c | |||
@@ -761,7 +761,7 @@ static __init void dm365_evm_init(void) | |||
761 | #ifdef CONFIG_SND_DM365_AIC3X_CODEC | 761 | #ifdef CONFIG_SND_DM365_AIC3X_CODEC |
762 | dm365_init_asp(); | 762 | dm365_init_asp(); |
763 | #elif defined(CONFIG_SND_DM365_VOICE_CODEC) | 763 | #elif defined(CONFIG_SND_DM365_VOICE_CODEC) |
764 | dm365_init_vc(&dm365_evm_snd_data); | 764 | dm365_init_vc(); |
765 | #endif | 765 | #endif |
766 | dm365_init_rtc(); | 766 | dm365_init_rtc(); |
767 | dm365_init_ks(&dm365evm_ks_data); | 767 | dm365_init_ks(&dm365evm_ks_data); |
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index d1f8e29f1e30..c62b90c6118a 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h | |||
@@ -92,7 +92,7 @@ int dm355_gpio_register(void); | |||
92 | /* DM365 function declarations */ | 92 | /* DM365 function declarations */ |
93 | void dm365_init(void); | 93 | void dm365_init(void); |
94 | void dm365_init_asp(void); | 94 | void dm365_init_asp(void); |
95 | void dm365_init_vc(struct snd_platform_data *pdata); | 95 | void dm365_init_vc(void); |
96 | void dm365_init_ks(struct davinci_ks_platform_data *pdata); | 96 | void dm365_init_ks(struct davinci_ks_platform_data *pdata); |
97 | void dm365_init_rtc(void); | 97 | void dm365_init_rtc(void); |
98 | void dm365_init_spi0(unsigned chipselect_mask, | 98 | void dm365_init_spi0(unsigned chipselect_mask, |
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 95fbfd962c79..ef3add999263 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c | |||
@@ -1151,11 +1151,10 @@ void __init dm365_init_asp(void) | |||
1151 | platform_device_register(&dm365_asp_device); | 1151 | platform_device_register(&dm365_asp_device); |
1152 | } | 1152 | } |
1153 | 1153 | ||
1154 | void __init dm365_init_vc(struct snd_platform_data *pdata) | 1154 | void __init dm365_init_vc(void) |
1155 | { | 1155 | { |
1156 | davinci_cfg_reg(DM365_EVT2_VC_TX); | 1156 | davinci_cfg_reg(DM365_EVT2_VC_TX); |
1157 | davinci_cfg_reg(DM365_EVT3_VC_RX); | 1157 | davinci_cfg_reg(DM365_EVT3_VC_RX); |
1158 | dm365_vc_device.dev.platform_data = pdata; | ||
1159 | platform_device_register(&dm365_vc_device); | 1158 | platform_device_register(&dm365_vc_device); |
1160 | } | 1159 | } |
1161 | 1160 | ||