From c98a3dcd25acea5492644770899bd7b4ed87e030 Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Wed, 16 Feb 2022 00:31:42 +0800 Subject: [PATCH] ARM: dts: aspeed: bletchley: Switch sled numbering to 1-based Switch sled to 1-based to meet OpenBMC multi-host numbering rule Signed-off-by: Potin Lai Reviewed-by: Joel Stanley Reviewed-by: Patrick Williams Link: https://lore.kernel.org/r/20220215163151.32252-2-potin.lai@quantatw.com Signed-off-by: Joel Stanley --- .../dts/aspeed-bmc-facebook-bletchley.dts | 172 +++++++++--------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts index f973ea883b97..e77736ed5c4c 100644 --- a/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts @@ -101,16 +101,6 @@ fan3_amber { default-state = "off"; gpios = <&fan_ioexp 15 GPIO_ACTIVE_HIGH>; }; - sled0_amber { - retain-state-shutdown; - default-state = "off"; - gpios = <&sled0_leds 0 GPIO_ACTIVE_LOW>; - }; - sled0_blue { - retain-state-shutdown; - default-state = "off"; - gpios = <&sled0_leds 1 GPIO_ACTIVE_LOW>; - }; sled1_amber { retain-state-shutdown; default-state = "off"; @@ -161,6 +151,16 @@ sled5_blue { default-state = "off"; gpios = <&sled5_leds 1 GPIO_ACTIVE_LOW>; }; + sled6_amber { + retain-state-shutdown; + default-state = "off"; + gpios = <&sled6_leds 0 GPIO_ACTIVE_LOW>; + }; + sled6_blue { + retain-state-shutdown; + default-state = "off"; + gpios = <&sled6_leds 1 GPIO_ACTIVE_LOW>; + }; }; }; @@ -219,69 +219,6 @@ tmp421@4f { reg = <0x4f>; }; - sled0_ioexp: pca9539@76 { - compatible = "nxp,pca9539"; - reg = <0x76>; - #address-cells = <1>; - #size-cells = <0>; - gpio-controller; - #gpio-cells = <2>; - - gpio-line-names = - "SLED0_MS_DETECT1","SLED0_VBUS_BMC_EN","SLED0_INA230_ALERT","SLED0_P12V_STBY_ALERT", - "SLED0_SSD_ALERT","SLED0_MS_DETECT0","SLED0_RST_CCG5","SLED0_FUSB302_INT", - "SLED0_MD_STBY_RESET","SLED0_MD_IOEXP_EN_FAULT","SLED0_MD_DIR","SLED0_MD_DECAY", - "SLED0_MD_MODE1","SLED0_MD_MODE2","SLED0_MD_MODE3","power-host0"; - }; - - sled0_leds: pca9552@67 { - compatible = "nxp,pca9552"; - reg = <0x67>; - #address-cells = <1>; - #size-cells = <0>; - gpio-controller; - #gpio-cells = <2>; - - gpio-line-names = - "led-sled0-amber","led-sled0-blue","SLED0_RST_IOEXP","", - "","","","", - "","","","", - "","","",""; - }; - - sled0_fusb302: typec-portc@22 { - compatible = "fcs,fusb302"; - reg = <0x22>; - - connector { - compatible = "usb-c-connector"; - label = "USB-C"; - power-role = "dual"; - try-power-role = "sink"; - data-role = "dual"; - source-pdos = ; - sink-pdos = ; - op-sink-microwatt = <10000000>; - }; - }; -}; - -&i2c1 { - status = "okay"; - /* TODO: Add ADC INA230 */ - - mp5023@40 { - compatible = "mps,mp5023"; - reg = <0x40>; - }; - - tmp421@4f { - compatible = "ti,tmp421"; - reg = <0x4f>; - }; - sled1_ioexp: pca9539@76 { compatible = "nxp,pca9539"; reg = <0x76>; @@ -333,10 +270,6 @@ PDO_VAR(3000, 12000, 3000) &i2c1 { status = "okay"; -}; - -&i2c2 { - status = "okay"; /* TODO: Add ADC INA230 */ mp5023@40 { @@ -398,7 +331,11 @@ PDO_VAR(3000, 12000, 3000) }; }; -&i2c3 { +&i2c1 { + status = "okay"; +}; + +&i2c2 { status = "okay"; /* TODO: Add ADC INA230 */ @@ -461,7 +398,7 @@ PDO_VAR(3000, 12000, 3000) }; }; -&i2c4 { +&i2c3 { status = "okay"; /* TODO: Add ADC INA230 */ @@ -524,7 +461,7 @@ PDO_VAR(3000, 12000, 3000) }; }; -&i2c5 { +&i2c4 { status = "okay"; /* TODO: Add ADC INA230 */ @@ -587,6 +524,69 @@ PDO_VAR(3000, 12000, 3000) }; }; +&i2c5 { + status = "okay"; + /* TODO: Add ADC INA230 */ + + mp5023@40 { + compatible = "mps,mp5023"; + reg = <0x40>; + }; + + tmp421@4f { + compatible = "ti,tmp421"; + reg = <0x4f>; + }; + + sled6_ioexp: pca9539@76 { + compatible = "nxp,pca9539"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + gpio-controller; + #gpio-cells = <2>; + + gpio-line-names = + "SLED6_MS_DETECT1","SLED6_VBUS_BMC_EN","SLED6_INA230_ALERT","SLED6_P12V_STBY_ALERT", + "SLED6_SSD_ALERT","SLED6_MS_DETECT0","SLED6_RST_CCG5","SLED6_FUSB302_INT", + "SLED6_MD_STBY_RESET","SLED6_MD_IOEXP_EN_FAULT","SLED6_MD_DIR","SLED6_MD_DECAY", + "SLED6_MD_MODE1","SLED6_MD_MODE2","SLED6_MD_MODE3","power-host6"; + }; + + sled6_leds: pca9552@67 { + compatible = "nxp,pca9552"; + reg = <0x67>; + #address-cells = <1>; + #size-cells = <0>; + gpio-controller; + #gpio-cells = <2>; + + gpio-line-names = + "led-sled6-amber","led-sled6-blue","SLED6_RST_IOEXP","", + "","","","", + "","","","", + "","","",""; + }; + + sled6_fusb302: typec-portc@22 { + compatible = "fcs,fusb302"; + reg = <0x22>; + + connector { + compatible = "usb-c-connector"; + label = "USB-C"; + power-role = "dual"; + try-power-role = "sink"; + data-role = "dual"; + source-pdos = ; + sink-pdos = ; + op-sink-microwatt = <10000000>; + }; + }; +}; + &i2c6 { status = "okay"; @@ -702,17 +702,17 @@ &gpio0 { /*F0-F7*/ "","","","","","","","", /*G0-G7*/ "","SWITCH_FRU_MUX","","","","","","", /*H0-H7*/ "presence-riser1","presence-riser2", - "presence-sled0","presence-sled1", - "presence-sled2","presence-sled3", - "presence-sled4","presence-sled5", + "presence-sled1","presence-sled2", + "presence-sled3","presence-sled4", + "presence-sled5","presence-sled6", /*I0-I7*/ "REV_ID0","","REV_ID1","REV_ID2", "","","","", /*J0-J7*/ "","","","","","","","", /*K0-K7*/ "","","","","","","","", /*L0-L7*/ "","","","","","","","", - /*M0-M7*/ "ALERT_SLED0","ALERT_SLED1", - "ALERT_SLED2","ALERT_SLED3", - "ALERT_SLED4","ALERT_SLED5", + /*M0-M7*/ "ALERT_SLED1","ALERT_SLED2", + "ALERT_SLED3","ALERT_SLED4", + "ALERT_SLED5","ALERT_SLED6", "P12V_AUX_ALERT1","", /*N0-N7*/ "","","","","","","","", /*O0-O7*/ "","","","",