ARM: dts: aspeed: add Quanta S6Q machine dts
PATCH 1/1 ARM: dts: aspeed: add Quanta S6Q machine dts
Add build support for Quanta S6Q board equipped with AST2600 BMC SoC
--- arch/arm/dts/Makefile | 1 + arch/arm/dts/ast2600-s6q.dts | 218 +++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) create mode 100644 arch/arm/dts/ast2600-s6q.dts
arch/arm/dts/Makefile +1 -0
@@ -686,6 +686,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ ast2600-ncsi.dtb \ ast2600-pfr.dtb \ ast2600-rainier.dtb \ + ast2600-s6q.dtb \ ast2600-slt.dtb \ ast2600-tacoma.dtb
arch/arm/dts/ast2600-s6q.dts new file +218 -0
218 lines not on this page · raw message
Signature · 1 line
2.32.0
Quoted 4 lines
Add build support for Quanta S6Q board equipped with AST2600 BMC SoC
This looks good to me.
Quoted 244 lines
Signed-off-by George Hung <[email protected]>--- arch/arm/dts/Makefile | 1 + arch/arm/dts/ast2600-s6q.dts | 218 +++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) create mode 100644 arch/arm/dts/ast2600-s6q.dtsarch/arm/dts/Makefile index renamed from arch/arm/dts/Makefile +0
-0
e5a73697c5..a79f885f54100755arch/arm/dts/Makefile +1
-0@@ -686,6 +686,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ ast2600-ncsi.dtb \ ast2600-pfr.dtb \ ast2600-rainier.dtb \ + ast2600-s6q.dtb \ ast2600-slt.dtb \ ast2600-tacoma.dtbarch/arm/dts/ast2600-s6q.dts new renamed from arch/arm/dts/ast2600-s6q.dts +0
-0file mode 100644 index 0000000000..52b620d3b4
arch/arm/dts/ast2600-s6q.dts new file +217
-1@@ -0,0 +1,218 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2022 Quanta Corp. +/dts-v1/; + +#include "ast2600-u-boot.dtsi" + +/ { + model = "Quanta S6Q BMC"; + compatible = "quanta,s6q-bmc", "aspeed,ast2600"; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; + + chosen { + stdout-path = &uart5; + }; + + aliases { + spi0 = &fmc; + spi2 = &spi2; + ethernet0 = &mac2; + ethernet1 = &mac3; + }; + + cpus { + cpu@0 { + clock-frequency = <800000000>; + }; + cpu@1 { + clock-frequency = <800000000>; + }; + }; +}; + +&uart5 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&sdrammc { + clock-frequency = <400000000>; +}; + +&wdt1 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&wdt2 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&wdt3 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&mdio { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mdio3_default>; + #address-cells = <1>; + #size-cells = <0>; + + ethphy2: ethernet-phy@2 { + reg = <0>; + }; +}; + +&mac2 { + status = "okay"; + phy-mode = "rgmii"; + phy-handle = <ðphy2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii3_default>; }; + +&mac3 { + status = "okay"; + phy-mode = "rmii"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rmii4_default>; +}; + +&fmc { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fmcquad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&spi2 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2_default &pinctrl_spi2cs1_default + &pinctrl_spi2cs2_default &pinctrl_spi2quad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1_default>; +}; + +&i2c1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2_default>; +}; + +&i2c2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_default>; +}; + +&i2c3 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4_default>; +}; + +&i2c4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c5_default>; +}; + +&i2c5 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c6_default>; +}; + +&i2c6 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c7_default>; +}; + +&i2c7 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c8_default>; +}; + +&i2c8 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c9_default>; +}; + +&i2c9 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c10_default>; +}; + +&i2c11 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c12_default>; +}; + +&i2c14 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c15_default>; +}; + +&i2c15 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c16_default>; +}; + +&display_port { + status = "okay"; +}; + +&scu { + mac2-clk-delay = <0x08 0x04 + 0x08 0x04 + 0x08 0x04>; + mac3-clk-delay = <0x08 0x04 + 0x08 0x04 + 0x08 0x04>; +}; + +&hace { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&acry { + u-boot,dm-pre-reloc; + status = "okay"; +}; --2.32.0
Quoted 3 lines · George Hung
Add build support for Quanta S6Q board equipped with AST2600 BMC SoC
Hi George,
Which configuration (defconfig) do you run your system with?
How different is this configuration from other platforms present in the tree?
I ask as I wonder if we can get away with some common configs in u-boot, without requiring every platform add their own dts.
Quoted 247 lines
Signed-off-by George Hung <[email protected]>--- arch/arm/dts/Makefile | 1 + arch/arm/dts/ast2600-s6q.dts | 218 +++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) create mode 100644 arch/arm/dts/ast2600-s6q.dtsarch/arm/dts/Makefile +1
-0@@ -686,6 +686,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ ast2600-ncsi.dtb \ ast2600-pfr.dtb \ ast2600-rainier.dtb \ + ast2600-s6q.dtb \ ast2600-slt.dtb \ ast2600-tacoma.dtbarch/arm/dts/ast2600-s6q.dts new file +218
-1@@ -0,0 +1,218 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2022 Quanta Corp. +/dts-v1/; + +#include "ast2600-u-boot.dtsi" + +/ { + model = "Quanta S6Q BMC"; + compatible = "quanta,s6q-bmc", "aspeed,ast2600"; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; + + chosen { + stdout-path = &uart5; + }; + + aliases { + spi0 = &fmc; + spi2 = &spi2; + ethernet0 = &mac2; + ethernet1 = &mac3; + }; + + cpus { + cpu@0 { + clock-frequency = <800000000>; + }; + cpu@1 { + clock-frequency = <800000000>; + }; + }; +}; + +&uart5 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&sdrammc { + clock-frequency = <400000000>; +}; + +&wdt1 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&wdt2 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&wdt3 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&mdio { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mdio3_default>; + #address-cells = <1>; + #size-cells = <0>; + + ethphy2: ethernet-phy@2 { + reg = <0>; + }; +}; + +&mac2 { + status = "okay"; + phy-mode = "rgmii"; + phy-handle = <ðphy2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii3_default>; +}; + +&mac3 { + status = "okay"; + phy-mode = "rmii"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rmii4_default>; +}; + +&fmc { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fmcquad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&spi2 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2_default &pinctrl_spi2cs1_default + &pinctrl_spi2cs2_default &pinctrl_spi2quad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1_default>; +}; + +&i2c1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2_default>; +}; + +&i2c2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_default>; +}; + +&i2c3 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4_default>; +}; + +&i2c4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c5_default>; +}; + +&i2c5 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c6_default>; +}; + +&i2c6 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c7_default>; +}; + +&i2c7 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c8_default>; +}; + +&i2c8 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c9_default>; +}; + +&i2c9 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c10_default>; +}; + +&i2c11 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c12_default>; +}; + +&i2c14 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c15_default>; +}; + +&i2c15 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c16_default>; +}; + +&display_port { + status = "okay"; +}; + +&scu { + mac2-clk-delay = <0x08 0x04 + 0x08 0x04 + 0x08 0x04>; + mac3-clk-delay = <0x08 0x04 + 0x08 0x04 + 0x08 0x04>; +}; + +&hace { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&acry { + u-boot,dm-pre-reloc; + status = "okay"; +}; --2.32.0
Quoted 9 lines
Quoted 3 lines · George Hung
Add build support for Quanta S6Q board equipped with AST2600 BMC SoC
Hi George,
Which configuration (defconfig) do you run your system with?
Hi Joel,
We use "evb-ast2600a1-spl_defconfig" for S6Q system.
Quoted 2 lines
How different is this configuration from other platforms present in the tree?
Not much difference:
1. RGMII for mac2 and enable mdio3 function pins
2. spi2 for BIOS flash
3. mac delay for mac2/mac3 to prevent network abnormal after A/C
4. I2C buses enabled according to S6Q platform
Quoted 3 lines
I ask as I wonder if we can get away with some common configs in u-boot, without requiring every platform add their own dts.
Does it mean you'd like to add the additional common dts for AST2600 ?
Quoted 234 lines
Quoted 234 lines
Signed-off-by George Hung <[email protected]>--- arch/arm/dts/Makefile | 1 + arch/arm/dts/ast2600-s6q.dts | 218 +++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) create mode 100644 arch/arm/dts/ast2600-s6q.dtsarch/arm/dts/Makefile index renamed from arch/arm/dts/Makefile +0
-0
e5a73697c5..a79f885f54100755arch/arm/dts/Makefile +1
-0@@ -686,6 +686,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ ast2600-ncsi.dtb \ ast2600-pfr.dtb \ ast2600-rainier.dtb \ + ast2600-s6q.dtb \ ast2600-slt.dtb \ ast2600-tacoma.dtb(quoted diff) +0
-0
b/arch/arm/dts/ast2600-s6q.dtsnew file mode 100644 index 0000000000..52b620d3b4arch/arm/dts/ast2600-s6q.dts new file +203
-1@@ -0,0 +1,218 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2022 Quanta Corp. +/dts-v1/; + +#include "ast2600-u-boot.dtsi" + +/ { + model = "Quanta S6Q BMC"; + compatible = "quanta,s6q-bmc", "aspeed,ast2600"; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; + + chosen { + stdout-path = &uart5; + }; + + aliases { + spi0 = &fmc; + spi2 = &spi2; + ethernet0 = &mac2; + ethernet1 = &mac3; + }; + + cpus { + cpu@0 { + clock-frequency = <800000000>; + }; + cpu@1 { + clock-frequency = <800000000>; + }; + }; +}; + +&uart5 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&sdrammc { + clock-frequency = <400000000>; }; + +&wdt1 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&wdt2 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&wdt3 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&mdio { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mdio3_default>; + #address-cells = <1>; + #size-cells = <0>; + + ethphy2: ethernet-phy@2 { + reg = <0>; + }; +}; + +&mac2 { + status = "okay"; + phy-mode = "rgmii"; + phy-handle = <ðphy2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii3_default>; }; + +&mac3 { + status = "okay"; + phy-mode = "rmii"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rmii4_default>; }; + +&fmc { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fmcquad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&spi2 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2_default &pinctrl_spi2cs1_default + &pinctrl_spi2cs2_default + &pinctrl_spi2quad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&i2c0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1_default>; }; + +&i2c1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2_default>; }; + +&i2c2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3_default>; }; + +&i2c3 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4_default>; }; + +&i2c4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c5_default>; }; + +&i2c5 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c6_default>; }; + +&i2c6 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c7_default>; }; + +&i2c7 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c8_default>; }; + +&i2c8 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c9_default>; }; + +&i2c9 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c10_default>; }; + +&i2c11 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c12_default>; }; + +&i2c14 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c15_default>; }; + +&i2c15 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c16_default>; }; + +&display_port { + status = "okay"; +}; + +&scu { + mac2-clk-delay = <0x08 0x04 + 0x08 0x04 + 0x08 0x04>; + mac3-clk-delay = <0x08 0x04 + 0x08 0x04 + 0x08 0x04>; +}; + +&hace { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&acry { + u-boot,dm-pre-reloc; + status = "okay"; +}; --2.32.0
Quoted 25 lines · George Hung (洪忠敬)
Quoted 9 lines
Quoted 3 lines · George Hung
Add build support for Quanta S6Q board equipped with AST2600 BMC SoC
Hi George,
Which configuration (defconfig) do you run your system with?
Hi Joel,
We use "evb-ast2600a1-spl_defconfig" for S6Q system.
Quoted 2 lines
How different is this configuration from other platforms present in the tree?
Not much difference:
1. RGMII for mac2 and enable mdio3 function pins
2. spi2 for BIOS flash
3. mac delay for mac2/mac3 to prevent network abnormal after A/C
4. I2C buses enabled according to S6Q platformQuoted 1 line
Quoted 4 lines
Quoted 2 lines
I ask as I wonder if we can get away with some common configs in u-boot, without requiring every platform add their own dts.
Does it mean you'd like to add the additional common dts for AST2600 ?
Any further thoughts from anyone on the best way to add support for platforms like this? I've got a local patch adding a .dts for an ast2400 system that differs from ast2400-evb.dts even less than the above (just switching the console to a different UART and making a similar pinctrl tweak for RGMII on mac1). I was about to post it, but then saw this thread, so I figured I'd hold off if there's likely to be a Kconfig-based way of achieving that soon.
Thanks,
Zev
Quoted 17 lines · Zev Weiss
Quoted 15 lines · George Hung (洪忠敬)
Quoted 9 lines
Quoted 3 lines · George Hung
Add build support for Quanta S6Q board equipped with AST2600 BMC SoC
Hi George,
Which configuration (defconfig) do you run your system with?
Hi Joel,
We use "evb-ast2600a1-spl_defconfig" for S6Q system.
Quoted 1 line
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
How different is this configuration from other platforms present in the tree?
Not much difference:
1. RGMII for mac2 and enable mdio3 function pins
2. spi2 for BIOS flash
3. mac delay for mac2/mac3 to prevent network abnormal after A/C
4. I2C buses enabled according to S6Q platform
I've merged your patch. Sorry for the delay.
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
I ask as I wonder if we can get away with some common configs in u-boot, without requiring every platform add their own dts.
Does it mean you'd like to add the additional common dts for AST2600 ?
Quoted 7 lines
Any further thoughts from anyone on the best way to add support for platforms like this? I've got a local patch adding a .dts for an ast2400 system that differs from
ast2400-evb.dtseven less than the above (just switching the console to a different UART and making a similar pinctrl tweak for RGMII on mac1). I was about to post it, but then saw this thread, so I figured I'd hold off if there's likely to be a Kconfig-based way of achieving that soon.
I don't think there's a good way to solve this if the machine needs different options.
One way to reduce the maintenance burden would be to include the evb dts in your dts, and make the required modifications.
Cheers,
Joel
Quoted 4 lines
Thanks,
Zev
Quoted 44 lines · Joel Stanley
Quoted 17 lines · Zev Weiss
Quoted 15 lines · George Hung (洪忠敬)
Quoted 9 lines
Quoted 3 lines · George Hung
Add build support for Quanta S6Q board equipped with AST2600 BMC SoC
Hi George,
Which configuration (defconfig) do you run your system with?
Hi Joel,
We use "evb-ast2600a1-spl_defconfig" for S6Q system.
Quoted 1 line
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
How different is this configuration from other platforms present in the tree?
Not much difference:
1. RGMII for mac2 and enable mdio3 function pins
2. spi2 for BIOS flash
3. mac delay for mac2/mac3 to prevent network abnormal after A/C
4. I2C buses enabled according to S6Q platformI've merged your patch. Sorry for the delay.
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
I ask as I wonder if we can get away with some common configs in u-boot, without requiring every platform add their own dts.
Does it mean you'd like to add the additional common dts for AST2600 ?
Quoted 7 lines
Any further thoughts from anyone on the best way to add support for platforms like this? I've got a local patch adding a .dts for an ast2400 system that differs from
ast2400-evb.dtseven less than the above (just switching the console to a different UART and making a similar pinctrl tweak for RGMII on mac1). I was about to post it, but then saw this thread, so I figured I'd hold off if there's likely to be a Kconfig-based way of achieving that soon.
Quoted 6 lines
I don't think there's a good way to solve this if the machine needs different options.
One way to reduce the maintenance burden would be to include the evb dts in your dts, and make the required modifications.
Alright -- yeah, that's the approach I had taken, so it didn't seem too terrible, just wasn't sure if we were trying to avoid adding more per-board devicetrees entirely. I'll post it shortly.
Thanks,
Zev