arm64: dts: ti: k3-j721e: Enable GPIO nodes at the board level

GPIO nodes defined in the top-level J721e SoC dtsi files are incomplete
and may not be functional unless they are extended with pinmux and
device information.

Disable the GPIO nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Link: https://lore.kernel.org/r/20230810003814.85450-9-afd@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts b/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
index 0b89977351c98e1fa52c1713d5840d0f4402fbe6..f06e7bda46f0100156eef709b340b7eb19ae6c36 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
@@ -647,52 +647,23 @@
        };
 };
 
-&main_gpio2 {
-       /* Unused */
-       status = "disabled";
-};
-
-&main_gpio3 {
-       /* Unused */
-       status = "disabled";
-};
-
-&main_gpio4 {
-       /* Unused */
-       status = "disabled";
-};
-
-&main_gpio5 {
-       /* Unused */
-       status = "disabled";
-};
-
-&main_gpio6 {
-       /* Unused */
-       status = "disabled";
-};
-
-&main_gpio7 {
-       /* Unused */
-       status = "disabled";
-};
-
 &wkup_gpio0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mcu_adc0_pins_default>, <&mcu_adc1_pins_default>,
                    <&mikro_bus_pins_default>;
 };
 
-&wkup_gpio1 {
-       /* Unused */
-       status = "disabled";
-};
-
 &main_gpio0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&csi1_gpio_pins_default>, <&csi0_gpio_pins_default>;
 };
 
+&main_gpio1 {
+       status = "okay";
+};
+
 &usb_serdes_mux {
        idle-states = <1>, <1>; /* USB0 to SERDES3, USB1 to SERDES2 */
 };

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index e9b84d2c64b2681ad657e03abb938fc585806dd4..824874a7dcb95c0c37246b6875a107724798a0b3 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -469,37 +469,18 @@
        pinctrl-0 = <&main_uart4_pins_default>;
 };
 
-&main_gpio2 {
-       status = "disabled";
-};
-
-&main_gpio3 {
-       status = "disabled";
-};
-
-&main_gpio4 {
-       status = "disabled";
-};
-
-&main_gpio5 {
-       status = "disabled";
-};
-
-&main_gpio6 {
-       status = "disabled";
-};
-
-&main_gpio7 {
-       status = "disabled";
-};
-
 &wkup_gpio0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&wkup_gpio_pins_default>;
 };
 
-&wkup_gpio1 {
-       status = "disabled";
+&main_gpio0 {
+       status = "okay";
+};
+
+&main_gpio1 {
+       status = "okay";
 };
 
 &main_sdhci0 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 3c53ddd6a67ac4869a1714f0a32de2dbe7e30dbe..e9eb3bac0632d85ff915beefadf8afcef8e78d9e 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -1340,6 +1340,7 @@
                power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 105 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio1: gpio@601000 {
@@ -1356,6 +1357,7 @@
                power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 106 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio2: gpio@610000 {
@@ -1373,6 +1375,7 @@
                power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 107 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio3: gpio@611000 {
@@ -1389,6 +1392,7 @@
                power-domains = <&k3_pds 108 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 108 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio4: gpio@620000 {
@@ -1406,6 +1410,7 @@
                power-domains = <&k3_pds 109 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 109 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio5: gpio@621000 {
@@ -1422,6 +1427,7 @@
                power-domains = <&k3_pds 110 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 110 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio6: gpio@630000 {
@@ -1439,6 +1445,7 @@
                power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 111 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio7: gpio@631000 {
@@ -1455,6 +1462,7 @@
                power-domains = <&k3_pds 112 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 112 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_sdhci0: mmc@4f80000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
index 2b5dfb3aba12da4cc20b7d81a28b14637a1f4bf0..4ecc19b1e92e5e2c792c25cbbbf9d505ba2ef32f 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -281,6 +281,7 @@
                power-domains = <&k3_pds 113 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 113 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        wkup_gpio1: gpio@42100000 {
@@ -297,6 +298,7 @@
                power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 114 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        mcu_i2c0: i2c@40b00000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
index 4cd5346f2dd59cd3a292e64106528a840b450670..ed4994d264f26801f3d2271f5c980f086bb79f23 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
@@ -731,41 +731,19 @@
 };
 
 &main_gpio0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&rpi_header_gpio0_pins_default>;
 };
 
 &main_gpio1 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&rpi_header_gpio1_pins_default>;
 };
 
-&main_gpio2 {
-       status = "disabled";
-};
-
-&main_gpio3 {
-       status = "disabled";
-};
-
-&main_gpio4 {
-       status = "disabled";
-};
-
-&main_gpio5 {
-       status = "disabled";
-};
-
-&main_gpio6 {
-       status = "disabled";
-};
-
-&main_gpio7 {
-       status = "disabled";
-};
-
-&wkup_gpio1 {
-       status = "disabled";
+&wkup_gpio0 {
+       status = "okay";
 };
 
 &usb_serdes_mux {