* [PATCH v2 1/3] ARM: dts: aspeed: catalina: move hdd board i2c mux bus to i2c5
2024-09-26 7:10 [PATCH v2 0/3] ARM: dts: aspeed: catalina: dts update for EVT and DVT schematic Potin Lai
@ 2024-09-26 7:10 ` Potin Lai
2024-09-26 7:10 ` [PATCH v2 2/3] ARM: dts: aspeed: catalina: enable mac2 Potin Lai
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Potin Lai @ 2024-09-26 7:10 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Patrick Williams
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
Potin Lai, Potin Lai
From: Potin Lai <potin.lai@quantatw.com>
Due to EVT hardware changes, move HDD board i2c mux bus from i2c30 to i2c5.
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
---
.../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 165 +++++++++++----------
1 file changed, 83 insertions(+), 82 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
index fa0921a4afe2..eac6e33e98f4 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
@@ -50,14 +50,14 @@ aliases {
i2c45 = &i2c0mux5ch1;
i2c46 = &i2c0mux5ch2;
i2c47 = &i2c0mux5ch3;
- i2c48 = &i2c30mux0ch0;
- i2c49 = &i2c30mux0ch1;
- i2c50 = &i2c30mux0ch2;
- i2c51 = &i2c30mux0ch3;
- i2c52 = &i2c30mux0ch4;
- i2c53 = &i2c30mux0ch5;
- i2c54 = &i2c30mux0ch6;
- i2c55 = &i2c30mux0ch7;
+ i2c48 = &i2c5mux0ch0;
+ i2c49 = &i2c5mux0ch1;
+ i2c50 = &i2c5mux0ch2;
+ i2c51 = &i2c5mux0ch3;
+ i2c52 = &i2c5mux0ch4;
+ i2c53 = &i2c5mux0ch5;
+ i2c54 = &i2c5mux0ch6;
+ i2c55 = &i2c5mux0ch7;
};
chosen {
@@ -244,80 +244,6 @@ i2c0mux1ch2: i2c@2 {
#address-cells = <1>;
#size-cells = <0>;
reg = <2>;
- i2c-mux@70 {
- compatible = "nxp,pca9548";
- reg = <0x70>;
- #address-cells = <1>;
- #size-cells = <0>;
- i2c-mux-idle-disconnect;
-
- i2c30mux0ch0: i2c@0 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
- };
- i2c30mux0ch1: i2c@1 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <1>;
- };
- i2c30mux0ch2: i2c@2 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <2>;
- };
- i2c30mux0ch3: i2c@3 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <3>;
- };
- i2c30mux0ch4: i2c@4 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <4>;
- };
- i2c30mux0ch5: i2c@5 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <5>;
- };
- i2c30mux0ch6: i2c@6 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <6>;
- // HDD FRU EEPROM
- eeprom@52 {
- compatible = "atmel,24c64";
- reg = <0x52>;
- };
- };
- i2c30mux0ch7: i2c@7 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <7>;
-
- power-sensor@40 {
- compatible = "ti,ina230";
- reg = <0x40>;
- shunt-resistor = <2000>;
- };
- power-sensor@41 {
- compatible = "ti,ina230";
- reg = <0x41>;
- shunt-resistor = <2000>;
- };
- power-sensor@44 {
- compatible = "ti,ina230";
- reg = <0x44>;
- shunt-resistor = <2000>;
- };
- power-sensor@45 {
- compatible = "ti,ina230";
- reg = <0x45>;
- shunt-resistor = <2000>;
- };
- };
- };
};
i2c0mux1ch3: i2c@3 {
#address-cells = <1>;
@@ -647,6 +573,81 @@ &i2c4 {
&i2c5 {
status = "okay";
+
+ i2c-mux@70 {
+ compatible = "nxp,pca9548";
+ reg = <0x70>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ i2c-mux-idle-disconnect;
+
+ i2c5mux0ch0: i2c@0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+ };
+ i2c5mux0ch1: i2c@1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+ };
+ i2c5mux0ch2: i2c@2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <2>;
+ };
+ i2c5mux0ch3: i2c@3 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <3>;
+ };
+ i2c5mux0ch4: i2c@4 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <4>;
+ };
+ i2c5mux0ch5: i2c@5 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <5>;
+ };
+ i2c5mux0ch6: i2c@6 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <6>;
+ // HDD FRU EEPROM
+ eeprom@52 {
+ compatible = "atmel,24c64";
+ reg = <0x52>;
+ };
+ };
+ i2c5mux0ch7: i2c@7 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <7>;
+
+ power-sensor@40 {
+ compatible = "ti,ina230";
+ reg = <0x40>;
+ shunt-resistor = <2000>;
+ };
+ power-sensor@41 {
+ compatible = "ti,ina230";
+ reg = <0x41>;
+ shunt-resistor = <2000>;
+ };
+ power-sensor@44 {
+ compatible = "ti,ina230";
+ reg = <0x44>;
+ shunt-resistor = <2000>;
+ };
+ power-sensor@45 {
+ compatible = "ti,ina230";
+ reg = <0x45>;
+ shunt-resistor = <2000>;
+ };
+ };
+ };
};
&i2c6 {
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 2/3] ARM: dts: aspeed: catalina: enable mac2
2024-09-26 7:10 [PATCH v2 0/3] ARM: dts: aspeed: catalina: dts update for EVT and DVT schematic Potin Lai
2024-09-26 7:10 ` [PATCH v2 1/3] ARM: dts: aspeed: catalina: move hdd board i2c mux bus to i2c5 Potin Lai
@ 2024-09-26 7:10 ` Potin Lai
2024-09-26 7:10 ` [PATCH v2 3/3] ARM: dts: aspeed: catalina: update NIC1 fru address Potin Lai
2024-09-27 2:34 ` [PATCH v2 0/3] ARM: dts: aspeed: catalina: dts update for EVT and DVT schematic Andrew Jeffery
3 siblings, 0 replies; 5+ messages in thread
From: Potin Lai @ 2024-09-26 7:10 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Patrick Williams
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
Potin Lai, Potin Lai
Enable mac2 in advance for DVT HW schematic.
- EVT system:
- eth0 (mac2): no NCSI
- eth1 (mac3): with NCSI
- DVT system:
- eth0 (mac2): with NCSI
- eth1 (mac3): with NCSI
Signed-off-by: Potin Lai <potin.lai.pt@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
index eac6e33e98f4..9502d483e738 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
@@ -153,6 +153,13 @@ &uart5 {
status = "okay";
};
+&mac2 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ncsi3_default>;
+ use-ncsi;
+};
+
&mac3 {
status = "okay";
pinctrl-names = "default";
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 3/3] ARM: dts: aspeed: catalina: update NIC1 fru address
2024-09-26 7:10 [PATCH v2 0/3] ARM: dts: aspeed: catalina: dts update for EVT and DVT schematic Potin Lai
2024-09-26 7:10 ` [PATCH v2 1/3] ARM: dts: aspeed: catalina: move hdd board i2c mux bus to i2c5 Potin Lai
2024-09-26 7:10 ` [PATCH v2 2/3] ARM: dts: aspeed: catalina: enable mac2 Potin Lai
@ 2024-09-26 7:10 ` Potin Lai
2024-09-27 2:34 ` [PATCH v2 0/3] ARM: dts: aspeed: catalina: dts update for EVT and DVT schematic Andrew Jeffery
3 siblings, 0 replies; 5+ messages in thread
From: Potin Lai @ 2024-09-26 7:10 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Andrew Jeffery, Patrick Williams
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
Potin Lai, Potin Lai
Update NIC1 FRU EEPROM address to 0x52 based on EVT changes.
Signed-off-by: Potin Lai <potin.lai.pt@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
index 9502d483e738..ac3e57e9c99e 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
@@ -849,9 +849,9 @@ temperature-sensor@1f {
};
// OCP NIC1 FRU EEPROM
- eeprom@50 {
+ eeprom@52 {
compatible = "atmel,24c64";
- reg = <0x50>;
+ reg = <0x52>;
};
};
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2 0/3] ARM: dts: aspeed: catalina: dts update for EVT and DVT schematic
2024-09-26 7:10 [PATCH v2 0/3] ARM: dts: aspeed: catalina: dts update for EVT and DVT schematic Potin Lai
` (2 preceding siblings ...)
2024-09-26 7:10 ` [PATCH v2 3/3] ARM: dts: aspeed: catalina: update NIC1 fru address Potin Lai
@ 2024-09-27 2:34 ` Andrew Jeffery
3 siblings, 0 replies; 5+ messages in thread
From: Andrew Jeffery @ 2024-09-27 2:34 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley,
Patrick Williams, Potin Lai
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel, Potin Lai
On Thu, 26 Sep 2024 15:10:43 +0800, Potin Lai wrote:
> Update Catalina devicetree based on EVT and DVT schematic changes.
>
>
Thanks, I've applied this to be picked up through the BMC tree.
--
Andrew Jeffery <andrew@codeconstruct.com.au>
^ permalink raw reply [flat|nested] 5+ messages in thread