DTS updates for system1 BMC
Subsystems (2)
cover DTS updates for system1 BMC
Hello,
Please review the patch set.
Andrew Geissler (1):
ARM: dts: aspeed: system1: disable NCSI net port
Manojkiran Eda (2):
ARM: dts: aspeed: system1: Enable video engine
ARM: dts: aspeed: system1: Add usb virtual hub dev
Ninad Palsule (4):
ARM: dts: aspeed: system1: Disable vuart2
ARM: dts: aspeed: system1: Enable temp sensors
ARM: dts: aspeed: system1: Added status LEDs
ARM: dts: aspeed: system1: DTS updates
.../dts/aspeed/aspeed-bmc-ibm-system1.dts | 1445 ++++++++++++++++- 1 file changed, 1423 insertions(+), 22 deletions(-)
Signature · 1 line
2.51.0
PATCH 1/7 ARM: dts: aspeed: system1: Disable vuart2
system1 BMC machine does not wire vuart2 to host hence disable it to avoid any errors in the journal.
--- arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 4 ---- 1 file changed, 4 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +0 -4
@@ -472,10 +472,6 @@ &vuart1 { status = "okay"; }; -&vuart2 { - status = "okay"; -}; - &lpc_ctrl { status = "okay"; memory-region = <&flash_memory>;
Signature · 1 line
2.51.0
PATCH 2/7 ARM: dts: aspeed: system1: Enable video engine
In reply to Ninad PalsuleFrom: Manojkiran Eda <[email protected]>
This patch enables the aspeed video engine support in ASPEED BMC for IBM System1. It is crucial for facilitating the BMC's video capture and redirection capabilities, which are integral to remote management and KVM (Keyboard-Video-Mouse) over IP functionality.
--- arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +4 -0
@@ -531,6 +531,10 @@ &lpc_snoop { snoop-ports = <0x80>, <0x81>; }; +&video { + status = "okay"; +}; + &i2c0 { status = "okay";
Signature · 1 line
2.51.0
Andrew Jeffery
maintainerRe: [PATCH v1 2/7] ARM: dts: aspeed: system1: Enable video engine
Quoted 6 lines · Ninad Palsule
From: Manojkiran Eda <[email protected]>
This patch enables the aspeed video engine support in ASPEED BMC for IBM System1. It is crucial for facilitating the BMC's video capture and redirection capabilities, which are integral to remote management and KVM (Keyboard-Video-Mouse) over IP functionality.
This is a real nitpick, but: The commit message seems a bit too grandiose for my tastes. Can you make it more succinct? Writing in imperative mood to avoid "this patch" is generally recommended too:
https://docs.kernel.org/process/submitting-patches.html#describe-your-changes
Andrew
Quoted 23 lines
Signed-off-by Manojkiran Eda <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 4 ++++1 file changed, 4 insertions(+)arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +0
-0@@ -531,6 +531,10 @@ &lpc_snoop { snoop-ports = <0x80>, <0x81>; };
+&video {arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +3
-0+ status = "okay"; +}; +&i2c0 {
status = "okay";
PATCH 3/7 ARM: dts: aspeed: system1: Add usb virtual hub dev
In reply to Ninad PalsuleFrom: Manojkiran Eda <[email protected]>
The usb virtual hub device is required to pass the typed keystrokes to the Host OS as part of enabling the KVM (Keyboard-video-mouse) function.
--- arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +4 -0
@@ -535,6 +535,10 @@ &video { status = "okay"; }; +&vhub { + status = "okay"; +}; + &i2c0 { status = "okay";
Signature · 1 line
2.51.0
PATCH 4/7 ARM: dts: aspeed: system1: Enable temp sensors
In reply to Ninad PalsuleEnable temperature sensors for PCIe devices in the system1 BMC machine. There is mux on each sensor card.
--- .../dts/aspeed/aspeed-bmc-ibm-system1.dts | 496 ++++++++++++++++++ 1 file changed, 496 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +496 -0
@@ -68,6 +68,38 @@ aliases { i2c69 = &i2c15mux0chn5; i2c70 = &i2c15mux0chn6; i2c71 = &i2c15mux0chn7; + i2c72 = &i2c8mux2chn0; + i2c73 = &i2c8mux2chn1; + i2c74 = &i2c8mux3chn0; + i2c75 = &i2c8mux3chn1; + i2c76 = &i2c8mux4chn0; + i2c77 = &i2c8mux4chn1; + i2c78 = &i2c8mux5chn0; + i2c79 = &i2c8mux5chn1; + i2c80 = &i2c8mux6chn0; + i2c81 = &i2c8mux6chn1; + i2c82 = &i2c8mux7chn0; + i2c83 = &i2c8mux7chn1; + i2c84 = &i2c8mux8chn0; + i2c85 = &i2c8mux8chn1; + i2c86 = &i2c8mux9chn0; + i2c87 = &i2c8mux9chn1; + i2c88 = &i2c15mux2chn0; + i2c89 = &i2c15mux2chn1; + i2c90 = &i2c15mux3chn0; + i2c91 = &i2c15mux3chn1; + i2c92 = &i2c15mux4chn0; + i2c93 = &i2c15mux4chn1; + i2c94 = &i2c15mux5chn0; + i2c95 = &i2c15mux5chn1; + i2c96 = &i2c15mux6chn0; + i2c97 = &i2c15mux6chn1; + i2c98 = &i2c15mux7chn0; + i2c99 = &i2c15mux7chn1; + i2c100 = &i2c15mux8chn0; + i2c101 = &i2c15mux8chn1; + i2c102 = &i2c15mux9chn0; + i2c103 = &i2c15mux9chn1; }; chosen {
@@ -1148,48 +1180,280 @@ i2c8mux1chn0: i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c8mux2chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c8mux2chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c8mux1chn1: i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c8mux3chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c8mux3chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c8mux1chn2: i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c8mux4chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c8mux4chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c8mux1chn3: i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c8mux5chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c8mux5chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c8mux1chn4: i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c8mux6chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c8mux6chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c8mux1chn5: i2c@5 { #address-cells = <1>; #size-cells = <0>; reg = <5>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c8mux7chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c8mux7chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c8mux1chn6: i2c@6 { #address-cells = <1>; #size-cells = <0>; reg = <6>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c8mux8chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c8mux8chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c8mux1chn7: i2c@7 { #address-cells = <1>; #size-cells = <0>; reg = <7>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c8mux9chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c8mux9chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; }; };
@@ -1593,48 +1857,280 @@ i2c15mux1chn0: i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c15mux2chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c15mux2chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c15mux1chn1: i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c15mux3chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c15mux3chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c15mux1chn2: i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c15mux4chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c15mux4chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c15mux1chn3: i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <3>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c15mux5chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c15mux5chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c15mux1chn4: i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c15mux6chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c15mux6chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c15mux1chn5: i2c@5 { #address-cells = <1>; #size-cells = <0>; reg = <5>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c15mux7chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c15mux7chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c15mux1chn6: i2c@6 { #address-cells = <1>; #size-cells = <0>; reg = <6>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c15mux8chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c15mux8chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; i2c15mux1chn7: i2c@7 { #address-cells = <1>; #size-cells = <0>; reg = <7>; + i2c-mux@76 { + compatible = "nxp,pca9548"; + reg = <0x76>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c15mux9chn0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + temperature-sensor@4b { + compatible = "ti,tmp112"; + reg = <0x4b>; + }; + }; + + i2c15mux9chn1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + temperature-sensor@48 { + compatible = "ti,tmp112"; + reg = <0x48>; + }; + }; + }; }; }; };
Signature · 1 line
2.51.0
PATCH 5/7 ARM: dts: aspeed: system1: disable NCSI net port
In reply to Ninad PalsuleFrom: Andrew Geissler <[email protected]>
There appears to be a hardware issue on system1 with the shared NCSI network port, eth2. Our use cases don't require the use of this shared network port by the BMC so just remove it from our device tree.
The symptom is that intermittently the entire BMC network stack will stop working during a chassis power on or off. Any active ssh sessions to the BMC will completely hang, and then come back after 5-60 seconds.
--- arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 10 ---------- 1 file changed, 10 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +0 -10
@@ -519,16 +519,6 @@ &mac2 { use-ncsi; }; -&mac3 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_rmii4_default>; - clocks = <&syscon ASPEED_CLK_GATE_MAC4CLK>, - <&syscon ASPEED_CLK_MAC4RCLK>; - clock-names = "MACCLK", "RCLK"; - use-ncsi; -}; - &wdt1 { aspeed,reset-type = "none"; aspeed,external-signal;
Signature · 1 line
2.51.0
PATCH 6/7 ARM: dts: aspeed: system1: Added status LEDs
In reply to Ninad PalsuleAdded four LEDs controllers to show the FPGA status in system1 BMC machine. These LEDs provide faults and pgood states of the system.
--- .../dts/aspeed/aspeed-bmc-ibm-system1.dts | 917 ++++++++++++++++++ 1 file changed, 917 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +917 -0
@@ -564,6 +564,923 @@ &vhub { &i2c0 { status = "okay"; + led-controller@61 { + compatible = "nxp,pca9552"; + reg = <0x61>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = + "pgood0_flt_latched", "pgood1_flt_latched", + "pgood2_flt_latched", "pgood3_flt_latched", + "pgood4_flt_latched", "pgood5_flt_latched", + "pgood6_flt_latched", "pgood7_flt_latched", + "pgood8_flt_latched", "pgood9_flt_latched", + "pgood10_flt_latched", "pgood11_flt_latched", + "pgood12_flt_latched", "pgood13_flt_latched", + "pgood14_flt_latched", "pgood15_flt_latched"; + + led@0 { + reg = <0>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@1 { + reg = <1>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@2 { + reg = <2>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@3 { + reg = <3>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@4 { + reg = <4>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@5 { + reg = <5>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@6 { + reg = <6>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@7 { + reg = <7>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@8 { + reg = <8>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@9 { + reg = <9>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@a { + reg = <0xa>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@b { + reg = <0xb>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@c { + reg = <0xc>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@d { + reg = <0xd>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@e { + reg = <0xe>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@f { + reg = <0xf>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + }; + + led-controller@62 { + compatible = "nxp,pca9552"; + reg = <0x62>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = + "pgood16_flt_latched", "pgood17_flt_latched", + "pgood18_flt_latched", "pgood19_flt_latched", + "pgood20_flt_latched", "pgood21_flt_latched", + "pgood22_flt_latched", "pgood23_flt_latched", + "pgood24_flt_latched", "pgood25_flt_latched", + "pgood26_flt_latched", "pgood27_flt_latched", + "pgood28_flt_latched", "pgood29_flt_latched", + "pgood30_flt_latched", "pgood31_flt_latched"; + + led@0 { + reg = <0>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@1 { + reg = <1>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@2 { + reg = <2>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@3 { + reg = <3>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@4 { + reg = <4>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@5 { + reg = <5>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@6 { + reg = <6>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@7 { + reg = <7>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@8 { + reg = <8>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@9 { + reg = <9>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@a { + reg = <0xa>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@b { + reg = <0xb>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@c { + reg = <0xc>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@d { + reg = <0xd>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@e { + reg = <0xe>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@f { + reg = <0xf>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + }; + + led-controller@63 { + compatible = "nxp,pca9552"; + reg = <0x63>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = + "pgood32_flt_latched", "pgood33_flt_latched", + "pgood34_flt_latched", "pgood35_flt_latched", + "pgood36_flt_latched", "pgood37_flt_latched", + "pgood38_flt_latched", "pgood39_flt_latched", + "pgood40_flt_latched", "pgood41_flt_latched", + "pgood42_flt_latched", "pgood43_flt_latched", + "pgood44_flt_latched", "pgood45_flt_latched", + "pgood46_flt_latched", "pgood47_flt_latched"; + + led@0 { + reg = <0>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@1 { + reg = <1>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@2 { + reg = <2>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@3 { + reg = <3>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@4 { + reg = <4>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@5 { + reg = <5>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@6 { + reg = <6>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@7 { + reg = <7>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@8 { + reg = <8>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@9 { + reg = <9>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@a { + reg = <0xa>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@b { + reg = <0xb>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@c { + reg = <0xc>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@d { + reg = <0xd>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@e { + reg = <0xe>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@f { + reg = <0xf>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + }; + + led-controller@64 { + compatible = "nxp,pca9552"; + reg = <0x64>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = + "fault0_latched", "fault1_latched", + "fault2_latched", "fault3_latched", + "fault4_latched", "fault5_latched", + "fault6_latched", "fault7_latched", + "fault8_latched", "fault9_latched", + "fault10_latched", "fault11_latched", + "fault12_latched", "fault13_latched", + "fault14_latched", "fault15_latched"; + + led@0 { + reg = <0>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@1 { + reg = <1>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@2 { + reg = <2>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@3 { + reg = <3>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@4 { + reg = <4>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@5 { + reg = <5>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@6 { + reg = <6>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@7 { + reg = <7>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@8 { + reg = <8>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@9 { + reg = <9>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@a { + reg = <0xa>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@b { + reg = <0xb>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@c { + reg = <0xc>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@d { + reg = <0xd>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@e { + reg = <0xe>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@f { + reg = <0xf>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + }; + + led-controller@65 { + compatible = "nxp,pca9552"; + reg = <0x65>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = + "fault16_latched", "fault17_latched", + "fault18_latched", "fault19_latched", + "fault20_latched", "fault21_latched", + "fault22_latched", "fault23_latched", + "fault24_latched", "fault25_latched", + "fault26_latched", "fault27_latched", + "fault28_latched", "fault29_latched", + "fault30_latched", "fault31_latched"; + + led@0 { + reg = <0>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@1 { + reg = <1>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@2 { + reg = <2>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@3 { + reg = <3>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@4 { + reg = <4>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@5 { + reg = <5>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@6 { + reg = <6>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@7 { + reg = <7>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@8 { + reg = <8>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@9 { + reg = <9>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@a { + reg = <0xa>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@b { + reg = <0xb>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@c { + reg = <0xc>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@d { + reg = <0xd>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@e { + reg = <0xe>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@f { + reg = <0xf>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + }; + + led-controller@66 { + compatible = "nxp,pca9552"; + reg = <0x66>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = + "fault32_latched", "fault33_latched", + "fault34_latched", "fault35_latched", + "fault36_latched", "fault37_latched", + "fault38_latched", "fault39_latched", + "fault40_latched", "fault41_latched", + "fault42_latched", "fault43_latched", + "fault44_latched", "fault45_latched", + "fault46_latched", "fault47_latched"; + + led@0 { + reg = <0>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@1 { + reg = <1>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@2 { + reg = <2>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@3 { + reg = <3>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@4 { + reg = <4>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@5 { + reg = <5>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@6 { + reg = <6>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@7 { + reg = <7>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@8 { + reg = <8>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@9 { + reg = <9>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@a { + reg = <0xa>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@b { + reg = <0xb>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@c { + reg = <0xc>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@d { + reg = <0xd>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@e { + reg = <0xe>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@f { + reg = <0xf>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + }; + + led-controller@67 { + compatible = "nxp,pca9552"; + reg = <0x67>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = + "fault48_latched", "fault49_latched", + "fault50_latched", "fault51_latched", + "fault52_latched", "fault53_latched", + "fault54_latched", "fault55_latched", + "fault56_latched", "fault57_latched", + "fault58_latched", "fault59_latched", + "fault60_latched", "fault61_latched", + "fault62_latched", "fault63_latched"; + + led@0 { + reg = <0>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@1 { + reg = <1>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@2 { + reg = <2>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@3 { + reg = <3>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@4 { + reg = <4>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@5 { + reg = <5>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@6 { + reg = <6>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@7 { + reg = <7>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@8 { + reg = <8>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@9 { + reg = <9>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@a { + reg = <0xa>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@b { + reg = <0xb>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@c { + reg = <0xc>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@d { + reg = <0xd>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@e { + reg = <0xe>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + + led@f { + reg = <0xf>; + retain-state-shutdown; + default-state = "keep"; + type = <PCA955X_TYPE_LED>; + }; + }; + eeprom@50 { compatible = "atmel,24c64"; reg = <0x50>;
Signature · 1 line
2.51.0
PATCH 7/7 ARM: dts: aspeed: system1: DTS updates
In reply to Ninad Palsule- Removed SGPIO node as not in use anymore.
- Updated chassis power related pins as per the new hardware design
--- arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +2 -8
@@ -424,7 +424,7 @@ &pinctrl_gpiol6_unbiased /*E0-E7*/ "","","","","","","","", /*F0-F7*/ "","","","","","","","", /*G0-G7*/ "","","","","","","","", - /*H0-H7*/ "","","","","","","","", + /*H0-H7*/ "power-chassis-good","power-chassis-reboot","","","","","","", /*I0-I7*/ "","","","","","","","", /*J0-J7*/ "","","","","","","","", /*K0-K7*/ "","","","","","","","",
@@ -440,7 +440,7 @@ &pinctrl_gpiol6_unbiased /*U0-U7*/ "","","","","","","","", /*V0-V7*/ "","rtc-battery-voltage-read-enable","","power-chassis-control","","","","", /*W0-W7*/ "","","","","","","","", - /*X0-X7*/ "fpga-pgood","power-chassis-good","pch-pgood","","","","","", + /*X0-X7*/ "fpga-pgood","","pch-pgood","","","","","", /*Y0-Y7*/ "","","","","","","","", /*Z0-Z7*/ "","","","","","","","";
@@ -486,12 +486,6 @@ &emmc { clk-phase-mmc-hs200 = <180>, <180>; }; -&sgpiom0 { - status = "okay"; - ngpios = <128>; - bus-frequency = <500000>; -}; - &ibt { status = "okay"; };
Signature · 1 line
2.51.0
Andrew Jeffery
maintainerRe: [PATCH v1 7/7] ARM: dts: aspeed: system1: DTS updates
Hi Ninad,
Quoted 2 lines · Ninad Palsule
- Removed SGPIO node as not in use anymore.
- Updated chassis power related pins as per the new hardware design
Can you please take a look at the discussion in the thread linked below, and consider some of the approaches outlined there?
https://lore.kernel.org/all/d7794f74b26bbc1ee0a70e39c5671acc018f80eb.camel@codeconstruct.com.au/
I'd like to avoid a stream of backwards-incompatible changes due to platform design changes where we can.
Andrew
Quoted 41 lines
Signed-off-by Ninad Palsule <[email protected]>---
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 10 ++--------1 file changed, 2 insertions(+), 8 deletions(-)arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +2
-2@@ -424,7 +424,7 @@ &pinctrl_gpiol6_unbiased /*E0-E7*/ "","","","","","","","", /*F0-F7*/ "","","","","","","","", /*G0-G7*/ "","","","","","","","", - /*H0-H7*/ "","","","","","","","", + /*H0-H7*/ "power-chassis-good","power-chassis-reboot","","","","","","", /*I0-I7*/ "","","","","","","","", /*J0-J7*/ "","","","","","","","", /*K0-K7*/ "","","","","","","","",@@ -440,7 +440,7 @@ &pinctrl_gpiol6_unbiased /*U0-U7*/ "","","","","","","","", /*V0-V7*/ "","rtc-battery-voltage-read-enable","","power-chassis-control","","","","", /*W0-W7*/ "","","","","","","","", - /*X0-X7*/ "fpga-pgood","power-chassis-good","pch-pgood","","","","","", + /*X0-X7*/ "fpga-pgood","","pch-pgood","","","","","", /*Y0-Y7*/ "","","","","","","","", /*Z0-Z7*/ "","","","","","","","";arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +0
-0@@ -486,12 +486,6 @@ &emmc { clk-phase-mmc-hs200 = <180>, <180>; };
-&sgpiom0 {arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +0
-5- status = "okay"; - ngpios = <128>; - bus-frequency = <500000>; -}; -&ibt {
status = "okay";
};