From 4f49435425104b64648847af2a9db86794eab217 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Wed, 2 May 2012 10:32:26 +0800 Subject: [PATCH] --- yaml --- r: 308348 b: refs/heads/master c: f965cd55e29ee582dd58531c7afd5fc061e0b7e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx6q-sabrelite.dts | 4 ++++ trunk/arch/arm/boot/dts/imx6q.dtsi | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 405717e9377b..ac843291c196 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1a5da8eb37bd44d66e93a6133e33616b5de3d24 +refs/heads/master: f965cd55e29ee582dd58531c7afd5fc061e0b7e4 diff --git a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts index 1aebefe21571..2f631f25fffe 100644 --- a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/trunk/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/trunk/arch/arm/boot/dts/imx6q.dtsi b/trunk/arch/arm/boot/dts/imx6q.dtsi index 760ca335a9f8..b5a15c4c2fdc 100644 --- a/trunk/arch/arm/boot/dts/imx6q.dtsi +++ b/trunk/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 */