Skip to contentSkip to conversation

arm: dts: add/fix I2C controllers for sc5xx

PATCH In review Jie Zhang 2 participants 4 messages Apr 3 – Jun 12 Arm (32-bit)

lore
Share & tools
lore

Jie Zhang

author
#0 lore raw

cover arm: dts: add/fix I2C controllers for sc5xx

From: Jie Zhang <[email protected]>

This patch depends on Caleb's patch set:

https://lore.kernel.org/u-boot/[email protected]/

Jie Zhang (1):
arm: dts: add/fix I2C controllers for sc5xx

 arch/arm/dts/sc573-ezlite.dts    |  2 ++
 arch/arm/dts/sc584-ezkit.dts     |  2 ++
 arch/arm/dts/sc589-ezkit.dts     |  2 ++
 arch/arm/dts/sc594-som.dtsi      | 13 +++++++++++++
 arch/arm/dts/sc598-som-revD.dtsi |  2 ++
 arch/arm/dts/sc598-som-revE.dtsi |  2 ++
 arch/arm/dts/sc598-som.dtsi      | 12 ++++++++++++
 arch/arm/dts/sc59x.dtsi          | 30 ++++++++++++++++++++++++++++++
 arch/arm/dts/sc5xx.dtsi          | 12 ++++++------
 9 files changed, 71 insertions(+), 6 deletions(-)
Signature · 1 line
2.53.0
author
#1 lore raw

PATCH 1/1 arm: dts: add/fix I2C controllers for sc5xx

From: Jie Zhang <[email protected]>

sc59x processors have 6 I2C controllers, but their devicetrees currently have only 3. The length of its register block should be 0x100 instead of 0x1000. All I2C nodes should be disabled in sc5xx.dtsi. They can be enabled in board devicetree files if they are used on the boards. Add missing I2C controllers and fix the above issues.

---
 arch/arm/dts/sc573-ezlite.dts    |  2 ++
 arch/arm/dts/sc584-ezkit.dts     |  2 ++
 arch/arm/dts/sc589-ezkit.dts     |  2 ++
 arch/arm/dts/sc594-som.dtsi      | 13 +++++++++++++
 arch/arm/dts/sc598-som-revD.dtsi |  2 ++
 arch/arm/dts/sc598-som-revE.dtsi |  2 ++
 arch/arm/dts/sc598-som.dtsi      | 12 ++++++++++++
 arch/arm/dts/sc59x.dtsi          | 30 ++++++++++++++++++++++++++++++
 arch/arm/dts/sc5xx.dtsi          | 12 ++++++------
 9 files changed, 71 insertions(+), 6 deletions(-)
