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

I2C nodes defined in the top-level AM64x 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>
Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
Link: https://lore.kernel.org/r/20221017192532.23825-3-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index a115c668d00102945ad5a04b2bdcf9e9f5a83eb3..fdcacf78f4a64913dc61c9eade0e79d50527ad37 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -321,6 +321,7 @@
                power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 102 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_i2c1: i2c@20010000 {
@@ -332,6 +333,7 @@
                power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 103 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_i2c2: i2c@20020000 {
@@ -343,6 +345,7 @@
                power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 104 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_i2c3: i2c@20030000 {
@@ -354,6 +357,7 @@
                power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 105 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        main_spi0: spi@20100000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
index 1181ad0176261dc77e3b95f2e37eec206e282d36..5ce8ceb3779d8ae46e786090d47447c552b713ab 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
@@ -37,6 +37,7 @@
                power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 106 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        mcu_i2c1: i2c@4910000 {
@@ -48,6 +49,7 @@
                power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 107 2>;
                clock-names = "fck";
+               status = "disabled";
        };
 
        mcu_spi0: spi@4b00000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 78f246077ca99a22101056f8ab69ff40e9ce02d1..3903e907244ea2b06f889f2268bcc7076617af41 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -336,6 +336,7 @@
 };
 
 &main_i2c1 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c1_pins_default>;
        clock-frequency = <400000>;
@@ -378,14 +379,6 @@
        status = "reserved";
 };
 
-&mcu_i2c0 {
-       status = "disabled";
-};
-
-&mcu_i2c1 {
-       status = "disabled";
-};
-
 &mcu_spi0 {
        status = "disabled";
 };

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 8423295150fc4fd5754ee3876a4969c4bbfd35c9..56763d839e05ac3e71663a3137acc32172db0461 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -349,15 +349,8 @@
        status = "reserved";
 };
 
-&mcu_i2c0 {
-       status = "disabled";
-};
-
-&mcu_i2c1 {
-       status = "disabled";
-};
-
 &main_i2c1 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c1_pins_default>;
        clock-frequency = <400000>;
@@ -382,10 +375,6 @@
        };
 };
 
-&main_i2c3 {
-       status = "disabled";
-};
-
 &mcu_spi0 {
        status = "disabled";
 };