From 4fcb9d98f0782a2cdc860e1a00fb0ad9b9bf56fc Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 30 Dec 2011 17:27:40 +0800 Subject: ARM: imx6q-sabrelite: add audmux Signed-off-by: Richard Zhao --- arch/arm/boot/dts/imx6q-sabrelite.dts | 4 ++++ arch/arm/boot/dts/imx6q.dtsi | 2 ++ arch/arm/mach-imx/Kconfig | 1 + 3 files changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts index e09491c5edd..7706336ca50 100644 --- a/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts @@ -58,6 +58,10 @@ status = "okay"; }; + audmux@021d8000 { + status = "okay"; + }; + uart2: uart@021e8000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index c37c04fe976..70309f0b5d2 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -546,7 +546,9 @@ }; audmux@021d8000 { + compatible = "fsl,audmux-v2"; reg = <0x021d8000 0x4000>; + status = "disabled"; }; mipi@021dc000 { /* MIPI-CSI */ diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 47dc42520cd..254ecee432f 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -606,6 +606,7 @@ config SOC_IMX6Q select ARM_CPU_SUSPEND if PM select USE_OF select ARCH_MXC_IOMUX_V3 + select ARCH_MXC_AUDMUX_V2 help This enables support for Freescale i.MX6 Quad processor. -- cgit v1.2.3