Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stefan Agner and committed by
Shawn Guo
78f10734 37f2c303

+6 -4
+2
arch/arm/boot/dts/imx6q-apalis-eval.dts
··· 196 196 }; 197 197 198 198 &pcie { 199 + pinctrl-names = "default"; 200 + pinctrl-0 = <&pinctrl_reset_moci>; 199 201 /* active-high meaning opposite of regular PERST# active-low polarity */ 200 202 reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>; 201 203 reset-gpio-active-high;
+2
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
··· 196 196 }; 197 197 198 198 &pcie { 199 + pinctrl-names = "default"; 200 + pinctrl-0 = <&pinctrl_reset_moci>; 199 201 /* active-high meaning opposite of regular PERST# active-low polarity */ 200 202 reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>; 201 203 reset-gpio-active-high;
+2
arch/arm/boot/dts/imx6q-apalis-ixora.dts
··· 200 200 }; 201 201 202 202 &pcie { 203 + pinctrl-names = "default"; 204 + pinctrl-0 = <&pinctrl_reset_moci>; 203 205 /* active-high meaning opposite of regular PERST# active-low polarity */ 204 206 reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>; 205 207 reset-gpio-active-high;
-4
arch/arm/boot/dts/imx6qdl-apalis.dtsi
··· 482 482 }; 483 483 484 484 &iomuxc { 485 - /* pins used on module */ 486 - pinctrl-names = "default"; 487 - pinctrl-0 = <&pinctrl_reset_moci>; 488 - 489 485 pinctrl_apalis_gpio1: gpio2io04grp { 490 486 fsl,pins = < 491 487 MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0