Subject: [PATCH v2 08/14] ARM: dts: aspeed: yosemite4: Revise i2c11 and i2c12 schematic change

Revise i2c11 and i2c12 schematic change:
- remove space for adm1272 compatible
- enable interrupt setting for pca9555
- add eeprom for yosemite4 medusa board/BSM use
- remove temperature sensor for yosemite4 schematic change
- add power sensor for power module reading

Signed-off-by: Delphine CC Chiu <[email protected]>
---
.../aspeed/aspeed-bmc-facebook-yosemite4.dts | 118 ++++++++++++++----
1 file changed, 93 insertions(+), 25 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 da413325ce30..ccb5ecd8d9a6 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -821,41 +821,94 @@ imux29: i2c@1 {
&i2c11 {
status = "okay";
power-sensor@10 {
- compatible = "adi, adm1272";
+ compatible = "adi,adm1272";
reg = <0x10>;
};

power-sensor@12 {
- compatible = "adi, adm1272";
+ compatible = "adi,adm1272";
reg = <0x12>;
};

- gpio@20 {
+ gpio_ext1: pca9555@20 {
compatible = "nxp,pca9555";
- reg = <0x20>;
+ pinctrl-names = "default";
gpio-controller;
#gpio-cells = <2>;
- };
-
- gpio@21 {
+ reg = <0x20>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <94 IRQ_TYPE_LEVEL_LOW>;
+ gpio-line-names =
+ "P48V_OCP_GPIO1","P48V_OCP_GPIO2",
+ "P48V_OCP_GPIO3","FAN_BOARD_0_REVISION_0_R",
+ "FAN_BOARD_0_REVISION_1_R","FAN_BOARD_1_REVISION_0_R",
+ "FAN_BOARD_1_REVISION_1_R","RST_MUX_R_N",
+ "RST_LED_CONTROL_FAN_BOARD_0_N","RST_LED_CONTROL_FAN_BOARD_1_N",
+ "RST_IOEXP_FAN_BOARD_0_N","RST_IOEXP_FAN_BOARD_1_N",
+ "PWRGD_LOAD_SWITCH_FAN_BOARD_0_R","PWRGD_LOAD_SWITCH_FAN_BOARD_1_R",
+ "","";
+ };
+
+ gpio_ext2: pca9555@21 {
compatible = "nxp,pca9555";
- reg = <0x21>;
+ pinctrl-names = "default";
gpio-controller;
#gpio-cells = <2>;
- };
-
- gpio@22 {
+ reg = <0x21>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <94 IRQ_TYPE_LEVEL_LOW>;
+ gpio-line-names =
+ "DELTA_MODULE_TYPE","VSENSE_ERR_VDROP_R",
+ "EN_P48V_AUX_0","EN_P48V_AUX_1",
+ "MEDUSA_BOARD_REV_0","MEDUSA_BOARD_REV_1",
+ "MEDUSA_BOARD_REV_2","MEDUSA_BOARD_TYPE",
+ "HSC_OCP_SLOT_ODD_GPIO1","HSC_OCP_SLOT_ODD_GPIO2",
+ "HSC_OCP_SLOT_ODD_GPIO3","HSC_OCP_SLOT_EVEN_GPIO1",
+ "HSC_OCP_SLOT_EVEN_GPIO2","HSC_OCP_SLOT_EVEN_GPIO3",
+ "ADC_TYPE_0_R","ADC_TYPE_1_R";
+ };
+
+ gpio_ext3: pca9555@22 {
compatible = "nxp,pca9555";
- reg = <0x22>;
+ pinctrl-names = "default";
gpio-controller;
#gpio-cells = <2>;
- };
-
- gpio@23 {
+ reg = <0x22>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <94 IRQ_TYPE_LEVEL_LOW>;
+ gpio-line-names =
+ "CARD_TYPE_SLOT1","CARD_TYPE_SLOT2",
+ "CARD_TYPE_SLOT3","CARD_TYPE_SLOT4",
+ "CARD_TYPE_SLOT5","CARD_TYPE_SLOT6",
+ "CARD_TYPE_SLOT7","CARD_TYPE_SLOT8",
+ "OC_P48V_HSC_0_N","FLT_P48V_HSC_0_N",
+ "PWRGD_P12V_AUX_1","OC_P48V_HSC_1_N",
+ "FLT_P48V_HSC_1_N","PWRGD_P12V_AUX_1",
+ "MEDUSA_ADC_EFUSE_TYPE_R","P12V_HSC_TYPE";
+ };
+
+ gpio_ext4: pca9555@23 {
compatible = "nxp,pca9555";
- reg = <0x23>;
+ pinctrl-names = "default";
gpio-controller;
#gpio-cells = <2>;
+ reg = <0x23>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <94 IRQ_TYPE_LEVEL_LOW>;
+ gpio-line-names =
+ "HSC1_ALERT1_R_N","HSC2_ALERT1_R_N",
+ "HSC3_ALERT1_R_N","HSC4_ALERT1_R_N",
+ "HSC5_ALERT1_R_N","HSC6_ALERT1_R_N",
+ "HSC7_ALERT1_R_N","HSC8_ALERT1_R_N",
+ "HSC1_ALERT2_R_N","HSC2_ALERT2_R_N",
+ "HSC3_ALERT2_R_N","HSC4_ALERT2_R_N",
+ "HSC5_ALERT2_R_N","HSC6_ALERT2_R_N",
+ "HSC7_ALERT2_R_N","HSC8_ALERT2_R_N";
+ };
+
+ power-sensor@40 {
+ compatible = "mps,mp5023";
+ reg = <0x40>;
};

temperature-sensor@48 {
@@ -868,19 +921,29 @@ temperature-sensor@49 {
reg = <0x49>;
};

- temperature-sensor@4a {
- compatible = "ti,tmp75";
- reg = <0x4a>;
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
};

- temperature-sensor@4b {
- compatible = "ti,tmp75";
- reg = <0x4b>;
+ power-sensor@62 {
+ compatible = "pmbus";
+ reg = <0x62>;
};

- eeprom@54 {
- compatible = "atmel,24c256";
- reg = <0x54>;
+ power-sensor@64 {
+ compatible = "pmbus";
+ reg = <0x64>;
+ };
+
+ power-sensor@65 {
+ compatible = "pmbus";
+ reg = <0x65>;
+ };
+
+ power-sensor@68 {
+ compatible = "pmbus";
+ reg = <0x68>;
};
};

@@ -898,6 +961,11 @@ eeprom@50 {
reg = <0x50>;
};

+ eeprom@54 {
+ compatible = "atmel,24c64";
+ reg = <0x54>;
+ };
+
rtc@6f {
compatible = "nuvoton,nct3018y";
reg = <0x6f>;
--
2.25.1


2023-12-11 08:04:13

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH v2 08/14] ARM: dts: aspeed: yosemite4: Revise i2c11 and i2c12 schematic change

On 11/12/2023 03:49, Delphine CC Chiu wrote:
> Revise i2c11 and i2c12 schematic change:
> - remove space for adm1272 compatible
> - enable interrupt setting for pca9555
> - add eeprom for yosemite4 medusa board/BSM use
> - remove temperature sensor for yosemite4 schematic change
> - add power sensor for power module reading

You should split your patch into several, per one logical change.


>
> Signed-off-by: Delphine CC Chiu <[email protected]>
> ---
> .../aspeed/aspeed-bmc-facebook-yosemite4.dts | 118 ++++++++++++++----
> 1 file changed, 93 insertions(+), 25 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 da413325ce30..ccb5ecd8d9a6 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
> +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
> @@ -821,41 +821,94 @@ imux29: i2c@1 {
> &i2c11 {
> status = "okay";
> power-sensor@10 {
> - compatible = "adi, adm1272";
> + compatible = "adi,adm1272";
> reg = <0x10>;
> };
>
> power-sensor@12 {
> - compatible = "adi, adm1272";
> + compatible = "adi,adm1272";
> reg = <0x12>;
> };
>
> - gpio@20 {
> + gpio_ext1: pca9555@20 {

That's not a correct change. You replace good code with bad.

> compatible = "nxp,pca9555";
> - reg = <0x20>;
> + pinctrl-names = "default";
> gpio-controller;
> #gpio-cells = <2>;
> - };
> -
> - gpio@21 {
> + reg = <0x20>;
> + interrupt-parent = <&gpio0>;
> + interrupts = <94 IRQ_TYPE_LEVEL_LOW>;
> + gpio-line-names =
> + "P48V_OCP_GPIO1","P48V_OCP_GPIO2",
> + "P48V_OCP_GPIO3","FAN_BOARD_0_REVISION_0_R",
> + "FAN_BOARD_0_REVISION_1_R","FAN_BOARD_1_REVISION_0_R",
> + "FAN_BOARD_1_REVISION_1_R","RST_MUX_R_N",
> + "RST_LED_CONTROL_FAN_BOARD_0_N","RST_LED_CONTROL_FAN_BOARD_1_N",
> + "RST_IOEXP_FAN_BOARD_0_N","RST_IOEXP_FAN_BOARD_1_N",
> + "PWRGD_LOAD_SWITCH_FAN_BOARD_0_R","PWRGD_LOAD_SWITCH_FAN_BOARD_1_R",
> + "","";
> + };
> +
> + gpio_ext2: pca9555@21 {

Nope

> compatible = "nxp,pca9555";
> - reg = <0x21>;
> + pinctrl-names = "default";
> gpio-controller;
> #gpio-cells = <2>;
> - };
> -
> - gpio@22 {
> + reg = <0x21>;
> + interrupt-parent = <&gpio0>;
> + interrupts = <94 IRQ_TYPE_LEVEL_LOW>;
> + gpio-line-names =
> + "DELTA_MODULE_TYPE","VSENSE_ERR_VDROP_R",
> + "EN_P48V_AUX_0","EN_P48V_AUX_1",
> + "MEDUSA_BOARD_REV_0","MEDUSA_BOARD_REV_1",
> + "MEDUSA_BOARD_REV_2","MEDUSA_BOARD_TYPE",
> + "HSC_OCP_SLOT_ODD_GPIO1","HSC_OCP_SLOT_ODD_GPIO2",
> + "HSC_OCP_SLOT_ODD_GPIO3","HSC_OCP_SLOT_EVEN_GPIO1",
> + "HSC_OCP_SLOT_EVEN_GPIO2","HSC_OCP_SLOT_EVEN_GPIO3",
> + "ADC_TYPE_0_R","ADC_TYPE_1_R";
> + };
> +
> + gpio_ext3: pca9555@22 {

Nope

> compatible = "nxp,pca9555";
> - reg = <0x22>;
> + pinctrl-names = "default";
> gpio-controller;
> #gpio-cells = <2>;
> - };
> -
> - gpio@23 {
> + reg = <0x22>;
> + interrupt-parent = <&gpio0>;
> + interrupts = <94 IRQ_TYPE_LEVEL_LOW>;
> + gpio-line-names =
> + "CARD_TYPE_SLOT1","CARD_TYPE_SLOT2",
> + "CARD_TYPE_SLOT3","CARD_TYPE_SLOT4",
> + "CARD_TYPE_SLOT5","CARD_TYPE_SLOT6",
> + "CARD_TYPE_SLOT7","CARD_TYPE_SLOT8",
> + "OC_P48V_HSC_0_N","FLT_P48V_HSC_0_N",
> + "PWRGD_P12V_AUX_1","OC_P48V_HSC_1_N",
> + "FLT_P48V_HSC_1_N","PWRGD_P12V_AUX_1",
> + "MEDUSA_ADC_EFUSE_TYPE_R","P12V_HSC_TYPE";
> + };
> +
> + gpio_ext4: pca9555@23 {

Nope



Best regards,
Krzysztof