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

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

As the pinmux is only known at the board integration level, these
nodes should only be enabled when provided with this information.

Disable the I2C 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>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Link: https://lore.kernel.org/r/20221020160305.18711-3-afd@ti.com

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 01afacf..24e9db5 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
@@ -529,6 +529,7 @@
 };
 
 &main_i2c0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c0_pins_default>;
        clock-frequency = <400000>;
@@ -565,6 +566,7 @@
 };
 
 &main_i2c1 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c1_pins_default>;
        clock-frequency = <400000>;
@@ -590,6 +592,7 @@
 };
 
 &main_i2c3 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c3_pins_default>;
        clock-frequency = <400000>;
@@ -628,6 +631,7 @@
 };
 
 &main_i2c6 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c6_pins_default>;
        clock-frequency = <400000>;

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 5f85d1c..61bba78 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -1229,6 +1229,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 187 0>;
                power-domains = <&k3_pds 187 TI_SCI_PD_SHARED>;
+               status = "disabled";
        };
 
        main_i2c1: i2c@2010000 {
@@ -1240,6 +1241,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 188 0>;
                power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c2: i2c@2020000 {
@@ -1251,6 +1253,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 189 0>;
                power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c3: i2c@2030000 {
@@ -1262,6 +1265,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 190 0>;
                power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c4: i2c@2040000 {
@@ -1273,6 +1277,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 191 0>;
                power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c5: i2c@2050000 {
@@ -1284,6 +1289,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 192 0>;
                power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c6: i2c@2060000 {
@@ -1295,6 +1301,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 193 0>;
                power-domains = <&k3_pds 193 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        ufs_wrapper: ufs-wrapper@4e80000 {

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 fce88ed..7bb6613 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -147,6 +147,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 194 0>;
                power-domains = <&k3_pds 194 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcu_i2c1: i2c@40b10000 {
@@ -158,6 +159,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 195 0>;
                power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        wkup_i2c0: i2c@42120000 {
@@ -169,6 +171,7 @@
                clock-names = "fck";
                clocks = <&k3_clks 197 0>;
                power-domains = <&k3_pds 197 TI_SCI_PD_SHARED>;
+               status = "disabled";
        };
 
        fss: fss@47000000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
index 23538c5..1d5a90d 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
@@ -537,6 +537,7 @@
 };
 
 &main_i2c0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c0_pins_default>;
        clock-frequency = <400000>;
@@ -564,18 +565,15 @@
 };
 
 &main_i2c1 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c1_pins_default>;
        /* i2c1 is used for DVI DDC, so we need to use 100kHz */
        clock-frequency = <100000>;
 };
 
-&main_i2c2 {
-       /* Unused */
-       status = "disabled";
-};
-
 &main_i2c3 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c3_pins_default>;
        clock-frequency = <400000>;
@@ -602,21 +600,6 @@
        };
 };
 
-&main_i2c4 {
-       /* Unused */
-       status = "disabled";
-};
-
-&main_i2c5 {
-       /* Brought out on RPi Header */
-       status = "disabled";
-};
-
-&main_i2c6 {
-       /* Unused */
-       status = "disabled";
-};
-
 &main_gpio2 {
        status = "disabled";
 };