diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:13 +0100 |
| commit | c224cd316197132321869d859048f89da49c0162 (patch) | |
| tree | 275649e84cb143b3a389bf05c8416904b9da0dba /arch/arm/dts/imx6qdl-mba6x.dtsi | |
| parent | 3cbd92bf6e96d4274e3a4f6aeceaf51d5406a0a6 (diff) | |
| parent | cc66cf109b1d2ca40c180a87fd76c2099dff2d92 (diff) | |
| download | barebox-c224cd316197132321869d859048f89da49c0162.tar.gz barebox-c224cd316197132321869d859048f89da49c0162.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/boards/dmo-mx6-realq7/lowlevel.c
Diffstat (limited to 'arch/arm/dts/imx6qdl-mba6x.dtsi')
| -rw-r--r-- | arch/arm/dts/imx6qdl-mba6x.dtsi | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/dts/imx6qdl-mba6x.dtsi b/arch/arm/dts/imx6qdl-mba6x.dtsi index 78ab4cc5e4..530f8150fc 100644 --- a/arch/arm/dts/imx6qdl-mba6x.dtsi +++ b/arch/arm/dts/imx6qdl-mba6x.dtsi @@ -96,7 +96,7 @@ &audmux { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_audmux_2>; + pinctrl-0 = <&pinctrl_audmux>; status = "okay"; }; @@ -116,6 +116,18 @@ status = "okay"; }; +&iomuxc { + imx6qdl-mba6x { + pinctrl_usbotg: usbotggrp { + fsl,pins = <MX6QDL_USBOTG_PINGRP1>; + }; + + pinctrl_audmux: audmuxgrp { + fsl,pins = <MX6QDL_AUDMUX_PINGRP2>; + }; + }; +}; + &i2c1 { codec: tlv320@18 { compatible = "ti,tlv320aic23"; @@ -176,7 +188,7 @@ &usbotg { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbotg_1>; + pinctrl-0 = <&pinctrl_usbotg>; phy_type = "utmi"; dr_mode = "host"; disable-over-current; |