diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2017-01-18 15:01:18 -0800 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-04-03 15:10:46 +0200 |
| commit | 1695ecff1b1aa1ac9fb6325de75ee855158aeab7 (patch) | |
| tree | 9d2a4931decbba4f3bfd7afb7c64d1f83d4e2113 | |
| parent | 9090b5b90ccc350611a769230eab3fbc20c9d302 (diff) | |
ARM: dts: apalis_imx6: make sure reset MOCI and eMMC get muxed
The two pinctrl settings for reset MOCI and eMMC reset do not get
applied currently because pinctrl settings need to be in the top
level of a device tree node. Move the settings to the respective
device tree nodes.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi index a4922804c3b7..f9f165288a74 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi @@ -308,6 +308,8 @@ }; &pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reset_moci>; reset-gpio = <&gpio1 2 0>; reset-ep-gpio = <&gpio1 28 0>; status = "okay"; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 1f0650802aec..230766721250 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -658,8 +658,6 @@ /* pins used on module */ imx6q-apalis { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_reset_moci &pinctrl_emmc_reset>; pinctrl_audmux: audmuxgrp { fsl,pins = < MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0 @@ -1237,7 +1235,7 @@ /* eMMC */ &usdhc3 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc3>; + pinctrl-0 = <&pinctrl_usdhc3 &pinctrl_emmc_reset>; vmmc-supply = <®_3p3v>; bus-width = <8>; no-1-8-v; |