---

yaml --- r: 308348 b: refs/heads/master c: f965cd5 h: refs/heads/master v: v3
git-mirror · May 11, 2012 · 4f49435 · 4f49435
1 parent 648fd11
commit 4f49435
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -655,7 +655,9 @@
 			};
 
 			audmux@021d8000 {
+				compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux";
 				reg = <0x021d8000 0x4000>;
+				status = "disabled";
 			};
 
 			mipi@021dc000 { /* MIPI-CSI */