diff options
| author | Richard Zhao <richard.zhao@freescale.com> | 2011-12-30 17:27:40 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-04 11:34:36 +0800 |
| commit | b10993a6471f0ac28c9c7ac09b9ac72b71cd87d1 (patch) | |
| tree | 815ffddb3d2c9f39acb4c0c7be55ce243898e0af | |
| parent | b91a4a94acda83020b64bcb05fc5a75410021154 (diff) | |
ARM: imx6q-sabrelite: add audmux
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6q-sabrelite.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
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 aa48cf3f595..40a775cf0da 100644 --- a/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts @@ -62,6 +62,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 4c35c38993e..a57adf776ae 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -552,7 +552,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 a5884b20fcf..b92c24e5fce 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -596,6 +596,7 @@ comment "i.MX6 family:" config SOC_IMX6Q bool "i.MX6 Quad support" select ARCH_HAS_CPUFREQ + select ARCH_MXC_AUDMUX_V2 select ARM_GIC select CACHE_L2X0 select CPU_V7 |