arch/arm/dts/sc573-ezlite.dts +2 -0
index 57604d707f7..f128c4f9697 100644
@@ -14,6 +14,8 @@
 };
 
 &i2c0 {
+	status = "okay";
+
 	gpio_expander0: mcp23017@21 {
 		compatible = "microchip,mcp23017";
 		reg = <0x21>;
arch/arm/dts/sc584-ezkit.dts +2 -0
index 176faa50672..3a6d60b3f29 100644
@@ -13,6 +13,8 @@
 };
 
 &i2c2 {
+	status = "okay";
+
 	gpio_expander0: mcp23017@21 {
 		compatible = "microchip,mcp23017";
 		reg = <0x21>;
arch/arm/dts/sc589-ezkit.dts +2 -0
index d8eb5b6f8fe..04ad8e44cbb 100644
@@ -17,6 +17,8 @@
 &i2c0 {
 	#address-cells = <1>;
 	#size-cells = <0>;
+	status = "okay";
+
 	gpio_expander0: mcp23017@21 {
 		compatible = "microchip,mcp23017";
 		reg = <0x21>;
arch/arm/dts/sc594-som.dtsi +13 -0
index 1c2adc601dd..c4373aea60f 100644
@@ -79,6 +79,7 @@
 
 &i2c2 {
 	clocks = <&clk ADSP_SC594_CLK_CGU0_SCLK0>;
+	status = "okay";
 
 	som_gpio_expander: mcp23017@21 {
 		compatible = "microchip,mcp23017";
@@ -153,6 +154,18 @@
 	};
 };
 
+&i2c3 {
+	clocks = <&clk ADSP_SC594_CLK_CGU0_SCLK0>;
+};
+
+&i2c4 {
+	clocks = <&clk ADSP_SC594_CLK_CGU0_SCLK0>;
+};
+
+&i2c5 {
+	clocks = <&clk ADSP_SC594_CLK_CGU0_SCLK0>;
+};
+
 &ospi {
 	status = "okay";
 
arch/arm/dts/sc598-som-revD.dtsi +2 -0
index 26e272966ff..06d550b8532 100644
@@ -8,6 +8,8 @@
 #include "sc598-som.dtsi"
 
 &i2c2 {
+	status = "okay";
+
 	som_gpio_expander: mcp23018@20 {
 		compatible = "microchip,mcp23018";
 		reg = <0x20>;
arch/arm/dts/sc598-som-revE.dtsi +2 -0
index bec504102e7..1f48d52109b 100644
@@ -8,6 +8,8 @@
 #include "sc598-som.dtsi"
 
 &i2c2 {
+	status = "okay";
+
 	som_gpio_expander: adp5587@34 {
 		compatible = "adi,adp5587";
 		reg = <0x34>;
arch/arm/dts/sc598-som.dtsi +12 -0
index bc212ef25cb..ac1f24c86c3 100644
@@ -138,6 +138,18 @@
 	clocks = <&clk ADSP_SC598_CLK_CGU0_SCLK0>;
 };
 
+&i2c3 {
+	clocks = <&clk ADSP_SC598_CLK_CGU0_SCLK0>;
+};
+
+&i2c4 {
+	clocks = <&clk ADSP_SC598_CLK_CGU0_SCLK0>;
+};
+
+&i2c5 {
+	clocks = <&clk ADSP_SC598_CLK_CGU0_SCLK0>;
+};
+
 &spi2 {
 	clocks = <&clk ADSP_SC598_CLK_SPI>;
 };
arch/arm/dts/sc59x.dtsi +30 -0
index ff279cca2d1..64e5a1afc53 100644
@@ -86,6 +86,36 @@
 			pinctrl-0 = <&usb0_default>;
 			status = "disabled";
 		};
+
+		i2c3: i2c3@31001000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "adi-i2c";
+			reg = <0x31001000 0x100>;
+			clock-names = "i2c";
+			status = "disabled";
+			bootph-pre-ram;
+		};
+
+		i2c4: i2c4@31001100 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "adi-i2c";
+			reg = <0x31001100 0x100>;
+			clock-names = "i2c";
+			status = "disabled";
+			bootph-pre-ram;
+		};
+
+		i2c5: i2c5@31001200 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "adi-i2c";
+			reg = <0x31001200 0x100>;
+			clock-names = "i2c";
+			status = "disabled";
+			bootph-pre-ram;
+		};
 	};
 };
 
arch/arm/dts/sc5xx.dtsi +6 -6
index 072631e34f7..b821deddda7 100644
@@ -140,9 +140,9 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "adi-i2c";
-			reg = <0x31001400 0x1000>;
+			reg = <0x31001400 0x100>;
 			clock-names = "i2c";
-			status = "okay";
+			status = "disabled";
 			bootph-pre-ram;
 		};
 
@@ -150,9 +150,9 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "adi-i2c";
-			reg = <0x31001500 0x1000>;
+			reg = <0x31001500 0x100>;
 			clock-names = "i2c";
-			status = "okay";
+			status = "disabled";
 			bootph-pre-ram;
 		};
 
@@ -160,9 +160,9 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "adi-i2c";
-			reg = <0x31001600 0x1000>;
+			reg = <0x31001600 0x100>;
 			clock-names = "i2c";
-			status = "okay";
+			status = "disabled";
 			bootph-pre-ram;
 		};
 	};
Signature · 1 line
2.53.0
#2 lore raw
Quoted 10 lines · Jie Zhang

From: Jie Zhang <[email protected]>

sc59x processors have 6 I2C controllers, but their devicetrees currently have only 3. The length of its register block should be 0x100 instead of 0x1000. All I2C nodes should be disabled in sc5xx.dtsi. They can be enabled in board devicetree files if they are used on the boards. Add missing I2C controllers and fix the above issues.

Quoted 11 lines
---
 arch/arm/dts/sc573-ezlite.dts    |  2 ++
 arch/arm/dts/sc584-ezkit.dts     |  2 ++
 arch/arm/dts/sc589-ezkit.dts     |  2 ++
 arch/arm/dts/sc594-som.dtsi      | 13 +++++++++++++
 arch/arm/dts/sc598-som-revD.dtsi |  2 ++
 arch/arm/dts/sc598-som-revE.dtsi |  2 ++
 arch/arm/dts/sc598-som.dtsi      | 12 ++++++++++++
 arch/arm/dts/sc59x.dtsi          | 30 ++++++++++++++++++++++++++++++
 arch/arm/dts/sc5xx.dtsi          | 12 ++++++------
 9 files changed, 71 insertions(+), 6 deletions(-)

This no longer applies to current master, sorry, please rebase and resend.

Signature · 1 line
Tom
#3 lore raw
In reply to Jie Zhang
Quoted 8 lines · Jie Zhang

sc59x processors have 6 I2C controllers, but their devicetrees currently have only 3. The length of its register block should be 0x100 instead of 0x1000. All I2C nodes should be disabled in sc5xx.dtsi. They can be enabled in board devicetree files if they are used on the boards. Add missing I2C controllers and fix the above issues.

[...]

Applied to u-boot/next, thanks!

[1/1] arm: dts: add/fix I2C controllers for sc5xx

      commit: 38c49e01a01d444c78ce3d94fbf0d1a6bf3779ff
Signature · 1 line
Tom