arm64: dts: ti: iot2050: Refactor the m.2 and minipcie power pin

Make the m.2 power control pin also available on miniPCIE variants.

This can fix some miniPCIE card hang issue, by forcing a power on reset
during boot.

Signed-off-by: Baocheng Su <baocheng.su@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Link: https://lore.kernel.org/r/8b2f8c1698421b8d0694eb337ad7ea2320d76aa6.1699087938.git.jan.kiszka@siemens.com
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
index e9419c4fe605c50cd24b7801eb6ce5f4ae9b6161..e9b57b87e42e07c0d60eca757eb569cb53c4b81f 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
@@ -20,7 +20,9 @@
 
 &main_gpio1 {
        pinctrl-names = "default";
-       pinctrl-0 = <&cp2102n_reset_pin_default>;
+       pinctrl-0 =
+               <&main_pcie_enable_pins_default>,
+               <&cp2102n_reset_pin_default>;
        gpio-line-names =
                "", "", "", "", "", "", "", "", "", "",
                "", "", "", "", "", "", "", "", "", "",

diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
index 41c980d2a242ca9a9e8fa5fb4b52f4fdd4d18d28..d2b6439cf496f68ffe25baa53edab4cf43523f04 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
@@ -852,6 +852,12 @@
                >;
        };
 
+       main_pcie_enable_pins_default: main-pcie-enable-default-pins {
+               pinctrl-single,pins = <
+                       AM65X_IOPAD(0x01c4, PIN_INPUT_PULLUP, 7)  /* (AH13) GPIO1_17 */
+               >;
+       };
+
        main_uart1_pins_default: main-uart1-default-pins {
                pinctrl-single,pins = <
                        AM65X_IOPAD(0x0174, PIN_INPUT,  6)  /* (AE23) UART1_RXD */
@@ -981,6 +987,11 @@
                "", "IO9";
 };
 
+&main_gpio1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&main_pcie_enable_pins_default>;
+};
+
 &wkup_gpio0 {
        pinctrl-names = "default";
        pinctrl-0 =

diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts
index 8301c35c31b3f9b7ca26474947a19f244c6f91ca..bd6f2e696e94c7f49fc85acfd918c438d753ebbd 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts
+++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts
@@ -27,12 +27,6 @@
 };
 
 &main_pmx0 {
-       main_m2_enable_pins_default: main-m2-enable-default-pins {
-               pinctrl-single,pins = <
-                       AM65X_IOPAD(0x01c4, PIN_INPUT_PULLUP, 7)  /* (AH13) GPIO1_17 */
-               >;
-       };
-
        main_bkey_pcie_reset: main-bkey-pcie-reset-default-pins {
                pinctrl-single,pins = <
                        AM65X_IOPAD(0x01bc, PIN_OUTPUT_PULLUP, 7)  /* (AG13) GPIO1_15 */
@@ -72,7 +66,7 @@
 &main_gpio1 {
        pinctrl-names = "default";
        pinctrl-0 =
-               <&main_m2_enable_pins_default>,
+               <&main_pcie_enable_pins_default>,
                <&main_pmx0_m2_config_pins_default>,
                <&main_pmx1_m2_config_pins_default>,
                <&cp2102n_reset_pin_default>;