diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-03-05 09:30:51 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-05 19:02:51 -0500 |
| commit | 2405fc9728a3ed7dffc36bee68f0c36e4488212d (patch) | |
| tree | 60f0a574896868e087d4edf6f22f326c9aa0d52f /arch/arm/mach-imx/Kconfig | |
| parent | 17ec38a8b6d95100a585ed66ccc7bada13e09d0d (diff) | |
ARM: imx: merge audmux-v1 and audmux-v2
It merges audmux-v1 and audmux-v2 under arch/arm/plat-mxc into one.
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 4defb97bbfc8..495a8543e71e 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -46,7 +46,7 @@ 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_V1 | 49 | select ARCH_MXC_AUDMUX |
| 50 | select IMX_HAVE_DMA_V1 | 50 | select IMX_HAVE_DMA_V1 |
| 51 | select IMX_HAVE_IOMUX_V1 | 51 | select IMX_HAVE_IOMUX_V1 |
| 52 | select MXC_AVIC | 52 | select MXC_AVIC |
| @@ -55,7 +55,7 @@ config SOC_IMX25 | |||
| 55 | bool | 55 | bool |
| 56 | select ARCH_MX25 | 56 | select ARCH_MX25 |
| 57 | select CPU_ARM926T | 57 | select CPU_ARM926T |
| 58 | select ARCH_MXC_AUDMUX_V2 | 58 | select ARCH_MXC_AUDMUX |
| 59 | select ARCH_MXC_IOMUX_V3 | 59 | select ARCH_MXC_IOMUX_V3 |
| 60 | select MXC_AVIC | 60 | select MXC_AVIC |
| 61 | 61 | ||
| @@ -63,7 +63,7 @@ config SOC_IMX27 | |||
| 63 | bool | 63 | bool |
| 64 | select MACH_MX27 | 64 | select MACH_MX27 |
| 65 | select CPU_ARM926T | 65 | select CPU_ARM926T |
| 66 | select ARCH_MXC_AUDMUX_V1 | 66 | select ARCH_MXC_AUDMUX |
| 67 | select IMX_HAVE_DMA_V1 | 67 | select IMX_HAVE_DMA_V1 |
| 68 | select IMX_HAVE_IOMUX_V1 | 68 | select IMX_HAVE_IOMUX_V1 |
| 69 | select MXC_AVIC | 69 | select MXC_AVIC |
| @@ -72,7 +72,7 @@ config SOC_IMX31 | |||
| 72 | bool | 72 | bool |
| 73 | select CPU_V6 | 73 | select CPU_V6 |
| 74 | select IMX_HAVE_PLATFORM_MXC_RNGA | 74 | select IMX_HAVE_PLATFORM_MXC_RNGA |
| 75 | select ARCH_MXC_AUDMUX_V2 | 75 | select ARCH_MXC_AUDMUX |
| 76 | select MXC_AVIC | 76 | select MXC_AVIC |
| 77 | select SMP_ON_UP if SMP | 77 | select SMP_ON_UP if SMP |
| 78 | 78 | ||
| @@ -80,7 +80,7 @@ config SOC_IMX35 | |||
| 80 | bool | 80 | bool |
| 81 | select CPU_V6 | 81 | select CPU_V6 |
| 82 | select ARCH_MXC_IOMUX_V3 | 82 | select ARCH_MXC_IOMUX_V3 |
| 83 | select ARCH_MXC_AUDMUX_V2 | 83 | select ARCH_MXC_AUDMUX |
| 84 | select HAVE_EPIT | 84 | select HAVE_EPIT |
| 85 | select MXC_AVIC | 85 | select MXC_AVIC |
| 86 | select SMP_ON_UP if SMP | 86 | select SMP_ON_UP if SMP |
| @@ -89,7 +89,7 @@ config SOC_IMX5 | |||
| 89 | select CPU_V7 | 89 | select CPU_V7 |
| 90 | select MXC_TZIC | 90 | select MXC_TZIC |
| 91 | select ARCH_MXC_IOMUX_V3 | 91 | select ARCH_MXC_IOMUX_V3 |
| 92 | select ARCH_MXC_AUDMUX_V2 | 92 | select ARCH_MXC_AUDMUX |
| 93 | select ARCH_HAS_CPUFREQ | 93 | select ARCH_HAS_CPUFREQ |
| 94 | select ARCH_MX5 | 94 | select ARCH_MX5 |
| 95 | bool | 95 | bool |