On Mon, 2024-09-30 at 15:04 +0800, Delphine CC Chiu wrote:
> From: Ricky CX Wu <ricky.cx.wu.wiwynn@xxxxxxxxx>
>
> 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@xxxxxxxxx>
> Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@xxxxxxxxxx>
> ---
> .../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 {
