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

I2C nodes defined in the top-level J721s2 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-13-afd@ti.com

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 3f4106f76893b97d22c5116337364dc3b7d68c28..a7aa6cf08acd4ab85d8f51665cd4c5274313f845 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
@@ -261,30 +261,6 @@
        };
 };
 
-&main_i2c1 {
-       status = "disabled";
-};
-
-&main_i2c2 {
-       status = "disabled";
-};
-
-&main_i2c3 {
-       status = "disabled";
-};
-
-&main_i2c4 {
-       status = "disabled";
-};
-
-&main_i2c5 {
-       status = "disabled";
-};
-
-&main_i2c6 {
-       status = "disabled";
-};
-
 &main_sdhci0 {
        /* eMMC */
        non-removable;

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
index 1c18d6df6361ada7c9d61fca7b917f3946e96417..d1ec261103761637dca10dc83d664a30462cb23f 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
@@ -266,6 +266,7 @@
                clocks = <&k3_clks 215 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 215 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c2: i2c@2020000 {
@@ -277,6 +278,7 @@
                clocks = <&k3_clks 216 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 216 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c3: i2c@2030000 {
@@ -288,6 +290,7 @@
                clocks = <&k3_clks 217 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 217 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c4: i2c@2040000 {
@@ -299,6 +302,7 @@
                clocks = <&k3_clks 218 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 218 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c5: i2c@2050000 {
@@ -310,6 +314,7 @@
                clocks = <&k3_clks 219 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 219 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_i2c6: i2c@2060000 {
@@ -321,6 +326,7 @@
                clocks = <&k3_clks 220 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 220 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_sdhci0: mmc@4f80000 {

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 d1dd40a6e42a42e89c0d93992b5e3910939af9dc..3264b8e8faea501c2c0fb4cdaad3368f2c38e98c 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
@@ -146,6 +146,7 @@
                clocks = <&k3_clks 223 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 223 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcu_i2c0: i2c@40b00000 {
@@ -157,6 +158,7 @@
                clocks = <&k3_clks 221 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 221 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcu_i2c1: i2c@40b10000 {
@@ -168,6 +170,7 @@
                clocks = <&k3_clks 222 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 222 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcu_mcan0: can@40528000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
index a2cb0916e4a2fb79a35e49dacfb0f06b60430ffb..6930efff8a5a3cf1d493a95de87e7ce1355511ad 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
@@ -56,6 +56,7 @@
 };
 
 &main_i2c0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c0_pins_default>;
        clock-frequency = <400000>;