Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c77c29c authored by Shawn Guo's avatar Shawn Guo Committed by Mark Brown
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3bc34a61

arch/arm/mach-imx/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ config SOC_IMX21 
	bool

	select MACH_MX21

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC
@@ -55,7 +54,6 @@ config SOC_IMX25 
	bool

	select ARCH_MX25

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX

	select ARCH_MXC_IOMUX_V3

	select MXC_AVIC
@@ -63,7 +61,6 @@ config SOC_IMX27 
	bool

	select MACH_MX27

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC
@@ -72,7 +69,6 @@ config SOC_IMX31 
	bool

	select CPU_V6

	select IMX_HAVE_PLATFORM_MXC_RNGA

	select ARCH_MXC_AUDMUX

	select MXC_AVIC

	select SMP_ON_UP if SMP
@@ -80,7 +76,6 @@ config SOC_IMX35 
	bool

	select CPU_V6

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX

	select HAVE_EPIT

	select MXC_AVIC

	select SMP_ON_UP if SMP
@@ -89,7 +84,6 @@ config SOC_IMX5 
	select CPU_V7

	select MXC_TZIC

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX

	select ARCH_HAS_CPUFREQ

	select ARCH_MX5

	bool

arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/iomux-mx51.h>

#include <mach/audmux.h>



#include "devices-imx51.h"

arch/arm/plat-mxc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ config IMX_HAVE_IOMUX_V1 
config ARCH_MXC_IOMUX_V3

	bool



config ARCH_MXC_AUDMUX

	bool



config IRAM_ALLOC

	bool

	select GENERIC_ALLOCATOR

arch/arm/plat-mxc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o 
obj-$(CONFIG_MXC_PWM)  += pwm.o

obj-$(CONFIG_MXC_ULPI) += ulpi.o

obj-$(CONFIG_MXC_USE_EPIT) += epit.o

obj-$(CONFIG_ARCH_MXC_AUDMUX) += audmux.o

obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o

obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o

ifdef CONFIG_SND_IMX_SOC

sound/soc/imx/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ config SND_MXC_SOC_MX2 
	select SND_SOC_DMAENGINE_PCM

	tristate



config SND_SOC_IMX_AUDMUX

	tristate



config SND_MXC_SOC_WM1133_EV1

	tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"

	depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL

	select SND_SOC_WM8350

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_AUDMUX

	help

	  Enable support for audio on the i.MX31ADS with the WM1133-EV1

	  PMIC board with WM8835x fitted.
@@ -30,6 +34,7 @@ config SND_SOC_MX27VIS_AIC32X4 
	depends on MACH_IMX27_VISSTRIM_M10 && I2C

	select SND_SOC_TLV320AIC32X4

	select SND_MXC_SOC_MX2

	select SND_SOC_IMX_AUDMUX

	help

	  Say Y if you want to add support for SoC audio on Visstrim SM10

	  board with TLV320AIC32X4 codec.
@@ -40,6 +45,7 @@ config SND_SOC_PHYCORE_AC97 
	select SND_SOC_AC97_BUS

	select SND_SOC_WM9712

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_AUDMUX

	help

	  Say Y if you want to add support for SoC audio on Phytec phyCORE

	  and phyCARD boards in AC97 mode
@@ -53,6 +59,7 @@ config SND_SOC_EUKREA_TLV320 
	depends on I2C

	select SND_SOC_TLV320AIC23

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_AUDMUX

	help

	  Enable I2S based access to the TLV320AIC23B codec attached

	  to the SSI interface