* [PATCH v3 1/9] ARM: dts: aspeed: yosemite4: add i2c-mux for all Server Board slots
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 2/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs Delphine CC Chiu
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery
Cc: Ricky CX Wu, Delphine CC Chiu, devicetree, linux-arm-kernel,
linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Add i2c mux to 8 slots of server board and add the io expanders and
eeprom for the slots.
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
.../aspeed/aspeed-bmc-facebook-yosemite4.dts | 238 +++++++++++++++++-
1 file changed, 234 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index ae2a2ed603ff..5d623d0355df 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -18,6 +18,14 @@ aliases {
serial7 = &uart8;
serial8 = &uart9;
+ i2c16 = &imux16;
+ i2c17 = &imux17;
+ i2c18 = &imux18;
+ i2c19 = &imux19;
+ i2c20 = &imux20;
+ i2c21 = &imux21;
+ i2c22 = &imux22;
+ i2c23 = &imux23;
i2c34 = &imux34;
i2c35 = &imux35;
};
@@ -517,24 +525,246 @@ power-sensor@40 {
};
&i2c8 {
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "okay";
bus-frequency = <400000>;
i2c-mux@70 {
compatible = "nxp,pca9544";
- idle-state = <0>;
- i2c-mux-idle-disconnect;
reg = <0x70>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ i2c-mux-idle-disconnect;
+
+ imux16: i2c@0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ gpio@49 {
+ compatible = "nxp,pca9537";
+ reg = <0x49>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ };
+
+ eeprom@51 {
+ compatible = "atmel,24c128";
+ reg = <0x51>;
+ };
+
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+ };
+
+ imux17: i2c@1 {
+ reg = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ gpio@49 {
+ compatible = "nxp,pca9537";
+ reg = <0x49>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ };
+
+ eeprom@51 {
+ compatible = "atmel,24c128";
+ reg = <0x51>;
+ };
+
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+ };
+
+ imux18: i2c@2 {
+ reg = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ gpio@49 {
+ compatible = "nxp,pca9537";
+ reg = <0x49>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ };
+
+ eeprom@51 {
+ compatible = "atmel,24c128";
+ reg = <0x51>;
+ };
+
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+ };
+
+ imux19: i2c@3 {
+ reg = <3>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ gpio@49 {
+ compatible = "nxp,pca9537";
+ reg = <0x49>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ };
+
+ eeprom@51 {
+ compatible = "atmel,24c128";
+ reg = <0x51>;
+ };
+
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+ };
};
};
&i2c9 {
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "okay";
bus-frequency = <400000>;
i2c-mux@71 {
compatible = "nxp,pca9544";
- idle-state = <0>;
- i2c-mux-idle-disconnect;
reg = <0x71>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ i2c-mux-idle-disconnect;
+
+ imux20: i2c@0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ gpio@49 {
+ compatible = "nxp,pca9537";
+ reg = <0x49>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ };
+
+ eeprom@51 {
+ compatible = "atmel,24c128";
+ reg = <0x51>;
+ };
+
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+ };
+
+ imux21: i2c@1 {
+ reg = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ gpio@49 {
+ compatible = "nxp,pca9537";
+ reg = <0x49>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ };
+
+ eeprom@51 {
+ compatible = "atmel,24c128";
+ reg = <0x51>;
+ };
+
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+ };
+
+ imux22: i2c@2 {
+ reg = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ gpio@49 {
+ compatible = "nxp,pca9537";
+ reg = <0x49>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ };
+
+ eeprom@51 {
+ compatible = "atmel,24c128";
+ reg = <0x51>;
+ };
+
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+ };
+
+ imux23: i2c@3 {
+ reg = <3>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ gpio@49 {
+ compatible = "nxp,pca9537";
+ reg = <0x49>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c128";
+ reg = <0x50>;
+ };
+
+ eeprom@51 {
+ compatible = "atmel,24c128";
+ reg = <0x51>;
+ };
+
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+ };
};
};
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 2/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 1/9] ARM: dts: aspeed: yosemite4: add i2c-mux for all Server Board slots Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 3/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for CPLD IOE on Spider Board Delphine CC Chiu
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery
Cc: Ricky CX Wu, Delphine CC Chiu, devicetree, linux-arm-kernel,
linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Add i2c-mux on Spider board for four NICs and add the temperature sensor
and EEPROM for the NICs.
Also remove the mctp-controller property on I2C bus 15 because we need
to add the property on the I2C mux to each NIC so that the MCTP driver
will ensure that each port is configured properly before communicating
with the NICs.
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
.../aspeed/aspeed-bmc-facebook-yosemite4.dts | 75 ++++++++++++++++++-
1 file changed, 72 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index 5d623d0355df..fc8af704fe20 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -26,6 +26,10 @@ aliases {
i2c21 = &imux21;
i2c22 = &imux22;
i2c23 = &imux23;
+ i2c24 = &imux24;
+ i2c25 = &imux25;
+ i2c26 = &imux26;
+ i2c27 = &imux27;
i2c34 = &imux34;
i2c35 = &imux35;
};
@@ -1168,8 +1172,9 @@ adc@35 {
};
&i2c15 {
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "okay";
- mctp-controller;
multi-master;
bus-frequency = <400000>;
@@ -1180,9 +1185,73 @@ mctp@10 {
i2c-mux@72 {
compatible = "nxp,pca9544";
- idle-state = <0>;
- i2c-mux-idle-disconnect;
reg = <0x72>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ imux24: i2c@0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ mctp-controller;
+ temperature-sensor@1f {
+ compatible = "ti,tmp421";
+ reg = <0x1f>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
+
+ imux25: i2c@1 {
+ reg = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ mctp-controller;
+ temperature-sensor@1f {
+ compatible = "ti,tmp421";
+ reg = <0x1f>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
+
+ imux26: i2c@2 {
+ reg = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ mctp-controller;
+ temperature-sensor@1f {
+ compatible = "ti,tmp421";
+ reg = <0x1f>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
+
+ imux27: i2c@3 {
+ reg = <3>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ mctp-controller;
+ temperature-sensor@1f {
+ compatible = "ti,tmp421";
+ reg = <0x1f>;
+ };
+
+ eeprom@50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
};
};
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 3/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for CPLD IOE on Spider Board
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 1/9] ARM: dts: aspeed: yosemite4: add i2c-mux for all Server Board slots Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 2/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 4/9] ARM: dts: aspeed: yosemite4: Add required properties for IOE on fan boards Delphine CC Chiu
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery
Cc: Ricky CX Wu, Delphine CC Chiu, devicetree, linux-arm-kernel,
linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Add I2C mux for CPLD IOE on Spider Board.
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
.../aspeed/aspeed-bmc-facebook-yosemite4.dts | 66 +++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index fc8af704fe20..62fe4d513852 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -30,6 +30,8 @@ aliases {
i2c25 = &imux25;
i2c26 = &imux26;
i2c27 = &imux27;
+ i2c28 = &imux28;
+ i2c29 = &imux29;
i2c34 = &imux34;
i2c35 = &imux35;
};
@@ -773,8 +775,72 @@ eeprom@54 {
};
&i2c10 {
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "okay";
bus-frequency = <400000>;
+ i2c-mux@74 {
+ compatible = "nxp,pca9544";
+ reg = <0x74>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ i2c-mux-idle-disconnect;
+
+ imux28: i2c@0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ gpio@20 {
+ compatible = "nxp,pca9506";
+ reg = <0x20>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ gpio@21 {
+ compatible = "nxp,pca9506";
+ reg = <0x21>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ gpio@22 {
+ compatible = "nxp,pca9506";
+ reg = <0x22>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ gpio@23 {
+ compatible = "nxp,pca9506";
+ reg = <0x23>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ gpio@24 {
+ compatible = "nxp,pca9506";
+ reg = <0x24>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-line-names = "","","","",
+ "NIC0_MAIN_PWR_EN",
+ "NIC1_MAIN_PWR_EN",
+ "NIC2_MAIN_PWR_EN",
+ "NIC3_MAIN_PWR_EN",
+ "","","","","","","","",
+ "","","","","","","","",
+ "","","","","","","","";
+ };
+ };
+
+ imux29: i2c@1 {
+ reg = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
};
&i2c11 {
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 4/9] ARM: dts: aspeed: yosemite4: Add required properties for IOE on fan boards
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (2 preceding siblings ...)
2024-10-03 7:42 ` [PATCH v3 3/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for CPLD IOE on Spider Board Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 5/9] ARM: dts: aspeed: yosemite4: correct the compatible string for max31790 Delphine CC Chiu
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery, Delphine CC Chiu
Cc: Ricky CX Wu, devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Add the required properties for IO expander on fan boards.
Fixes: 2b8d94f4b4a4 ("ARM: dts: aspeed: yosemite4: add Facebook Yosemite 4 BMC")
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index 62fe4d513852..5a995d8c326a 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -1124,6 +1124,8 @@ pwm@20{
gpio@22{
compatible = "ti,tca6424";
reg = <0x22>;
+ gpio-controller;
+ #gpio-cells = <2>;
};
pwm@23{
@@ -1174,6 +1176,8 @@ pwm@20{
gpio@22{
compatible = "ti,tca6424";
reg = <0x22>;
+ gpio-controller;
+ #gpio-cells = <2>;
};
pwm@23{
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 5/9] ARM: dts: aspeed: yosemite4: correct the compatible string for max31790
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (3 preceding siblings ...)
2024-10-03 7:42 ` [PATCH v3 4/9] ARM: dts: aspeed: yosemite4: Add required properties for IOE on fan boards Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 6/9] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards Delphine CC Chiu
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery, Delphine CC Chiu
Cc: Ricky CX Wu, devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Fix the compatible string for max31790 to match the binding document.
Fixes: 2b8d94f4b4a4 ("ARM: dts: aspeed: yosemite4: add Facebook Yosemite 4 BMC")
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
.../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index 5a995d8c326a..9a9096c94328 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -1115,10 +1115,8 @@ adc@1f {
};
pwm@20{
- compatible = "max31790";
+ compatible = "maxim,max31790";
reg = <0x20>;
- #address-cells = <1>;
- #size-cells = <0>;
};
gpio@22{
@@ -1129,10 +1127,8 @@ gpio@22{
};
pwm@23{
- compatible = "max31790";
+ compatible = "maxim,max31790";
reg = <0x23>;
- #address-cells = <1>;
- #size-cells = <0>;
};
adc@33 {
@@ -1167,10 +1163,8 @@ adc@1f {
};
pwm@20{
- compatible = "max31790";
+ compatible = "maxim,max31790";
reg = <0x20>;
- #address-cells = <1>;
- #size-cells = <0>;
};
gpio@22{
@@ -1181,10 +1175,8 @@ gpio@22{
};
pwm@23{
- compatible = "max31790";
+ compatible = "maxim,max31790";
reg = <0x23>;
- #address-cells = <1>;
- #size-cells = <0>;
};
adc@33 {
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 6/9] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (4 preceding siblings ...)
2024-10-03 7:42 ` [PATCH v3 5/9] ARM: dts: aspeed: yosemite4: correct the compatible string for max31790 Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 7/9] ARM: dts: aspeed: yosemite4: Change the address of Fan IC on " Delphine CC Chiu
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery
Cc: Ricky CX Wu, Delphine CC Chiu, devicetree, linux-arm-kernel,
linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Change the address of the I2C mux for two fan boards to 0x74
according to schematic.
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
.../aspeed/aspeed-bmc-facebook-yosemite4.dts | 76 ++++++++++---------
1 file changed, 39 insertions(+), 37 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index 9a9096c94328..7531ac217c81 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -32,6 +32,8 @@ aliases {
i2c27 = &imux27;
i2c28 = &imux28;
i2c29 = &imux29;
+ i2c30 = &imux30;
+ i2c31 = &imux31;
i2c34 = &imux34;
i2c35 = &imux35;
};
@@ -1034,6 +1036,8 @@ ipmb@10 {
};
&i2c14 {
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "okay";
bus-frequency = <400000>;
adc@1d {
@@ -1094,20 +1098,50 @@ eeprom@51 {
reg = <0x51>;
};
- i2c-mux@71 {
- compatible = "nxp,pca9846";
+ i2c-mux@73 {
+ compatible = "nxp,pca9544";
#address-cells = <1>;
#size-cells = <0>;
idle-state = <0>;
i2c-mux-idle-disconnect;
- reg = <0x71>;
+ reg = <0x73>;
i2c@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
+ adc@35 {
+ compatible = "maxim,max11617";
+ reg = <0x35>;
+ };
+ };
+
+ i2c@1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ adc@35 {
+ compatible = "maxim,max11617";
+ reg = <0x35>;
+ };
+ };
+ };
+
+ i2c-mux@74 {
+ compatible = "nxp,pca9546";
+ reg = <0x74>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ i2c-mux-idle-disconnect;
+
+ imux30: i2c@0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
adc@1f {
compatible = "ti,adc128d818";
reg = <0x1f>;
@@ -1151,10 +1185,10 @@ gpio@61 {
};
};
- i2c@1 {
+ imux31: i2c@1 {
+ reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
- reg = <0>;
adc@1f {
compatible = "ti,adc128d818";
@@ -1199,38 +1233,6 @@ gpio@61 {
};
};
};
-
- i2c-mux@73 {
- compatible = "nxp,pca9544";
- #address-cells = <1>;
- #size-cells = <0>;
-
- idle-state = <0>;
- i2c-mux-idle-disconnect;
- reg = <0x73>;
-
- i2c@0 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
-
- adc@35 {
- compatible = "maxim,max11617";
- reg = <0x35>;
- };
- };
-
- i2c@1 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
-
- adc@35 {
- compatible = "maxim,max11617";
- reg = <0x35>;
- };
- };
- };
};
&i2c15 {
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 7/9] ARM: dts: aspeed: yosemite4: Change the address of Fan IC on fan boards
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (5 preceding siblings ...)
2024-10-03 7:42 ` [PATCH v3 6/9] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 8/9] ARM: dts: aspeed: yosemite4: Revise adc128d818 adc mode on Fan Boards Delphine CC Chiu
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery
Cc: Ricky CX Wu, Delphine CC Chiu, devicetree, linux-arm-kernel,
linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Change the address of Fan IC: Max31790 on fan boards according to
schematic.
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
.../arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index 7531ac217c81..6b8fce786963 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -1160,9 +1160,9 @@ gpio@22{
#gpio-cells = <2>;
};
- pwm@23{
+ pwm@2f{
compatible = "maxim,max31790";
- reg = <0x23>;
+ reg = <0x2f>;
};
adc@33 {
@@ -1208,9 +1208,9 @@ gpio@22{
#gpio-cells = <2>;
};
- pwm@23{
+ pwm@2f{
compatible = "maxim,max31790";
- reg = <0x23>;
+ reg = <0x2f>;
};
adc@33 {
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 8/9] ARM: dts: aspeed: yosemite4: Revise adc128d818 adc mode on Fan Boards
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (6 preceding siblings ...)
2024-10-03 7:42 ` [PATCH v3 7/9] ARM: dts: aspeed: yosemite4: Change the address of Fan IC on " Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-03 7:42 ` [PATCH v3 9/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board Delphine CC Chiu
2024-10-04 0:39 ` [PATCH v3 0/9] Add I2C mux devices for yosemite4 Andrew Jeffery
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery
Cc: Ricky CX Wu, Delphine CC Chiu, devicetree, linux-arm-kernel,
linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Revise adc128d818 adc mode on Fan Boards according to schematic.
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index 6b8fce786963..bc25c11df255 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -1145,7 +1145,7 @@ imux30: i2c@0 {
adc@1f {
compatible = "ti,adc128d818";
reg = <0x1f>;
- ti,mode = /bits/ 8 <2>;
+ ti,mode = /bits/ 8 <1>;
};
pwm@20{
@@ -1193,7 +1193,7 @@ imux31: i2c@1 {
adc@1f {
compatible = "ti,adc128d818";
reg = <0x1f>;
- ti,mode = /bits/ 8 <2>;
+ ti,mode = /bits/ 8 <1>;
};
pwm@20{
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 9/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (7 preceding siblings ...)
2024-10-03 7:42 ` [PATCH v3 8/9] ARM: dts: aspeed: yosemite4: Revise adc128d818 adc mode on Fan Boards Delphine CC Chiu
@ 2024-10-03 7:42 ` Delphine CC Chiu
2024-10-04 0:39 ` [PATCH v3 0/9] Add I2C mux devices for yosemite4 Andrew Jeffery
9 siblings, 0 replies; 11+ messages in thread
From: Delphine CC Chiu @ 2024-10-03 7:42 UTC (permalink / raw)
To: patrick, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery
Cc: Ricky CX Wu, Delphine CC Chiu, devicetree, linux-arm-kernel,
linux-aspeed, linux-kernel
From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Add I2C mux for ADC monitors on Spider Board.
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
---
.../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index bc25c11df255..ab4904cf2c0e 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -34,6 +34,8 @@ aliases {
i2c29 = &imux29;
i2c30 = &imux30;
i2c31 = &imux31;
+ i2c32 = &imux32;
+ i2c33 = &imux33;
i2c34 = &imux34;
i2c35 = &imux35;
};
@@ -1100,29 +1102,25 @@ eeprom@51 {
i2c-mux@73 {
compatible = "nxp,pca9544";
+ reg = <0x73>;
#address-cells = <1>;
#size-cells = <0>;
-
- idle-state = <0>;
i2c-mux-idle-disconnect;
- reg = <0x73>;
- i2c@0 {
+ imux32: i2c@0 {
+ reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
- reg = <0>;
-
adc@35 {
compatible = "maxim,max11617";
reg = <0x35>;
};
};
- i2c@1 {
+ imux33: i2c@1 {
+ reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
- reg = <0>;
-
adc@35 {
compatible = "maxim,max11617";
reg = <0x35>;
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v3 0/9] Add I2C mux devices for yosemite4
2024-10-03 7:42 [PATCH v3 0/9] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (8 preceding siblings ...)
2024-10-03 7:42 ` [PATCH v3 9/9] ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board Delphine CC Chiu
@ 2024-10-04 0:39 ` Andrew Jeffery
9 siblings, 0 replies; 11+ messages in thread
From: Andrew Jeffery @ 2024-10-04 0:39 UTC (permalink / raw)
To: patrick, Delphine CC Chiu
Cc: Ricky CX Wu, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
On Thu, 03 Oct 2024 15:42:41 +0800, Delphine CC Chiu wrote:
> From: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
>
> - v3
> - Merge the remove mctp property patch to patch 02.
> - Order the patch to correct compatible string of max31790 before patch
> 06.
> - v2
> - Remove mctp property on I2C Bus 15.
> - Add required properties for IOE on fan boards.
>
> [...]
Thanks, I've applied this to be picked up through the BMC tree.
--
Andrew Jeffery <andrew@codeconstruct.com.au>
^ permalink raw reply [flat|nested] 11+ messages in thread