| Message ID | 20230530030320.548408-1-lintao1890@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | [u-boot,v2019.04-aspeed-openbmc,v5] board: ast2600: Add Inspur SCM V1 board | expand |
On Tue, 30 May 2023 at 03:03, <lintao1890@163.com> wrote: > > From: LinTao <lintao.lc@inspur.com> > > AST2600-INSPUR is an Inspur SCM V1 board which is > equipped with AST2600 > > Signed-off-by: LinTao <lintao.lc@inspur.com> > --- > V1 -> V2: > - add a missing '\' > --- > V2 -> V3: > - use gpio subsystem > --- > V3 -> V4: > - fix style problems > --- > V4 -> V5: > - turn on SCM LED1 > --- > arch/arm/dts/Makefile | 3 +- > arch/arm/dts/ast2600-inspur-nf5280m7.dts | 190 +++++++++++++++++++++++ > arch/arm/mach-aspeed/ast2600/Kconfig | 8 + > board/aspeed/ast2600_inspur/Kconfig | 13 ++ > board/aspeed/ast2600_inspur/Makefile | 1 + > board/aspeed/ast2600_inspur/inspur.c | 18 +++ > 6 files changed, 232 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/ast2600-inspur-nf5280m7.dts > create mode 100644 board/aspeed/ast2600_inspur/Kconfig > create mode 100644 board/aspeed/ast2600_inspur/Makefile > create mode 100644 board/aspeed/ast2600_inspur/inspur.c > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 6c34b83336..f62c16b4f1 100755 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -695,7 +695,8 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ > ast2600-slt.dtb \ > ast2600-tacoma.dtb \ > ast2600-intel.dtb \ > - ast2600-tacoma.dtb > + ast2600-tacoma.dtb \ > + ast2600-inspur-nf5280m7.dtb > > dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb > > diff --git a/arch/arm/dts/ast2600-inspur-nf5280m7.dts b/arch/arm/dts/ast2600-inspur-nf5280m7.dts > new file mode 100644 > index 0000000000..8210797868 > --- /dev/null > +++ b/arch/arm/dts/ast2600-inspur-nf5280m7.dts > @@ -0,0 +1,190 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// Copyright 2023 Inspur Corp. > +/dts-v1/; > + > +#include "ast2600-u-boot.dtsi" > + > +/ { > + model = "Inspur SCM V1"; > + compatible = "inspur,nf5280m7-bmc", "aspeed,ast2600"; > + > + memory { > + device_type = "memory"; > + reg = <0x80000000 0x40000000>; > + }; > + > + chosen { > + stdout-path = &uart5; > + }; > + > + aliases { > + mmc0 = &emmc_slot0; > + mmc1 = &sdhci_slot0; > + mmc2 = &sdhci_slot1; > + spi0 = &fmc; > + spi1 = &spi1; > + spi2 = &spi2; > + ethernet1 = &mac1; > + }; > + > + cpus { > + cpu@0 { > + clock-frequency = <1200000000>; > + }; > + cpu@1 { > + clock-frequency = <1200000000>; > + }; > + }; > +}; > + > +&gpio0 { > + status = "okay"; > +}; > + > +&uart1 { > + status = "okay"; > +}; > + > +&uart2 { > + status = "okay"; > +}; > + > +&uart5 { > + u-boot,dm-pre-reloc; > + status = "okay"; > +}; > + > +&sdrammc { > + clock-frequency = <400000000>; > +}; > + > +&mdio { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_mdio2_default>; > + #address-cells = <1>; > + #size-cells = <0>; > + ethphy0: ethernet-phy@0 { > + reg = <0>; > + }; > + > + ethphy1: ethernet-phy@1 { > + reg = <0>; > + }; > + > + ethphy2: ethernet-phy@2 { > + reg = <0>; > + }; > + > + ethphy3: ethernet-phy@3 { > + reg = <0>; > + }; > +}; > + > +&mac1 { > + status = "okay"; > + phy-mode = "rgmii"; > + phy-handle = <ðphy1>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_rgmii2_default>; > +}; > + > +&fmc { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_fmcquad_default>; > + flash@0 { > + status = "okay"; > + spi-max-frequency = <40000000>; > + spi-tx-bus-width = <4>; > + spi-rx-bus-width = <4>; > + }; > + flash@1 { > + status = "okay"; > + spi-max-frequency = <40000000>; > + spi-tx-bus-width = <4>; > + spi-rx-bus-width = <4>; > + }; > +}; > + > +&i2c1 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c2_default>; You shouldn't need to add the pinctrl nodes, as they're present in ast2600.dtsi. > +}; > + > +&i2c4 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c5_default>; > +}; > + > +&i2c5 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c6_default>; > +}; > + > +&i2c6 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c7_default>; > +}; > + > +&i2c7 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c8_default>; > +}; > + > +&i2c8 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c9_default>; > +}; > + > +&i2c9 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c10_default>; > +}; > + > +&i2c12 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c13_default>; > +}; > + > +&i2c13 { > + status = "okay"; > + multi-master; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c14_default>; > +}; > + > +&hace { > + u-boot,dm-pre-reloc; > + status = "okay"; > +}; > + > +&acry { > + u-boot,dm-pre-reloc; > + status = "disabled"; > +}; > --- /dev/null > +++ b/board/aspeed/ast2600_inspur/inspur.c +int board_late_init(void) > +{ > + /* Turn on SCM LED1 */ > + gpio_request(ASPEED_GPIO(B, 2), ""); > + gpio_direction_output(ASPEED_GPIO(B, 2), GPIO_ACTIVE_LOW); Are you able to do this with a gpio hog in the device tree? If so, we would prefer that approach as it avoids adding another platform to the source tree. Cheers, Joel
At 2023-05-30 14:00:43, "Joel Stanley" <joel@jms.id.au> wrote: >On Tue, 30 May 2023 at 03:03, <lintao1890@163.com> wrote: >> >> From: LinTao <lintao.lc@inspur.com> >> >> AST2600-INSPUR is an Inspur SCM V1 board which is >> equipped with AST2600 >> >> Signed-off-by: LinTao <lintao.lc@inspur.com> >> --- >> V1 -> V2: >> - add a missing '\' >> --- >> V2 -> V3: >> - use gpio subsystem >> --- >> V3 -> V4: >> - fix style problems >> --- >> V4 -> V5: >> - turn on SCM LED1 >> --- >> arch/arm/dts/Makefile | 3 +- >> arch/arm/dts/ast2600-inspur-nf5280m7.dts | 190 +++++++++++++++++++++++ >> arch/arm/mach-aspeed/ast2600/Kconfig | 8 + >> board/aspeed/ast2600_inspur/Kconfig | 13 ++ >> board/aspeed/ast2600_inspur/Makefile | 1 + >> board/aspeed/ast2600_inspur/inspur.c | 18 +++ >> 6 files changed, 232 insertions(+), 1 deletion(-) >> create mode 100644 arch/arm/dts/ast2600-inspur-nf5280m7.dts >> create mode 100644 board/aspeed/ast2600_inspur/Kconfig >> create mode 100644 board/aspeed/ast2600_inspur/Makefile >> create mode 100644 board/aspeed/ast2600_inspur/inspur.c >> >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >> index 6c34b83336..f62c16b4f1 100755 >> --- a/arch/arm/dts/Makefile >> +++ b/arch/arm/dts/Makefile >> @@ -695,7 +695,8 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ >> ast2600-slt.dtb \ >> ast2600-tacoma.dtb \ >> ast2600-intel.dtb \ >> - ast2600-tacoma.dtb >> + ast2600-tacoma.dtb \ >> + ast2600-inspur-nf5280m7.dtb >> >> dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb >> >> diff --git a/arch/arm/dts/ast2600-inspur-nf5280m7.dts b/arch/arm/dts/ast2600-inspur-nf5280m7.dts >> new file mode 100644 >> index 0000000000..8210797868 >> --- /dev/null >> +++ b/arch/arm/dts/ast2600-inspur-nf5280m7.dts >> @@ -0,0 +1,190 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +// Copyright 2023 Inspur Corp. >> +/dts-v1/; >> + >> +#include "ast2600-u-boot.dtsi" >> + >> +/ { >> + model = "Inspur SCM V1"; >> + compatible = "inspur,nf5280m7-bmc", "aspeed,ast2600"; >> + >> + memory { >> + device_type = "memory"; >> + reg = <0x80000000 0x40000000>; >> + }; >> + >> + chosen { >> + stdout-path = &uart5; >> + }; >> + >> + aliases { >> + mmc0 = &emmc_slot0; >> + mmc1 = &sdhci_slot0; >> + mmc2 = &sdhci_slot1; >> + spi0 = &fmc; >> + spi1 = &spi1; >> + spi2 = &spi2; >> + ethernet1 = &mac1; >> + }; >> + >> + cpus { >> + cpu@0 { >> + clock-frequency = <1200000000>; >> + }; >> + cpu@1 { >> + clock-frequency = <1200000000>; >> + }; >> + }; >> +}; >> + >> +&gpio0 { >> + status = "okay"; >> +}; >> + >> +&uart1 { >> + status = "okay"; >> +}; >> + >> +&uart2 { >> + status = "okay"; >> +}; >> + >> +&uart5 { >> + u-boot,dm-pre-reloc; >> + status = "okay"; >> +}; >> + >> +&sdrammc { >> + clock-frequency = <400000000>; >> +}; >> + >> +&mdio { >> + status = "okay"; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_mdio2_default>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + ethphy0: ethernet-phy@0 { >> + reg = <0>; >> + }; >> + >> + ethphy1: ethernet-phy@1 { >> + reg = <0>; >> + }; >> + >> + ethphy2: ethernet-phy@2 { >> + reg = <0>; >> + }; >> + >> + ethphy3: ethernet-phy@3 { >> + reg = <0>; >> + }; >> +}; >> + >> +&mac1 { >> + status = "okay"; >> + phy-mode = "rgmii"; >> + phy-handle = <ðphy1>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_rgmii2_default>; >> +}; >> + >> +&fmc { >> + status = "okay"; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_fmcquad_default>; >> + flash@0 { >> + status = "okay"; >> + spi-max-frequency = <40000000>; >> + spi-tx-bus-width = <4>; >> + spi-rx-bus-width = <4>; >> + }; >> + flash@1 { >> + status = "okay"; >> + spi-max-frequency = <40000000>; >> + spi-tx-bus-width = <4>; >> + spi-rx-bus-width = <4>; >> + }; >> +}; >> + >> +&i2c1 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c2_default>; > >You shouldn't need to add the pinctrl nodes, as they're present in ast2600.dtsi. > >> +}; >> + >> +&i2c4 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c5_default>; >> +}; >> + >> +&i2c5 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c6_default>; >> +}; >> + >> +&i2c6 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c7_default>; >> +}; >> + >> +&i2c7 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c8_default>; >> +}; >> + >> +&i2c8 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c9_default>; >> +}; >> + >> +&i2c9 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c10_default>; >> +}; >> + >> +&i2c12 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c13_default>; >> +}; >> + >> +&i2c13 { >> + status = "okay"; >> + multi-master; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c14_default>; >> +}; >> + >> +&hace { >> + u-boot,dm-pre-reloc; >> + status = "okay"; >> +}; >> + >> +&acry { >> + u-boot,dm-pre-reloc; >> + status = "disabled"; >> +}; > > >> --- /dev/null >> +++ b/board/aspeed/ast2600_inspur/inspur.c > > +int board_late_init(void) >> +{ >> + /* Turn on SCM LED1 */ >> + gpio_request(ASPEED_GPIO(B, 2), ""); >> + gpio_direction_output(ASPEED_GPIO(B, 2), GPIO_ACTIVE_LOW); > >Are you able to do this with a gpio hog in the device tree? > >If so, we would prefer that approach as it avoids adding another >platform to the source tree. > >Cheers, > >Joel I will be on the board_ late_init adding other functions , this turn on led1 is only the first fill. I hope my first submission is as simple as possible, so I added this Turn on Led. It ( "turn on led1") will be deleted in the future. so I didn't do this in the device tree .
Dear Lin, Am 30.05.23 um 05:03 schrieb lintao1890@163.com: > From: LinTao <lintao.lc@inspur.com> If Lin is your given name, and Tao your surname, should it be spelled with a space? git config --global user.name "Lin Tao" > AST2600-INSPUR is an Inspur SCM V1 board which is > equipped with AST2600 This fits in one line as it’s less than 76 (≤ 75) characters. > Signed-off-by: LinTao <lintao.lc@inspur.com> If your name is spelled with a space, then you could update it here too. […] Kind regards, Paul
On Tue, 30 May 2023 at 06:33, lintao1890 <lintao1890@163.com> wrote: > > +int board_late_init(void) > >> +{ > >> + /* Turn on SCM LED1 */ > >> + gpio_request(ASPEED_GPIO(B, 2), ""); > >> + gpio_direction_output(ASPEED_GPIO(B, 2), GPIO_ACTIVE_LOW); > > > >Are you able to do this with a gpio hog in the device tree? > > > >If so, we would prefer that approach as it avoids adding another > >platform to the source tree. > > > >Cheers, > > > >Joel > > I will be on the board_ late_init adding other functions , > this turn on led1 is only the first fill. > > I hope my first submission is as simple as possible, > so I added this Turn on Led. > > It ( "turn on led1") will be deleted in the future. > > so I didn't do this in the device tree . In this case, I recommend submitting a series with the full set of changes you have prepared. Add the device tree in the first patch, and a second patch with your board file. Avoid adding code that you later delete. Cheers, Joel
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 6c34b83336..f62c16b4f1 100755 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -695,7 +695,8 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ ast2600-slt.dtb \ ast2600-tacoma.dtb \ ast2600-intel.dtb \ - ast2600-tacoma.dtb + ast2600-tacoma.dtb \ + ast2600-inspur-nf5280m7.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb diff --git a/arch/arm/dts/ast2600-inspur-nf5280m7.dts b/arch/arm/dts/ast2600-inspur-nf5280m7.dts new file mode 100644 index 0000000000..8210797868 --- /dev/null +++ b/arch/arm/dts/ast2600-inspur-nf5280m7.dts @@ -0,0 +1,190 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2023 Inspur Corp. +/dts-v1/; + +#include "ast2600-u-boot.dtsi" + +/ { + model = "Inspur SCM V1"; + compatible = "inspur,nf5280m7-bmc", "aspeed,ast2600"; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; + + chosen { + stdout-path = &uart5; + }; + + aliases { + mmc0 = &emmc_slot0; + mmc1 = &sdhci_slot0; + mmc2 = &sdhci_slot1; + spi0 = &fmc; + spi1 = &spi1; + spi2 = &spi2; + ethernet1 = &mac1; + }; + + cpus { + cpu@0 { + clock-frequency = <1200000000>; + }; + cpu@1 { + clock-frequency = <1200000000>; + }; + }; +}; + +&gpio0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&uart2 { + status = "okay"; +}; + +&uart5 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&sdrammc { + clock-frequency = <400000000>; +}; + +&mdio { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mdio2_default>; + #address-cells = <1>; + #size-cells = <0>; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; + + ethphy1: ethernet-phy@1 { + reg = <0>; + }; + + ethphy2: ethernet-phy@2 { + reg = <0>; + }; + + ethphy3: ethernet-phy@3 { + reg = <0>; + }; +}; + +&mac1 { + status = "okay"; + phy-mode = "rgmii"; + phy-handle = <ðphy1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii2_default>; +}; + +&fmc { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fmcquad_default>; + flash@0 { + status = "okay"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; + flash@1 { + status = "okay"; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&i2c1 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2_default>; +}; + +&i2c4 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c5_default>; +}; + +&i2c5 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c6_default>; +}; + +&i2c6 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c7_default>; +}; + +&i2c7 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c8_default>; +}; + +&i2c8 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c9_default>; +}; + +&i2c9 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c10_default>; +}; + +&i2c12 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c13_default>; +}; + +&i2c13 { + status = "okay"; + multi-master; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c14_default>; +}; + +&hace { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&acry { + u-boot,dm-pre-reloc; + status = "disabled"; +}; diff --git a/arch/arm/mach-aspeed/ast2600/Kconfig b/arch/arm/mach-aspeed/ast2600/Kconfig index f5852afa77..db177399b9 100644 --- a/arch/arm/mach-aspeed/ast2600/Kconfig +++ b/arch/arm/mach-aspeed/ast2600/Kconfig @@ -51,6 +51,13 @@ config TARGET_QUALCOMM_DC_SCM_V1 QUALCOMM-DC-SCM-V1 is a Qualcomm DC-SCM V1 board which is equipped with AST2600. +config TARGET_AST2600_INSPUR + bool "AST2600-INSPUR" + depends on ASPEED_AST2600 + help + AST2600-INSPUR is an Inspur SCM V1 board which is + equipped with AST2600. + endchoice source "board/aspeed/evb_ast2600/Kconfig" @@ -59,5 +66,6 @@ source "board/aspeed/slt_ast2600/Kconfig" source "board/aspeed/ast2600_ibm/Kconfig" source "board/aspeed/ast2600_intel/Kconfig" source "board/qualcomm/dc-scm-v1/Kconfig" +source "board/aspeed/ast2600_inspur/Kconfig" endif diff --git a/board/aspeed/ast2600_inspur/Kconfig b/board/aspeed/ast2600_inspur/Kconfig new file mode 100644 index 0000000000..ef11a01bcc --- /dev/null +++ b/board/aspeed/ast2600_inspur/Kconfig @@ -0,0 +1,13 @@ +if TARGET_AST2600_INSPUR + +config SYS_BOARD + default "ast2600_inspur" + +config SYS_VENDOR + default "aspeed" + +config SYS_CONFIG_NAME + string "board configuration name" + default "ast2600_inspur" + +endif diff --git a/board/aspeed/ast2600_inspur/Makefile b/board/aspeed/ast2600_inspur/Makefile new file mode 100644 index 0000000000..8af8692f3c --- /dev/null +++ b/board/aspeed/ast2600_inspur/Makefile @@ -0,0 +1 @@ +obj-y += inspur.o diff --git a/board/aspeed/ast2600_inspur/inspur.c b/board/aspeed/ast2600_inspur/inspur.c new file mode 100644 index 0000000000..2edf0f5578 --- /dev/null +++ b/board/aspeed/ast2600_inspur/inspur.c @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2023 Inspur Corp. + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/gpio.h> +#include <dt-bindings/gpio/aspeed-gpio.h> + +int board_late_init(void) +{ + /* Turn on SCM LED1 */ + gpio_request(ASPEED_GPIO(B, 2), ""); + gpio_direction_output(ASPEED_GPIO(B, 2), GPIO_ACTIVE_LOW); + + return 0; +}