summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@linaro.org>2012-05-02 10:32:26 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-05-11 15:18:01 +0800
commitf965cd55e29ee582dd58531c7afd5fc061e0b7e4 (patch)
tree092c7ad28c2f814b9fa61065e9805d41f81ab61e /arch/arm/boot/dts
parentb1a5da8eb37bd44d66e93a6133e33616b5de3d24 (diff)
ARM: dts: imx6q-sabrelite: add audmux device
Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/imx6q-sabrelite.dts4
-rw-r--r--arch/arm/boot/dts/imx6q.dtsi2
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 1aebefe21571..2f631f25fffe 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -65,6 +65,10 @@
status = "okay";
};
+ audmux@021d8000 {
+ status = "okay";
+ };
+
uart2: serial@021e8000 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 760ca335a9f8..b5a15c4c2fdc 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -655,7 +655,9 @@
};
audmux@021d8000 {
+ compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux";
reg = <0x021d8000 0x4000>;
+ status = "disabled";
};
mipi@021dc000 { /* MIPI-CSI */