diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-03-05 09:30:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-05 19:03:00 -0500 |
commit | 3c77c29c49c6213c55ad8dacc687817b3568c0ce (patch) | |
tree | aa2470aafbd4434d3d7429265ed70e163d45b7f8 /arch/arm/mach-imx/Kconfig | |
parent | 3bc34a6143359d2bf19a5e79b9017aeffc6660ad (diff) |
ASoC: imx: move audmux driver into sound/soc/imx
As audmux becomes a platform driver and its callers are all ASoC
machine drivers, there is no reason to keep it in arch folder, so
move it to sound/soc/imx.
One bonus point would be those ASoC machine drivers stop including
mach/audmux.h, since it's been moved to sound/soc/imx/imx-audmux.h.
This should be a move to the right direction in terms of single kernel
image goal.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 495a8543e71..3919fba52ac 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -46,7 +46,6 @@ config SOC_IMX21 | |||
46 | bool | 46 | bool |
47 | select MACH_MX21 | 47 | select MACH_MX21 |
48 | select CPU_ARM926T | 48 | select CPU_ARM926T |
49 | select ARCH_MXC_AUDMUX | ||
50 | select IMX_HAVE_DMA_V1 | 49 | select IMX_HAVE_DMA_V1 |
51 | select IMX_HAVE_IOMUX_V1 | 50 | select IMX_HAVE_IOMUX_V1 |
52 | select MXC_AVIC | 51 | select MXC_AVIC |
@@ -55,7 +54,6 @@ config SOC_IMX25 | |||
55 | bool | 54 | bool |
56 | select ARCH_MX25 | 55 | select ARCH_MX25 |
57 | select CPU_ARM926T | 56 | select CPU_ARM926T |
58 | select ARCH_MXC_AUDMUX | ||
59 | select ARCH_MXC_IOMUX_V3 | 57 | select ARCH_MXC_IOMUX_V3 |
60 | select MXC_AVIC | 58 | select MXC_AVIC |
61 | 59 | ||
@@ -63,7 +61,6 @@ config SOC_IMX27 | |||
63 | bool | 61 | bool |
64 | select MACH_MX27 | 62 | select MACH_MX27 |
65 | select CPU_ARM926T | 63 | select CPU_ARM926T |
66 | select ARCH_MXC_AUDMUX | ||
67 | select IMX_HAVE_DMA_V1 | 64 | select IMX_HAVE_DMA_V1 |
68 | select IMX_HAVE_IOMUX_V1 | 65 | select IMX_HAVE_IOMUX_V1 |
69 | select MXC_AVIC | 66 | select MXC_AVIC |
@@ -72,7 +69,6 @@ config SOC_IMX31 | |||
72 | bool | 69 | bool |
73 | select CPU_V6 | 70 | select CPU_V6 |
74 | select IMX_HAVE_PLATFORM_MXC_RNGA | 71 | select IMX_HAVE_PLATFORM_MXC_RNGA |
75 | select ARCH_MXC_AUDMUX | ||
76 | select MXC_AVIC | 72 | select MXC_AVIC |
77 | select SMP_ON_UP if SMP | 73 | select SMP_ON_UP if SMP |
78 | 74 | ||
@@ -80,7 +76,6 @@ config SOC_IMX35 | |||
80 | bool | 76 | bool |
81 | select CPU_V6 | 77 | select CPU_V6 |
82 | select ARCH_MXC_IOMUX_V3 | 78 | select ARCH_MXC_IOMUX_V3 |
83 | select ARCH_MXC_AUDMUX | ||
84 | select HAVE_EPIT | 79 | select HAVE_EPIT |
85 | select MXC_AVIC | 80 | select MXC_AVIC |
86 | select SMP_ON_UP if SMP | 81 | select SMP_ON_UP if SMP |
@@ -89,7 +84,6 @@ config SOC_IMX5 | |||
89 | select CPU_V7 | 84 | select CPU_V7 |
90 | select MXC_TZIC | 85 | select MXC_TZIC |
91 | select ARCH_MXC_IOMUX_V3 | 86 | select ARCH_MXC_IOMUX_V3 |
92 | select ARCH_MXC_AUDMUX | ||
93 | select ARCH_HAS_CPUFREQ | 87 | select ARCH_HAS_CPUFREQ |
94 | select ARCH_MX5 | 88 | select ARCH_MX5 |
95 | bool | 89 | bool |