* [PATCH v1 1/8] ARM: dts: aspeed: yosemite4: add i2c-mux for all Server Board slots
2024-09-30 7:04 [PATCH v1 0/8] Add I2C mux devices for yosemite4 Delphine CC Chiu
@ 2024-09-30 7:04 ` Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs Delphine CC Chiu
` (6 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Delphine CC Chiu @ 2024-09-30 7:04 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 b6566e2ca274..dbc992a625b7 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 related [flat|nested] 15+ messages in thread* [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs
2024-09-30 7:04 [PATCH v1 0/8] Add I2C mux devices for yosemite4 Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 1/8] ARM: dts: aspeed: yosemite4: add i2c-mux for all Server Board slots Delphine CC Chiu
@ 2024-09-30 7:04 ` Delphine CC Chiu
2024-10-01 0:37 ` Andrew Jeffery
2024-09-30 7:04 ` [PATCH v1 3/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for CPLD IOE on Spider Board Delphine CC Chiu
` (5 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Delphine CC Chiu @ 2024-09-30 7:04 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.
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 dbc992a625b7..b813140b3c5b 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;
};
@@ -1196,8 +1200,9 @@ adc@35 {
};
&i2c15 {
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "okay";
- mctp-controller;
multi-master;
bus-frequency = <400000>;
@@ -1208,9 +1213,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 related [flat|nested] 15+ messages in thread* Re: [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs
2024-09-30 7:04 ` [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs Delphine CC Chiu
@ 2024-10-01 0:37 ` Andrew Jeffery
2024-10-01 7:52 ` Delphine_CC_Chiu/WYHQ/Wiwynn
0 siblings, 1 reply; 15+ messages in thread
From: Andrew Jeffery @ 2024-10-01 0:37 UTC (permalink / raw)
To: Delphine CC Chiu, patrick, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Joel Stanley
Cc: Ricky CX Wu, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
On Mon, 2024-09-30 at 15:04 +0800, Delphine CC Chiu wrote:
> 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.
>
> 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 dbc992a625b7..b813140b3c5b 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;
> };
> @@ -1196,8 +1200,9 @@ adc@35 {
> };
>
> &i2c15 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> status = "okay";
> - mctp-controller;
Why are you deleting this if you're not also deleting the MCTP endpoint
node?
Unless there's some reason this is related to the NICs, this should be
its own patch with its own justification.
Andrew
^ permalink raw reply [flat|nested] 15+ messages in thread* RE: [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs
2024-10-01 0:37 ` Andrew Jeffery
@ 2024-10-01 7:52 ` Delphine_CC_Chiu/WYHQ/Wiwynn
2024-10-02 1:47 ` Andrew Jeffery
0 siblings, 1 reply; 15+ messages in thread
From: Delphine_CC_Chiu/WYHQ/Wiwynn @ 2024-10-01 7:52 UTC (permalink / raw)
To: Andrew Jeffery, Delphine_CC_Chiu/WYHQ/Wiwynn, patrick@stwcx.xyz,
Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley
Cc: Ricky CX Wu, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org
> -----Original Message-----
> From: Andrew Jeffery <andrew@codeconstruct.com.au>
> Sent: Tuesday, October 1, 2024 8:37 AM
> To: Delphine_CC_Chiu/WYHQ/Wiwynn <Delphine_CC_Chiu@wiwynn.com>;
> patrick@stwcx.xyz; Rob Herring <robh@kernel.org>; Krzysztof Kozlowski
> <krzk+dt@kernel.org>; Conor Dooley <conor+dt@kernel.org>; Joel Stanley
> <joel@jms.id.au>
> Cc: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>;
> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four
> NICs
>
> [External Sender]
>
> [External Sender]
>
> On Mon, 2024-09-30 at 15:04 +0800, Delphine CC Chiu wrote:
> > 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.
> >
> > 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 dbc992a625b7..b813140b3c5b 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;
> > };
> > @@ -1196,8 +1200,9 @@ adc@35 {
> > };
> >
> > &i2c15 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > status = "okay";
> > - mctp-controller;
>
> Why are you deleting this if you're not also deleting the MCTP endpoint node?
>
> Unless there's some reason this is related to the NICs, this should be its own
> patch with its own justification.
>
> Andrew
Hi Andrew,
We have discussed with Jeremy from Code Construct about removing the
mctp-controller on bus 15 before.
He thought it would be better to add the mctp-controller on each i2c mux port
so the MCTP driver would ensure that the mux was configured properly before
communicating with the device.
I'll split a patch to remove the mctp-controller on bus 15 in next serial of patches.
Regards,
Ricky
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs
2024-10-01 7:52 ` Delphine_CC_Chiu/WYHQ/Wiwynn
@ 2024-10-02 1:47 ` Andrew Jeffery
2024-10-03 7:42 ` Delphine_CC_Chiu/WYHQ/Wiwynn
0 siblings, 1 reply; 15+ messages in thread
From: Andrew Jeffery @ 2024-10-02 1:47 UTC (permalink / raw)
To: Delphine_CC_Chiu/WYHQ/Wiwynn, patrick@stwcx.xyz, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Joel Stanley
Cc: Ricky CX Wu, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org
On Tue, 2024-10-01 at 07:52 +0000, Delphine_CC_Chiu/WYHQ/Wiwynn wrote:
>
> > -----Original Message-----
> > From: Andrew Jeffery <andrew@codeconstruct.com.au>
> > Sent: Tuesday, October 1, 2024 8:37 AM
> > To: Delphine_CC_Chiu/WYHQ/Wiwynn <Delphine_CC_Chiu@wiwynn.com>;
> > patrick@stwcx.xyz; Rob Herring <robh@kernel.org>; Krzysztof Kozlowski
> > <krzk+dt@kernel.org>; Conor Dooley <conor+dt@kernel.org>; Joel Stanley
> > <joel@jms.id.au>
> > Cc: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>;
> > devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> > linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org
> > Subject: Re: [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four
> > NICs
> >
> > [External Sender]
> >
> > [External Sender]
> >
> > On Mon, 2024-09-30 at 15:04 +0800, Delphine CC Chiu wrote:
> > > 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.
> > >
> > > 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 dbc992a625b7..b813140b3c5b 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;
> > > };
> > > @@ -1196,8 +1200,9 @@ adc@35 {
> > > };
> > >
> > > &i2c15 {
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > status = "okay";
> > > - mctp-controller;
> >
> > Why are you deleting this if you're not also deleting the MCTP endpoint node?
> >
> > Unless there's some reason this is related to the NICs, this should be its own
> > patch with its own justification.
> >
> > Andrew
> Hi Andrew,
>
> We have discussed with Jeremy from Code Construct about removing the
> mctp-controller on bus 15 before.
>
> He thought it would be better to add the mctp-controller on each i2c mux port
> so the MCTP driver would ensure that the mux was configured properly before
> communicating with the device.
>
> I'll split a patch to remove the mctp-controller on bus 15 in next serial of patches.
Ah, so having looked through v2, I can see what you're trying to
achieve. I don't think it's necessary to split this out from the NIC
mux patch, they are related.
Andrew
^ permalink raw reply [flat|nested] 15+ messages in thread* RE: [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs
2024-10-02 1:47 ` Andrew Jeffery
@ 2024-10-03 7:42 ` Delphine_CC_Chiu/WYHQ/Wiwynn
0 siblings, 0 replies; 15+ messages in thread
From: Delphine_CC_Chiu/WYHQ/Wiwynn @ 2024-10-03 7:42 UTC (permalink / raw)
To: Andrew Jeffery, Delphine_CC_Chiu/WYHQ/Wiwynn, patrick@stwcx.xyz,
Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley
Cc: Ricky CX Wu, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org
> -----Original Message-----
> From: Andrew Jeffery <andrew@codeconstruct.com.au>
> Sent: Wednesday, October 2, 2024 9:48 AM
> To: Delphine_CC_Chiu/WYHQ/Wiwynn <Delphine_CC_Chiu@wiwynn.com>;
> patrick@stwcx.xyz; Rob Herring <robh@kernel.org>; Krzysztof Kozlowski
> <krzk+dt@kernel.org>; Conor Dooley <conor+dt@kernel.org>; Joel Stanley
> <joel@jms.id.au>
> Cc: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>;
> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four
> NICs
>
> [External Sender]
>
> [External Sender]
>
> On Tue, 2024-10-01 at 07:52 +0000, Delphine_CC_Chiu/WYHQ/Wiwynn wrote:
> >
> > > -----Original Message-----
> > > From: Andrew Jeffery <andrew@codeconstruct.com.au>
> > > Sent: Tuesday, October 1, 2024 8:37 AM
> > > To: Delphine_CC_Chiu/WYHQ/Wiwynn
> <Delphine_CC_Chiu@wiwynn.com>;
> > > patrick@stwcx.xyz; Rob Herring <robh@kernel.org>; Krzysztof
> > > Kozlowski <krzk+dt@kernel.org>; Conor Dooley <conor+dt@kernel.org>;
> > > Joel Stanley <joel@jms.id.au>
> > > Cc: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>;
> > > devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> > > linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org
> > > Subject: Re: [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux
> > > for four NICs
> > >
> > > [External Sender]
> > >
> > > [External Sender]
> > >
> > > On Mon, 2024-09-30 at 15:04 +0800, Delphine CC Chiu wrote:
> > > > 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.
> > > >
> > > > 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 dbc992a625b7..b813140b3c5b 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;
> > > > };
> > > > @@ -1196,8 +1200,9 @@ adc@35 {
> > > > };
> > > >
> > > > &i2c15 {
> > > > + #address-cells = <1>;
> > > > + #size-cells = <0>;
> > > > status = "okay";
> > > > - mctp-controller;
> > >
> > > Why are you deleting this if you're not also deleting the MCTP endpoint
> node?
> > >
> > > Unless there's some reason this is related to the NICs, this should
> > > be its own patch with its own justification.
> > >
> > > Andrew
> > Hi Andrew,
> >
> > We have discussed with Jeremy from Code Construct about removing the
> > mctp-controller on bus 15 before.
> >
> > He thought it would be better to add the mctp-controller on each i2c
> > mux port so the MCTP driver would ensure that the mux was configured
> > properly before communicating with the device.
> >
> > I'll split a patch to remove the mctp-controller on bus 15 in next serial of
> patches.
>
> Ah, so having looked through v2, I can see what you're trying to achieve. I don't
> think it's necessary to split this out from the NIC mux patch, they are related.
>
> Andrew
Sure, I'll merge the patch to the NIC mux patch in the next version of patches.
Regards,
Ricky
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v1 3/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for CPLD IOE on Spider Board
2024-09-30 7:04 [PATCH v1 0/8] Add I2C mux devices for yosemite4 Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 1/8] ARM: dts: aspeed: yosemite4: add i2c-mux for all Server Board slots Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 2/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for four NICs Delphine CC Chiu
@ 2024-09-30 7:04 ` Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 4/8] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards Delphine CC Chiu
` (4 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Delphine CC Chiu @ 2024-09-30 7:04 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 b813140b3c5b..26e0fcbed8d2 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 related [flat|nested] 15+ messages in thread* [PATCH v1 4/8] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards
2024-09-30 7:04 [PATCH v1 0/8] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (2 preceding siblings ...)
2024-09-30 7:04 ` [PATCH v1 3/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for CPLD IOE on Spider Board Delphine CC Chiu
@ 2024-09-30 7:04 ` Delphine CC Chiu
2024-10-01 0:39 ` Andrew Jeffery
2024-09-30 7:04 ` [PATCH v1 5/8] ARM: dts: aspeed: yosemite4: correct the compatible string for max31790 Delphine CC Chiu
` (3 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Delphine CC Chiu @ 2024-09-30 7:04 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 | 80 ++++++++++---------
1 file changed, 43 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 26e0fcbed8d2..ecf012c9cbbc 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;
};
@@ -1062,6 +1064,8 @@ gpio@23 {
};
&i2c14 {
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "okay";
bus-frequency = <400000>;
adc@1d {
@@ -1122,20 +1126,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>;
@@ -1152,6 +1186,8 @@ pwm@20{
gpio@22{
compatible = "ti,tca6424";
reg = <0x22>;
+ gpio-controller;
+ #gpio-cells = <2>;
};
pwm@23{
@@ -1181,10 +1217,10 @@ gpio@61 {
};
};
- i2c@1 {
+ imux31: i2c@1 {
+ reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
- reg = <0>;
adc@1f {
compatible = "ti,adc128d818";
@@ -1202,6 +1238,8 @@ pwm@20{
gpio@22{
compatible = "ti,tca6424";
reg = <0x22>;
+ gpio-controller;
+ #gpio-cells = <2>;
};
pwm@23{
@@ -1231,38 +1269,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 related [flat|nested] 15+ messages in thread* Re: [PATCH v1 4/8] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards
2024-09-30 7:04 ` [PATCH v1 4/8] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards Delphine CC Chiu
@ 2024-10-01 0:39 ` Andrew Jeffery
2024-10-01 7:45 ` Delphine_CC_Chiu/WYHQ/Wiwynn
0 siblings, 1 reply; 15+ messages in thread
From: Andrew Jeffery @ 2024-10-01 0:39 UTC (permalink / raw)
To: Delphine CC Chiu, patrick, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Joel Stanley
Cc: Ricky CX Wu, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
On Mon, 2024-09-30 at 15:04 +0800, Delphine CC Chiu wrote:
> 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 | 80 ++++++++++---------
> 1 file changed, 43 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 26e0fcbed8d2..ecf012c9cbbc 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;
> };
> @@ -1062,6 +1064,8 @@ gpio@23 {
> };
>
> &i2c14 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> status = "okay";
> bus-frequency = <400000>;
> adc@1d {
> @@ -1122,20 +1126,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>;
> @@ -1152,6 +1186,8 @@ pwm@20{
> gpio@22{
> compatible = "ti,tca6424";
> reg = <0x22>;
> + gpio-controller;
> + #gpio-cells = <2>;
This seems unrelated. Such changes should be in their own patch with a
`Fixes:` tag.
> };
>
> pwm@23{
> @@ -1181,10 +1217,10 @@ gpio@61 {
> };
> };
>
> - i2c@1 {
> + imux31: i2c@1 {
> + reg = <1>;
> #address-cells = <1>;
> #size-cells = <0>;
> - reg = <0>;
>
> adc@1f {
> compatible = "ti,adc128d818";
> @@ -1202,6 +1238,8 @@ pwm@20{
> gpio@22{
> compatible = "ti,tca6424";
> reg = <0x22>;
> + gpio-controller;
> + #gpio-cells = <2>;
This should go in the same patch as the instance above.
> };
>
> pwm@23{
> @@ -1231,38 +1269,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 {
^ permalink raw reply [flat|nested] 15+ messages in thread* RE: [PATCH v1 4/8] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards
2024-10-01 0:39 ` Andrew Jeffery
@ 2024-10-01 7:45 ` Delphine_CC_Chiu/WYHQ/Wiwynn
0 siblings, 0 replies; 15+ messages in thread
From: Delphine_CC_Chiu/WYHQ/Wiwynn @ 2024-10-01 7:45 UTC (permalink / raw)
To: Andrew Jeffery, Delphine_CC_Chiu/WYHQ/Wiwynn, patrick@stwcx.xyz,
Rob Herring, Krzysztof Kozlowski, Conor Dooley, Joel Stanley
Cc: Ricky CX Wu, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org
> -----Original Message-----
> From: Andrew Jeffery <andrew@codeconstruct.com.au>
> Sent: Tuesday, October 1, 2024 8:39 AM
> To: Delphine_CC_Chiu/WYHQ/Wiwynn <Delphine_CC_Chiu@wiwynn.com>;
> patrick@stwcx.xyz; Rob Herring <robh@kernel.org>; Krzysztof Kozlowski
> <krzk+dt@kernel.org>; Conor Dooley <conor+dt@kernel.org>; Joel Stanley
> <joel@jms.id.au>
> Cc: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>;
> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH v1 4/8] ARM: dts: aspeed: yosemite4: Revise address of
> i2c-mux for two fan boards
>
> [External Sender]
>
> [External Sender]
>
> On Mon, 2024-09-30 at 15:04 +0800, Delphine CC Chiu wrote:
> > 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 | 80
> > ++++++++++---------
> > 1 file changed, 43 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 26e0fcbed8d2..ecf012c9cbbc 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;
> > };
> > @@ -1062,6 +1064,8 @@ gpio@23 {
> > };
> >
> > &i2c14 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > status = "okay";
> > bus-frequency = <400000>;
> > adc@1d {
> > @@ -1122,20 +1126,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>; @@ -1152,6 +1186,8
> @@
> > pwm@20{
> > gpio@22{
> > compatible = "ti,tca6424";
> > reg = <0x22>;
> > + gpio-controller;
> > + #gpio-cells = <2>;
>
> This seems unrelated. Such changes should be in their own patch with a `Fixes:`
> tag.
>
> > };
> >
> > pwm@23{
> > @@ -1181,10 +1217,10 @@ gpio@61 {
> > };
> > };
> >
> > - i2c@1 {
> > + imux31: i2c@1 {
> > + reg = <1>;
> > #address-cells = <1>;
> > #size-cells = <0>;
> > - reg = <0>;
> >
> > adc@1f {
> > compatible = "ti,adc128d818"; @@
> -1202,6
> > +1238,8 @@ pwm@20{
> > gpio@22{
> > compatible = "ti,tca6424";
> > reg = <0x22>;
> > + gpio-controller;
> > + #gpio-cells = <2>;
>
> This should go in the same patch as the instance above.
>
Hi Andrew,
I'll split a fix patch for this in the next serial patches. Thanks.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v1 5/8] ARM: dts: aspeed: yosemite4: correct the compatible string for max31790
2024-09-30 7:04 [PATCH v1 0/8] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (3 preceding siblings ...)
2024-09-30 7:04 ` [PATCH v1 4/8] ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards Delphine CC Chiu
@ 2024-09-30 7:04 ` Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 6/8] ARM: dts: aspeed: yosemite4: Change the address of Fan IC on fan boards Delphine CC Chiu
` (2 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Delphine CC Chiu @ 2024-09-30 7:04 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 ecf012c9cbbc..01ee455c41b0 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -1177,10 +1177,8 @@ adc@1f {
};
pwm@20{
- compatible = "max31790";
+ compatible = "maxim,max31790";
reg = <0x20>;
- #address-cells = <1>;
- #size-cells = <0>;
};
gpio@22{
@@ -1191,10 +1189,8 @@ gpio@22{
};
pwm@23{
- compatible = "max31790";
+ compatible = "maxim,max31790";
reg = <0x23>;
- #address-cells = <1>;
- #size-cells = <0>;
};
adc@33 {
@@ -1229,10 +1225,8 @@ adc@1f {
};
pwm@20{
- compatible = "max31790";
+ compatible = "maxim,max31790";
reg = <0x20>;
- #address-cells = <1>;
- #size-cells = <0>;
};
gpio@22{
@@ -1243,10 +1237,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 related [flat|nested] 15+ messages in thread* [PATCH v1 6/8] ARM: dts: aspeed: yosemite4: Change the address of Fan IC on fan boards
2024-09-30 7:04 [PATCH v1 0/8] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (4 preceding siblings ...)
2024-09-30 7:04 ` [PATCH v1 5/8] ARM: dts: aspeed: yosemite4: correct the compatible string for max31790 Delphine CC Chiu
@ 2024-09-30 7:04 ` Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 7/8] ARM: dts: aspeed: yosemite4: Revise adc128d818 adc mode on Fan Boards Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 8/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board Delphine CC Chiu
7 siblings, 0 replies; 15+ messages in thread
From: Delphine CC Chiu @ 2024-09-30 7:04 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 01ee455c41b0..6a1dccd23225 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -1188,9 +1188,9 @@ gpio@22{
#gpio-cells = <2>;
};
- pwm@23{
+ pwm@2f{
compatible = "maxim,max31790";
- reg = <0x23>;
+ reg = <0x2f>;
};
adc@33 {
@@ -1236,9 +1236,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 related [flat|nested] 15+ messages in thread* [PATCH v1 7/8] ARM: dts: aspeed: yosemite4: Revise adc128d818 adc mode on Fan Boards
2024-09-30 7:04 [PATCH v1 0/8] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (5 preceding siblings ...)
2024-09-30 7:04 ` [PATCH v1 6/8] ARM: dts: aspeed: yosemite4: Change the address of Fan IC on fan boards Delphine CC Chiu
@ 2024-09-30 7:04 ` Delphine CC Chiu
2024-09-30 7:04 ` [PATCH v1 8/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board Delphine CC Chiu
7 siblings, 0 replies; 15+ messages in thread
From: Delphine CC Chiu @ 2024-09-30 7:04 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 6a1dccd23225..e235ff7c7a9b 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -1173,7 +1173,7 @@ imux30: i2c@0 {
adc@1f {
compatible = "ti,adc128d818";
reg = <0x1f>;
- ti,mode = /bits/ 8 <2>;
+ ti,mode = /bits/ 8 <1>;
};
pwm@20{
@@ -1221,7 +1221,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 related [flat|nested] 15+ messages in thread* [PATCH v1 8/8] ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board
2024-09-30 7:04 [PATCH v1 0/8] Add I2C mux devices for yosemite4 Delphine CC Chiu
` (6 preceding siblings ...)
2024-09-30 7:04 ` [PATCH v1 7/8] ARM: dts: aspeed: yosemite4: Revise adc128d818 adc mode on Fan Boards Delphine CC Chiu
@ 2024-09-30 7:04 ` Delphine CC Chiu
7 siblings, 0 replies; 15+ messages in thread
From: Delphine CC Chiu @ 2024-09-30 7:04 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 e235ff7c7a9b..ec2d8a783ac1 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;
};
@@ -1128,29 +1130,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 related [flat|nested] 15+ messages in thread