Skip to contentSkip to conversation

update aspeed-bmc-opp-zaius device-tree

PATCH Applied Patrick Venture 2 participants 5 messages Apr 16, 2019 – Apr 29, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover update aspeed-bmc-opp-zaius device-tree

Hi,

This series contains three updates to the Zaius ASPEED device-tree to add voltrage regulators, and update addresses and aliases. The Infineon and Intersil drivers are staged on hwmon-next, and the trivial device dt-bindings changed are up for review.

Maxim Sloyko (1):
ARM: dts: aspeed: zaius: add Infineon and Intersil regulators

Robert Lippert (2):
ARM: dts: aspeed: zaius: update 12V brick I2C address
ARM: dts: aspeed: zaius: fixed I2C bus numbers for pcie slots

 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 121 +++++++++++++++++++--
 1 file changed, 113 insertions(+), 8 deletions(-)
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
#1 lore raw

PATCH 1/3 ARM: dts: aspeed: zaius: add Infineon and Intersil regulators

From: Maxim Sloyko <[email protected]>

Add the nodes for the ir38064 and isl68137 devices on the Zaius board.

---
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 65 ++++++++++++++++++++--
 1 file changed, 60 insertions(+), 5 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +60 -5
index 2c5aa90a546d7..63e892f16d050 100644
@@ -296,6 +296,32 @@
 				reg = <0x54>;
 			};
 		};
+
+	};
+
+	vrm at 64 {
+		compatible = "isil,isl68137";
+		reg = <0x64>;
+	};
+
+	vrm at 40 {
+		compatible = "isil,isl68137";
+		reg = <0x40>;
+	};
+
+	vrm at 60 {
+		compatible = "isil,isl68137";
+		reg = <0x60>;
+	};
+
+	vrm at 43 {
+		compatible = "infineon,ir38064";
+		reg = <0x43>;
+	};
+
+	vrm at 41 {
+		compatible = "isil,isl68137";
+		reg = <0x41>;
 	};
 
 	/* Master selector PCA9541A @70h (other master: CPU0)
@@ -311,18 +337,47 @@
 	/* CPU0 VR ISL68137 0.7V, 0.96V PMBUS @64h */
 	/* CPU0 VR ISL68137 1.2V CH03 PMBUS @40h */
 	/* CPU0 VR ISL68137 0.8V PMBUS @60h */
-	/* CPU0 VR 1.0V IR38064 I2C @11h, PMBUS @41h */
+	/* CPU0 VR 1.0V IR38064 I2C @11h, PMBUS @43h */
 	/* CPU0 VR ISL68137 1.2V CH47 PMBUS @41h */
+	/* Master selector PCA9541A @70h (other master: CPU0)
+	 *   LM5066I PMBUS @10h
+	 */
+	/* 12V SMPS Q54SH12050NNDH @61h */
 };
 
 &i2c8 {
 	status = "okay";
 
-	/* CPU1 VR ISL68137 0.7V, 0.96V PMBUS @65h */
-	/* CPU1 VR ISL68137 1.2V CH03 PMBUS @44h */
-	/* CPU1 VR ISL68137 0.8V PMBUS @61h */
+	vrm at 64 {
+		compatible = "isil,isl68137";
+		reg = <0x64>;
+	};
+
+	vrm at 40 {
+		compatible = "isil,isl68137";
+		reg = <0x40>;
+	};
+
+	vrm at 41 {
+		compatible = "isil,isl68137";
+		reg = <0x41>;
+	};
+
+	vrm at 42 {
+		compatible = "infineon,ir38064";
+		reg = <0x42>;
+	};
+
+	vrm at 60 {
+		compatible = "isil,isl68137";
+		reg = <0x60>;
+	};
+
+	/* CPU1 VR ISL68137 0.7V, 0.96V PMBUS @64h */
+	/* CPU1 VR ISL68137 1.2V CH03 PMBUS @40h */
+	/* CPU1 VR ISL68137 1.2V CH47 PMBUS @41h */
 	/* CPU1 VR 1.0V IR38064 I2C @12h, PMBUS @42h */
-	/* CPU0 VR ISL68137 1.2V CH47 PMBUS @45h */
+	/* CPU1 VR ISL68137 0.8V PMBUS @60h */
 };
 
 
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
#2 lore raw

PATCH 2/3 ARM: dts: aspeed: zaius: update 12V brick I2C address

