aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@freescale.com>2011-12-30 17:27:40 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-11 21:51:12 +0800
commit4fcb9d98f0782a2cdc860e1a00fb0ad9b9bf56fc (patch)
tree6229696ba7714b73d3899bbbaa5a5f23b761614a
parent50fb302c5cc4216019e04817f577a4854e891b3b (diff)
downloadlinux-linaro-4fcb9d98f0782a2cdc860e1a00fb0ad9b9bf56fc.tar.gz
ARM: imx6q-sabrelite: add audmux
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
-rw-r--r--arch/arm/boot/dts/imx6q-sabrelite.dts4
-rw-r--r--arch/arm/boot/dts/imx6q.dtsi2
-rw-r--r--arch/arm/mach-imx/Kconfig1
3 files changed, 7 insertions, 0 deletions
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.