Re: [PATCH v12 01/28] ARM: dts: aspeed: yosemite4: Revise i2c-mux devices

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 2024-08-16 at 17:23 +0800, Delphine CC Chiu wrote:
> Revise Yosemite 4 devicetree for devices behind i2c-mux
> - Add gpio and eeprom behind i2c-mux
> - Remove redundant idle-state setting for i2c-mux
> 
> Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@xxxxxxxxxx>
> ---
>  .../aspeed/aspeed-bmc-facebook-yosemite4.dts  | 381 ++++++++++++++++--
>  1 file changed, 347 insertions(+), 34 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 98477792aa00..ce206e2c461b 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
> @@ -17,6 +17,25 @@ aliases {
>  		serial6 = &uart7;
>  		serial7 = &uart8;
>  		serial8 = &uart9;
> +
> +		i2c16 = &imux16;
> +		i2c17 = &imux17;
> +		i2c18 = &imux18;
> +		i2c19 = &imux19;
> +		i2c20 = &imux20;
> +		i2c21 = &imux21;
> +		i2c22 = &imux22;
> +		i2c23 = &imux23;
> +		i2c24 = &imux24;
> +		i2c25 = &imux25;
> +		i2c26 = &imux26;
> +		i2c27 = &imux27;
> +		i2c28 = &imux28;
> +		i2c29 = &imux29;
> +		i2c30 = &imux30;
> +		i2c31 = &imux31;
> +		i2c32 = &imux32;
> +		i2c33 = &imux33;
>  	};
>  
>  	chosen {
> @@ -259,9 +278,109 @@ &i2c8 {
>  	bus-frequency = <400000>;
>  	i2c-mux@70 {
>  		compatible = "nxp,pca9544";
> -		idle-state = <0>;
>  		i2c-mux-idle-disconnect;
>  		reg = <0x70>;
> +
> +		imux16: i2c@0 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <0>;
> +
> +			gpio@49 {
> +				compatible = "nxp,pca9537";
> +				reg = <0x49>;
> +			};
> +
> +			eeprom@50 {
> +				compatible = "atmel,24c128";
> +				reg = <0x50>;
> +			};
> +
> +			eeprom@51 {
> +				compatible = "atmel,24c128";
> +				reg = <0x51>;
> +			};
> +
> +			eeprom@54 {
> +				compatible = "atmel,24c128";
> +				reg = <0x54>;
> +			};
> +		};
> +
> +		imux17: i2c@1 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <1>;
> +			gpio@49 {
> +				compatible = "nxp,pca9537";
> +				reg = <0x49>;
> +			};
> +
> +			eeprom@50 {
> +				compatible = "atmel,24c128";
> +				reg = <0x50>;
> +			};
> +
> +			eeprom@51 {
> +				compatible = "atmel,24c128";
> +				reg = <0x51>;
> +			};
> +
> +			eeprom@54 {
> +				compatible = "atmel,24c128";
> +				reg = <0x54>;
> +			};
> +		};
> +
> +		imux18: i2c@2 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <2>;
> +			gpio@49 {
> +				compatible = "nxp,pca9537";
> +				reg = <0x49>;
> +			};
> +
> +			eeprom@50 {
> +				compatible = "atmel,24c128";
> +				reg = <0x50>;
> +			};
> +
> +			eeprom@51 {
> +				compatible = "atmel,24c128";
> +				reg = <0x51>;
> +			};
> +
> +			eeprom@54 {
> +				compatible = "atmel,24c128";
> +				reg = <0x54>;
> +			};
> +		};
> +
> +		imux19: i2c@3 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <3>;
> +			gpio@49 {
> +				compatible = "nxp,pca9537";
> +				reg = <0x49>;
> +			};
> +
> +			eeprom@50 {
> +				compatible = "atmel,24c128";
> +				reg = <0x50>;
> +			};
> +
> +			eeprom@51 {
> +				compatible = "atmel,24c128";
> +				reg = <0x51>;
> +			};
> +
> +			eeprom@54 {
> +				compatible = "atmel,24c128";
> +				reg = <0x54>;
> +			};
> +		};
>  	};
>  };
>  
> @@ -270,15 +389,174 @@ &i2c9 {
>  	bus-frequency = <400000>;
>  	i2c-mux@71 {
>  		compatible = "nxp,pca9544";
> -		idle-state = <0>;
>  		i2c-mux-idle-disconnect;
>  		reg = <0x71>;
> +
> +		imux20: i2c@0 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <0>;
> +			gpio@49 {
> +				compatible = "nxp,pca9537";
> +				reg = <0x49>;
> +			};
> +
> +			eeprom@50 {
> +				compatible = "atmel,24c128";
> +				reg = <0x50>;
> +			};
> +
> +			eeprom@51 {
> +				compatible = "atmel,24c128";
> +				reg = <0x51>;
> +			};
> +
> +			eeprom@54 {
> +				compatible = "atmel,24c128";
> +				reg = <0x54>;
> +			};
> +		};
> +
> +		imux21: i2c@1 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <1>;
> +			gpio@49 {
> +				compatible = "nxp,pca9537";
> +				reg = <0x49>;
> +			};
> +
> +			eeprom@50 {
> +				compatible = "atmel,24c128";
> +				reg = <0x50>;
> +			};
> +
> +			eeprom@51 {
> +				compatible = "atmel,24c128";
> +				reg = <0x51>;
> +			};
> +
> +			eeprom@54 {
> +				compatible = "atmel,24c128";
> +				reg = <0x54>;
> +			};
> +		};
> +
> +		imux22: i2c@2 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <2>;
> +			gpio@49 {
> +				compatible = "nxp,pca9537";
> +				reg = <0x49>;
> +			};
> +
> +			eeprom@50 {
> +				compatible = "atmel,24c128";
> +				reg = <0x50>;
> +			};
> +
> +			eeprom@51 {
> +				compatible = "atmel,24c128";
> +				reg = <0x51>;
> +			};
> +
> +			eeprom@54 {
> +				compatible = "atmel,24c128";
> +				reg = <0x54>;
> +			};
> +		};
> +
> +		imux23: i2c@3 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <3>;
> +
> +			gpio@49 {
> +				compatible = "nxp,pca9537";
> +				reg = <0x49>;
> +			};
> +
> +			eeprom@50 {
> +				compatible = "atmel,24c128";
> +				reg = <0x50>;
> +			};
> +
> +			eeprom@51 {
> +				compatible = "atmel,24c128";
> +				reg = <0x51>;
> +			};
> +
> +			eeprom@54 {
> +				compatible = "atmel,24c128";
> +				reg = <0x54>;
> +			};
> +		};
>  	};
>  };
>  
>  &i2c10 {
>  	status = "okay";
>  	bus-frequency = <400000>;
> +	i2c-mux@74 {
> +		compatible = "nxp,pca9544";
> +		i2c-mux-idle-disconnect;
> +		reg = <0x74>;
> +
> +		imux28: i2c@0 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <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 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			reg = <1>;
> +		};
> +	};
>  };
>  
>  &i2c11 {
> @@ -440,16 +718,14 @@ eeprom@51 {
>  		reg = <0x51>;
>  	};
>  
> -	i2c-mux@71 {
> -		compatible = "nxp,pca9846";
> +	i2c-mux@74 {
> +		compatible = "nxp,pca9546";
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -
> -		idle-state = <0>;
>  		i2c-mux-idle-disconnect;
> -		reg = <0x71>;
> +		reg = <0x74>;
>  
> -		i2c@0 {
> +		imux30: i2c@0 {
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			reg = <0>;
> @@ -457,26 +733,26 @@ i2c@0 {
>  			adc@1f {
>  				compatible = "ti,adc128d818";
>  				reg = <0x1f>;
> -				ti,mode = /bits/ 8 <2>;
> +				ti,mode = /bits/ 8 <1>;
>  			};
>  
>  			pwm@20{
> -				compatible = "max31790";
> +				compatible = "maxim,max31790";
> +				pwm-as-tach = <4 5>;
>  				reg = <0x20>;
> -				#address-cells = <1>;
> -				#size-cells = <0>;
>  			};
>  
>  			gpio@22{
>  				compatible = "ti,tca6424";
>  				reg = <0x22>;
> +				gpio-controller;
> +				#gpio-cells = <2>;
>  			};
>  
> -			pwm@23{
> -				compatible = "max31790";
> -				reg = <0x23>;
> -				#address-cells = <1>;
> -				#size-cells = <0>;
> +			pwm@2f{
> +				compatible = "maxim,max31790";
> +				pwm-as-tach = <4 5>;
> +				reg = <0x2f>;
>  			};
>  
>  			adc@33 {
> @@ -499,34 +775,34 @@ gpio@61 {
>  			};
>  		};
>  
> -		i2c@1 {
> +		imux31: i2c@1 {
>  			#address-cells = <1>;
>  			#size-cells = <0>;
> -			reg = <0>;
> +			reg = <1>;
>  
>  			adc@1f {
>  				compatible = "ti,adc128d818";
>  				reg = <0x1f>;
> -				ti,mode = /bits/ 8 <2>;
> +				ti,mode = /bits/ 8 <1>;
>  			};
>  
>  			pwm@20{
> -				compatible = "max31790";
> +				compatible = "maxim,max31790";

The max31790 binding isn't yet upstream[1]. Please drop these nodes
entirely until the binding has been accepted. You can send a follow-up
patch adding them once it is merged.

Please make sure to run `./scripts/checkpatch.pl` and `make dtbs_check`
on your changes.

Andrew

[1]: https://lore.kernel.org/all/20240813084152.25002-1-chanh@xxxxxxxxxxxxxxxxxxxxxx/





[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux