From: Eric Bénard Date: Sun, 20 Jun 2010 19:22:54 +0000 (+0200) Subject: eukrea_mbimx27: fix audio support when SOC is compiled as module X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e8c74860a724c714fbf041a779d7cfd147145b6f;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git eukrea_mbimx27: fix audio support when SOC is compiled as module Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer --- diff --git a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c index 80f62680340..d66a6c43958 100644 --- a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c @@ -96,7 +96,8 @@ static int eukrea_mbimx27_pins[] = { PD30_PF_CSPI1_MISO, PD31_PF_CSPI1_MOSI, /* SSI4 */ -#if defined(CONFIG_SND_SOC_EUKREA_TLV320) +#if defined(CONFIG_SND_SOC_EUKREA_TLV320) \ + || defined(CONFIG_SND_SOC_EUKREA_TLV320_MODULE) PC16_PF_SSI4_FS, PC17_PF_SSI4_RXD | GPIO_PUEN, PC18_PF_SSI4_TXD | GPIO_PUEN, @@ -333,7 +334,8 @@ void __init eukrea_mbimx27_baseboard_init(void) mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins, ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27"); -#if defined(CONFIG_SND_SOC_EUKREA_TLV320) +#if defined(CONFIG_SND_SOC_EUKREA_TLV320) \ + || defined(CONFIG_SND_SOC_EUKREA_TLV320_MODULE) /* SSI unit master I2S codec connected to SSI_PINS_4*/ mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, MXC_AUDMUX_V1_PCR_SYN |