diff options
author | Richard Zhao <richard.zhao@linaro.org> | 2012-05-01 22:32:26 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-11 03:18:01 -0400 |
commit | f965cd55e29ee582dd58531c7afd5fc061e0b7e4 (patch) | |
tree | 092c7ad28c2f814b9fa61065e9805d41f81ab61e /arch/arm | |
parent | b1a5da8eb37bd44d66e93a6133e33616b5de3d24 (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')
-rw-r--r-- | arch/arm/boot/dts/imx6q-sabrelite.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 2 |
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 @@ | |||
65 | status = "okay"; | 65 | status = "okay"; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | audmux@021d8000 { | ||
69 | status = "okay"; | ||
70 | }; | ||
71 | |||
68 | uart2: serial@021e8000 { | 72 | uart2: serial@021e8000 { |
69 | status = "okay"; | 73 | status = "okay"; |
70 | }; | 74 | }; |
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 @@ | |||
655 | }; | 655 | }; |
656 | 656 | ||
657 | audmux@021d8000 { | 657 | audmux@021d8000 { |
658 | compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux"; | ||
658 | reg = <0x021d8000 0x4000>; | 659 | reg = <0x021d8000 0x4000>; |
660 | status = "disabled"; | ||
659 | }; | 661 | }; |
660 | 662 | ||
661 | mipi@021dc000 { /* MIPI-CSI */ | 663 | mipi@021dc000 { /* MIPI-CSI */ |