In reply to Patrick Venture

From: Robert Lippert <[email protected]>

The I2C address of the brick is different depending on the board SKU.

Update the values to instantiate addresses which work for most boards.

---
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +14 -4
index 63e892f16d050..51265af622574 100644
@@ -328,10 +328,21 @@
 	 *   LM5066I PMBUS @10h
 	 */
 
-	/* 12V Quarter Brick DC/DC Converter Q54SJ12050 @61h */
-	power-brick at 61 {
+	/*
+	 * Brick will be one of these types/addresses.  Depending
+	 * on the board SKU only one is actually present and will successfully
+	 * instantiate while the others will fail the probe operation.
+	 * These are the PVT (and presumably beyond) addresses:
+	 *    12V Quarter Brick DC/DC Converter Q54SJ12050 @6Ah
+	 *    12V Quarter Brick DC/DC Converter Q54SH12050 @30h
+	 */
+	power-brick at 6a {
+		compatible = "delta,dps800";
+		reg = <0x6a>;
+	};
+	power-brick at 30 {
 		compatible = "delta,dps800";
-		reg = <0x61>;
+		reg = <0x30>;
 	};
 
 	/* CPU0 VR ISL68137 0.7V, 0.96V PMBUS @64h */
@@ -342,7 +353,6 @@
 	/* Master selector PCA9541A @70h (other master: CPU0)
 	 *   LM5066I PMBUS @10h
 	 */
-	/* 12V SMPS Q54SH12050NNDH @61h */
 };
 
 &i2c8 {
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
#3 lore raw

PATCH 3/3 ARM: dts: aspeed: zaius: fixed I2C bus numbers for pcie slots

In reply to Patrick Venture

From: Robert Lippert <[email protected]>

The change to include ibm-power9-cfam.dtsi resulted in a renumbering of all of the I2C bus numbers behind the on-board muxes. This breaks some tools which have hardcoded the bus numbers.

Add device tree aliases for the I2C buses routed through the PCIe slots so that they return to their former numbers before the cfam change.

---
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +40 -0
index 51265af622574..c12f89e042efc 100644
@@ -7,6 +7,14 @@
 	model = "Zaius BMC";
 	compatible = "ingrasys,zaius-bmc", "aspeed,ast2500";
 
+	aliases {
+		i2c15 = &i2cpcie0;
+		i2c16 = &i2cpcie1;
+		i2c17 = &i2cpcie2;
+		i2c19 = &i2cpcie3;
+		i2c20 = &i2cpcie4;
+	};
+
 	chosen {
 		stdout-path = &uart5;
 		bootargs = "console=ttyS4,115200 earlyprintk";
@@ -223,6 +231,27 @@
 		reg = <0x71>;
 		#address-cells = <1>;
 		#size-cells = <0>;
+
+		i2cpcie0: i2c at 0 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0>;
+		};
+		i2cpcie1: i2c at 1 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <1>;
+		};
+		i2cpcie2: i2c at 2 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <2>;
+		};
+		i2ctpm: i2c at 3 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <3>;
+		};
 	};
 
 	/* MUX1 PCA9546A @71h
@@ -253,6 +282,17 @@
 		reg = <0x71>;
 		#address-cells = <1>;
 		#size-cells = <0>;
+
+		i2cpcie3: i2c at 0 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0>;
+		};
+		i2cpcie4: i2c at 1 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <1>;
+		};
 	};
 
 	/* MUX1 PCA9546A @71h
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
maintainer Applied
#4 lore raw
In reply to Patrick Venture
Quoted 7 lines · Patrick Venture

Hi,

This series contains three updates to the Zaius ASPEED device-tree to add voltrage regulators, and update addresses and aliases. The Infineon and Intersil drivers are staged on hwmon-next, and the trivial device dt-bindings changed are up for review.

Applied to the aspeed SoC tree, thanks Patrick.

Cheers,

Joel

Quoted 14 lines

Maxim Sloyko (1):
ARM: dts: aspeed: zaius: add Infineon and Intersil regulators

Robert Lippert (2):
ARM: dts: aspeed: zaius: update 12V brick I2C address
ARM: dts: aspeed: zaius: fixed I2C bus numbers for pcie slots

 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 121 +++++++++++++++++++--
 1 file changed, 113 insertions(+), 8 deletions(-)

--
2.21.0.392.gf8f6787159e-goog