summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6qdl-apalis.dtsi
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2018-09-06 16:46:58 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2020-02-09 22:45:41 +0100
commit9cc7dccbadbd2905449ed6b3b9d7aa8d9f108927 (patch)
tree11d8b8b63b0e7389260a6bb61e00bc0543645906 /arch/arm/boot/dts/imx6qdl-apalis.dtsi
parente436aeed2ed8c9c6f3472358ad963229f7c16872 (diff)
ARM: dts: imx6q-apalis: mux RESET_MOCI# signal
The pinctrl properties on the IOMUXC node get overwritten by the carrier board level device tree, hence the pinctrl_reset_moci pinctrl does not get applied. Associate the pinctrl_reset_moci pinctrl with the PCIe node where we also make use of the pin as a reset GPIO. Since the pin is muxed as a GPIO by default not muxing it explicitly worked fine in practise. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 78f10734f95873c22255f536e894c704bb5e8fa2)
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-apalis.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis.dtsi4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 4ce57d4cfb3f..88f1dc22346b 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -477,10 +477,6 @@
};
&iomuxc {
- /* pins used on module */
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_reset_moci>;
-
pinctrl_apalis_gpio1: gpio2io04grp {
fsl,pins = <
MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0