diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-04 14:58:11 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-04 15:21:09 +0200 |
| commit | 1095ddb02813c6349ef39a667c822cb58593f442 (patch) | |
| tree | a02fad5f61db3d7806068e7a10898d40e623c637 | |
| parent | fe51273e08197ca89e566886c03c62808876c88f (diff) | |
imx6qdl-colibri.dtsi: fix pin assignements
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index 81a9dd1ccb70..a9f547de4fe2 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -137,7 +137,6 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&gpio3 31 0>; - enable-active-high; status = "disabled"; }; }; @@ -234,7 +233,7 @@ &i2c2 { clock-frequency = <100000>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c2_2>; + pinctrl-0 = <&pinctrl_i2c2_1>; status = "okay"; codec: sgtl5000@0a { @@ -319,8 +318,8 @@ }; pinctrl_i2c_ddc: i2c_ddc { fsl,pins = < - MX6QDL_PAD_EIM_EB2__GPIO2_IO30 PAD_CTRL_HYS_PU /* DDC bitbang */ - MX6QDL_PAD_EIM_D16__GPIO3_IO16 PAD_CTRL_HYS_PU /* DDC bitbang */ + MX6QDL_PAD_KEY_COL3__GPIO4_IO12 PAD_CTRL_HYS_PU /* DDC bitbang */ + MX6QDL_PAD_KEY_ROW3__GPIO4_IO13 PAD_CTRL_HYS_PU /* DDC bitbang */ >; }; pinctrl_mmc_cd: gpio_mmc_cd { @@ -392,9 +391,12 @@ /* UART A */ &uart1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart1_3 &pinctrl_uart1_4>; + pinctrl-0 = <&pinctrl_uart1_3>; +// pinctrl-0 = <&pinctrl_uart1_3 &pinctrl_uart1_4>; +#if 1 fsl,dte-mode; fsl,uart-has-rtscts; +#endif status = "disabled"; }; @@ -435,7 +437,7 @@ label = "MMC1"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1_1 &pinctrl_mmc_cd>; - cd-gpios = <&gpio4 20 0>; + cd-gpios = <&gpio2 5 0>; vmmc-supply = <®_3p3v>; bus-width = <4>; no-1-8-v; |