Commit 3feb24e03d057ea36e09f79402ed67b4c2397ece
1 parent
99fb0d852a
Exists in
master
arm:omap:am335x: fix module build support for Audio
Module build adds CONFIG_xxx_MODULE config option which different than regular CONFIG_xxxx option. This patch corrects the same for audio by checking both options. Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Showing 3 changed files with 6 additions and 3 deletions Side-by-side Diff
arch/arm/include/asm/hardware/asp.h
... | ... | @@ -135,7 +135,8 @@ |
135 | 135 | #define DAVINCI_MCASP_IIS_MODE 0 |
136 | 136 | #define DAVINCI_MCASP_DIT_MODE 1 |
137 | 137 | |
138 | -#if (defined(CONFIG_SOC_OMAPAM33XX) && defined(CONFIG_SND_AM33XX_SOC)) | |
138 | +#if (defined(CONFIG_SOC_OMAPAM33XX) && (defined(CONFIG_SND_AM33XX_SOC) \ | |
139 | + || (defined(CONFIG_SND_AM33XX_SOC_MODULE)))) | |
139 | 140 | #define davinci_gen_pool omap_gen_pool |
140 | 141 | #endif |
141 | 142 |
arch/arm/mach-omap2/devices.c
... | ... | @@ -178,7 +178,8 @@ |
178 | 178 | |
179 | 179 | } |
180 | 180 | |
181 | -#if defined (CONFIG_SND_AM335X_SOC_EVM) | |
181 | +#if defined(CONFIG_SND_AM335X_SOC_EVM) || \ | |
182 | + defined(CONFIG_SND_AM335X_SOC_EVM_MODULE) | |
182 | 183 | static struct resource am335x_mcasp1_resource[] = { |
183 | 184 | { |
184 | 185 | .name = "mcasp1", |
... | ... | @@ -217,7 +218,7 @@ |
217 | 218 | void __init am335x_register_mcasp1(struct snd_platform_data *pdata) {} |
218 | 219 | #endif |
219 | 220 | |
220 | -#if defined(CONFIG_SND_AM33XX_SOC) | |
221 | +#if (defined(CONFIG_SND_AM33XX_SOC) || (defined(CONFIG_SND_AM33XX_SOC_MODULE))) | |
221 | 222 | struct platform_device am33xx_pcm_device = { |
222 | 223 | .name = "davinci-pcm-audio", |
223 | 224 | .id = -1, |