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

GPIO nodes defined in the top-level J721s2 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-10-afd@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
index 5fd06cd26b479ae16ae219e2a3cb02378a80c3ac..5df5946687b3483a3d3da932639e85450137771c 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
@@ -382,31 +382,17 @@
 };
 
 &main_gpio0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&rpi_header_gpio0_pins_default>;
 };
 
-&main_gpio2 {
-       status = "disabled";
-};
-
-&main_gpio4 {
-       status = "disabled";
-};
-
-&main_gpio6 {
-       status = "disabled";
-};
-
 &wkup_gpio0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mcu_rpi_header_gpio0_pins0_default>, <&mcu_rpi_header_gpio0_pins1_default>;
 };
 
-&wkup_gpio1 {
-       status = "disabled";
-};
-
 &wkup_uart0 {
        status = "reserved";
        pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
index 7794063b77c8a59dd9c83870b931fa2da6633daa..c6b85bbf9a179bfc3b68028f9b85564bf36efd72 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -299,20 +299,12 @@
        };
 };
 
-&main_gpio2 {
-       status = "disabled";
-};
-
-&main_gpio4 {
-       status = "disabled";
-};
-
-&main_gpio6 {
-       status = "disabled";
+&main_gpio0 {
+       status = "okay";
 };
 
-&wkup_gpio1 {
-       status = "disabled";
+&wkup_gpio0 {
+       status = "okay";
 };
 
 &wkup_uart0 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
index 7470f7242520eb771e9962971d961e595e62efcc..084f8f5b669931a784dbd9e7d5e5ec5ac9e86fd4 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
@@ -579,6 +579,7 @@
                power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 111 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio2: gpio@610000 {
@@ -595,6 +596,7 @@
                power-domains = <&k3_pds 112 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 112 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio4: gpio@620000 {
@@ -611,6 +613,7 @@
                power-domains = <&k3_pds 113 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 113 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_gpio6: gpio@630000 {
@@ -627,6 +630,7 @@
                power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 114 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        main_i2c0: i2c@2000000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
index bba2d75324b8222eaec50fa8be7f167ef71a3553..2ddad931855416d24484562ec135b02059f99176 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
@@ -323,6 +323,7 @@
                power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 115 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        wkup_gpio1: gpio@42100000 {
@@ -339,6 +340,7 @@
                power-domains = <&k3_pds 116 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 116 0>;
                clock-names = "gpio";
+               status = "disabled";
        };
 
        wkup_i2c0: i2c@42120000 {