| Message ID | 20230830090212.3880559-2-peteryin.openbmc@gmail.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | ARM: dts: aspeed:Minerva: | expand |
On 30/08/2023 11:02, peteryin wrote: > Add linux device tree entry related to > Minerva specific devices connected to BMC SoC. > > Signed-off-by: peteryin <peteryin.openbmc@gmail.com> To clarify: your full name or known identity is "peteryin"? > --- > arch/arm/boot/dts/Makefile | 1 + > .../boot/dts/aspeed-bmc-facebook-minerva.dts | 385 ++++++++++++++++++ > 2 files changed, 386 insertions(+) > create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-minerva.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 9e1d7bf3cff6..edb0b2105333 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -1604,6 +1604,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ > aspeed-bmc-facebook-wedge400.dtb \ > aspeed-bmc-facebook-yamp.dtb \ > aspeed-bmc-facebook-yosemitev2.dtb \ > + aspeed-bmc-facebook-minerva.dtb \ Nothing improved here. > aspeed-bmc-ibm-bonnell.dtb \ > aspeed-bmc-ibm-everest.dtb \ > aspeed-bmc-ibm-rainier.dtb \ > + "","","","","","","","", > + /*O0-O3 line 224-231*/ > + "","","","","","","","", > + /*O4-O7 line 232-239*/ > + "","","","","","","","", > + /*P0-P3 line 240-247*/ > + "","","","","","","","", > + /*P4-P7 line 248-255*/ > + "","","","","","","",""; > +}; > + Nor here. This is a friendly reminder during the review process. It seems my previous comments were not fully addressed. Maybe my feedback got lost between the quotes, maybe you just forgot to apply it. Please go back to the previous discussion and either implement all requested changes or keep discussing them. Thank you. Best regards, Krzysztof
On 8/30/23 17:44, Krzysztof Kozlowski wrote: > On 30/08/2023 11:02, peteryin wrote: >> Add linux device tree entry related to >> Minerva specific devices connected to BMC SoC. >> >> Signed-off-by: peteryin <peteryin.openbmc@gmail.com> > To clarify: your full name or known identity is "peteryin"? > >> --- >> arch/arm/boot/dts/Makefile | 1 + >> .../boot/dts/aspeed-bmc-facebook-minerva.dts | 385 ++++++++++++++++++ >> 2 files changed, 386 insertions(+) >> create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-minerva.dts >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index 9e1d7bf3cff6..edb0b2105333 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -1604,6 +1604,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ >> aspeed-bmc-facebook-wedge400.dtb \ >> aspeed-bmc-facebook-yamp.dtb \ >> aspeed-bmc-facebook-yosemitev2.dtb \ >> + aspeed-bmc-facebook-minerva.dtb \ > Nothing improved here. > >> aspeed-bmc-ibm-bonnell.dtb \ >> aspeed-bmc-ibm-everest.dtb \ >> aspeed-bmc-ibm-rainier.dtb \ > >> + "","","","","","","","", >> + /*O0-O3 line 224-231*/ >> + "","","","","","","","", >> + /*O4-O7 line 232-239*/ >> + "","","","","","","","", >> + /*P0-P3 line 240-247*/ >> + "","","","","","","","", >> + /*P4-P7 line 248-255*/ >> + "","","","","","","",""; >> +}; >> + > Nor here. > > This is a friendly reminder during the review process. > > It seems my previous comments were not fully addressed. Maybe my > feedback got lost between the quotes, maybe you just forgot to apply it. > Please go back to the previous discussion and either implement all > requested changes or keep discussing them. > Could you please clarify for me? Are you asking if the last line should not have a blank line, or I can't set a comment for the sgpio line like this: /*P4-P7 line 248-255*/ > Thank you. > > Best regards, > Krzysztof >
On 05/09/2023 11:55, PeterYin wrote: > > On 8/30/23 17:44, Krzysztof Kozlowski wrote: >> On 30/08/2023 11:02, peteryin wrote: >>> Add linux device tree entry related to >>> Minerva specific devices connected to BMC SoC. >>> >>> Signed-off-by: peteryin <peteryin.openbmc@gmail.com> >> To clarify: your full name or known identity is "peteryin"? >> >>> --- >>> arch/arm/boot/dts/Makefile | 1 + >>> .../boot/dts/aspeed-bmc-facebook-minerva.dts | 385 ++++++++++++++++++ >>> 2 files changed, 386 insertions(+) >>> create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-minerva.dts >>> >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >>> index 9e1d7bf3cff6..edb0b2105333 100644 >>> --- a/arch/arm/boot/dts/Makefile >>> +++ b/arch/arm/boot/dts/Makefile >>> @@ -1604,6 +1604,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ >>> aspeed-bmc-facebook-wedge400.dtb \ >>> aspeed-bmc-facebook-yamp.dtb \ >>> aspeed-bmc-facebook-yosemitev2.dtb \ >>> + aspeed-bmc-facebook-minerva.dtb \ >> Nothing improved here. >> >>> aspeed-bmc-ibm-bonnell.dtb \ >>> aspeed-bmc-ibm-everest.dtb \ >>> aspeed-bmc-ibm-rainier.dtb \ >> >>> + "","","","","","","","", >>> + /*O0-O3 line 224-231*/ >>> + "","","","","","","","", >>> + /*O4-O7 line 232-239*/ >>> + "","","","","","","","", >>> + /*P0-P3 line 240-247*/ >>> + "","","","","","","","", >>> + /*P4-P7 line 248-255*/ >>> + "","","","","","","",""; >>> +}; >>> + >> Nor here. >> >> This is a friendly reminder during the review process. >> >> It seems my previous comments were not fully addressed. Maybe my >> feedback got lost between the quotes, maybe you just forgot to apply it. >> Please go back to the previous discussion and either implement all >> requested changes or keep discussing them. >> > Could you please clarify for me? > > Are you asking if the last line should not have a blank line, or I can't > set a comment for the sgpio line like this: 6 or 7 versions ago I said: "Still redundant blank line." so it is about stray blank line. https://lore.kernel.org/all/9f499fe5-db59-f4c8-6a50-93725b7287fd@linaro.org/ Best regards, Krzysztof
On 9/5/23 18:38, Krzysztof Kozlowski wrote: > On 05/09/2023 11:55, PeterYin wrote: >> On 8/30/23 17:44, Krzysztof Kozlowski wrote: >>> On 30/08/2023 11:02, peteryin wrote: >>>> Add linux device tree entry related to >>>> Minerva specific devices connected to BMC SoC. >>>> >>>> Signed-off-by: peteryin <peteryin.openbmc@gmail.com> >>> To clarify: your full name or known identity is "peteryin"? >>> >>>> --- >>>> arch/arm/boot/dts/Makefile | 1 + >>>> .../boot/dts/aspeed-bmc-facebook-minerva.dts | 385 ++++++++++++++++++ >>>> 2 files changed, 386 insertions(+) >>>> create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-minerva.dts >>>> >>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >>>> index 9e1d7bf3cff6..edb0b2105333 100644 >>>> --- a/arch/arm/boot/dts/Makefile >>>> +++ b/arch/arm/boot/dts/Makefile >>>> @@ -1604,6 +1604,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ >>>> aspeed-bmc-facebook-wedge400.dtb \ >>>> aspeed-bmc-facebook-yamp.dtb \ >>>> aspeed-bmc-facebook-yosemitev2.dtb \ >>>> + aspeed-bmc-facebook-minerva.dtb \ >>> Nothing improved here. >>> >>>> aspeed-bmc-ibm-bonnell.dtb \ >>>> aspeed-bmc-ibm-everest.dtb \ >>>> aspeed-bmc-ibm-rainier.dtb \ >>>> + "","","","","","","","", >>>> + /*O0-O3 line 224-231*/ >>>> + "","","","","","","","", >>>> + /*O4-O7 line 232-239*/ >>>> + "","","","","","","","", >>>> + /*P0-P3 line 240-247*/ >>>> + "","","","","","","","", >>>> + /*P4-P7 line 248-255*/ >>>> + "","","","","","","",""; >>>> +}; >>>> + >>> Nor here. >>> >>> This is a friendly reminder during the review process. >>> >>> It seems my previous comments were not fully addressed. Maybe my >>> feedback got lost between the quotes, maybe you just forgot to apply it. >>> Please go back to the previous discussion and either implement all >>> requested changes or keep discussing them. >>> >> Could you please clarify for me? >> >> Are you asking if the last line should not have a blank line, or I can't >> set a comment for the sgpio line like this: > 6 or 7 versions ago I said: > "Still redundant blank line." > so it is about stray blank line. > > https://lore.kernel.org/all/9f499fe5-db59-f4c8-6a50-93725b7287fd@linaro.org/ Thanks for your reply. Do you mean that I should make corrections starting from this point in my 7? from &i2c15 { >-------status = "okay"; --blank line >-------// SCM FRU to &i2c15 { >-------status = "okay"; >-------// SCM FRU or I can't add blank line before comment from + "","","","","","","","", + /*O0-O3 line 224-231*/ + "","","","","","","","", + /*O4-O7 line 232-239*/ + "","","","","","","","", + /*P0-P3 line 240-247*/ + "","","","","","","","", + /*P4-P7 line 248-255*/ + "","","","","","","",""; +}; to + "","","","","","","","", /*O0-O3 line 224-231*/ + "","","","","","","","", /*O4-O7 line 232-239*/ + "","","","","","","","", /*P0-P3 line 240-247*/ + "","","","","","","","", /*P4-P7 line 248-255*/ + "","","","","","","",""; +}; If not, could you please provide guidance on the expected format? Thanks. > Best regards, > Krzysztof >
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 9e1d7bf3cff6..edb0b2105333 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1604,6 +1604,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-facebook-wedge400.dtb \ aspeed-bmc-facebook-yamp.dtb \ aspeed-bmc-facebook-yosemitev2.dtb \ + aspeed-bmc-facebook-minerva.dtb \ aspeed-bmc-ibm-bonnell.dtb \ aspeed-bmc-ibm-everest.dtb \ aspeed-bmc-ibm-rainier.dtb \ diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-minerva.dts new file mode 100644 index 000000000000..42087764e9e9 --- /dev/null +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-minerva.dts @@ -0,0 +1,385 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright (c) 2023 Facebook Inc. +/dts-v1/; + +#include "aspeed-g6.dtsi" +#include <dt-bindings/gpio/aspeed-gpio.h> +#include <dt-bindings/i2c/i2c.h> + +/ { + model = "Facebook Minerva"; + compatible = "facebook,minerva-bmc", "aspeed,ast2600"; + + aliases { + serial0 = &uart1; + serial4 = &uart5; + }; + + chosen { + stdout-path = &uart5; + }; + + memory@80000000 { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; + + iio-hwmon { + compatible = "iio-hwmon"; + io-channels = <&adc0 0>, <&adc0 1>, <&adc0 2>, <&adc0 3>, + <&adc0 4>, <&adc0 5>, <&adc0 6>, <&adc0 7>, + <&adc1 2>; + }; + +}; + +// HOST BIOS Debug +&uart1 { + status = "okay"; +}; + + +// SOL Host Console +&uart2 { + status = "okay"; + pinctrl-0 = <>; + +}; + +// SOL BMC Console +&uart4 { + status = "okay"; + pinctrl-0 = <>; +}; + +// BMC Debug Console +&uart5 { + status = "okay"; +}; + +//MTIA +&uart6 { + status = "okay"; +}; + +&uart_routing { + status = "okay"; +}; + +&vuart1 { + status = "okay"; + virtual; + port=<0x3e8>; + sirq = <7>; + sirq-polarity = <0>; + dma-mode; + dma-channel = <12>; +}; + +&wdt1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdtrst1_default>; + aspeed,reset-type = "soc"; + aspeed,external-signal; + aspeed,ext-push-pull; + aspeed,ext-active-high; + aspeed,ext-pulse-duration = <256>; +}; + + +&mac3 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rmii4_default>; + no-hw-checksum; + use-ncsi; + ncsi-ctrl,start-redo-probe; + ncsi-ctrl,no-channel-monitor; + mlx,multi-host; + ncsi-package = <1>; + ncsi-channel = <1>; + ncsi-rexmit = <1>; + ncsi-timeout = <2>; +}; + +&rtc { + status = "okay"; +}; + +&fmc { + status = "okay"; + flash@0 { + status = "okay"; + m25p,fast-read; + label = "bmc"; + spi-max-frequency = <50000000>; +#include "openbmc-flash-layout-128.dtsi" + }; + flash@1 { + status = "okay"; + m25p,fast-read; + label = "alt-bmc"; + spi-max-frequency = <50000000>; + }; +}; + + +//BIOS Flash +&spi2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2_default>; + + flash@0 { + status = "okay"; + m25p,fast-read; + label = "pnor"; + spi-max-frequency = <12000000>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + }; +}; + + +&kcs2 { + status = "okay"; + aspeed,lpc-io-reg = <0xca8>; +}; + +&kcs3 { + status = "okay"; + aspeed,lpc-io-reg = <0xca2>; +}; + + +&lpc_snoop { + status = "okay"; + snoop-ports = <0x80>; +}; + +&peci0 { + status = "okay"; + clock-frequency = <1000000>; +}; + + +&i2c0 { + status = "okay"; +}; + +&i2c1 { + status = "okay"; + tmp75@4B { + compatible = "ti,tmp75"; + reg = <0x4B>; + }; +}; + +&i2c2 { + status = "okay"; +}; + +&i2c3 { + status = "okay"; +}; + +&i2c4 { + status = "okay"; +}; + +&i2c5 { + status = "okay"; +}; + +&i2c6 { + status = "okay"; +}; + +&i2c7 { + status = "okay"; +}; + +&i2c8 { + status = "okay"; +}; + +&i2c9 { + status = "okay"; +}; + +&i2c11 { + status = "okay"; +}; + +&i2c12 { + status = "okay"; +}; + +&i2c13 { + status = "okay"; +}; + +// To Debug card +&i2c14 { + status = "okay"; + multi-master; + + ipmb@10 { + compatible = "ipmb-dev"; + reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; + i2c-protocol; + }; +}; + +&i2c15 { + status = "okay"; + // SCM FRU + eeprom@50 { + compatible = "atmel,24c64"; + reg = <0x50>; + }; + // BSM FRU + eeprom@56 { + compatible = "atmel,24c64"; + reg = <0x56>; + }; +}; + +&adc0 { + ref_voltage = <2500>; + status = "okay"; + + pinctrl-0 = <&pinctrl_adc0_default &pinctrl_adc1_default + &pinctrl_adc2_default &pinctrl_adc3_default + &pinctrl_adc4_default &pinctrl_adc5_default + &pinctrl_adc6_default &pinctrl_adc7_default>; +}; + +&adc1 { + ref_voltage = <2500>; + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_adc10_default>; +}; + +&jtag1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_jtagm_default>; +}; + +&ehci1 { + status = "okay"; +}; + +&gpio0 { + pinctrl-names = "default"; + gpio-line-names = + /*A0-A7*/ "","","","","","","","", + /*B0-B7*/ "","","","","","FM_ID_LED_N","","", + /*C0-C7*/ "","","","","","","","", + /*D0-D7*/ "","","SOL_UART_SET","","","","","", + /*E0-E7*/ "","","","","","","","", + /*F0-F7*/ "","","","","","","","", + /*G0-G7*/ "","","","","","","","", + /*H0-H7*/ "","","","","","","","", + /*I0-I7*/ "","","","","","","","", + /*J0-J7*/ "","","","","","","","", + /*K0-K7*/ "","","","","","","","", + /*L0-L7*/ "","","","","","","","", + /*M0-M7*/ "","","","","","","","", + /*N0-N7*/ "LED_POSTCODE_0","LED_POSTCODE_1", + "LED_POSTCODE_2","LED_POSTCODE_3", + "LED_POSTCODE_4","LED_POSTCODE_5", + "LED_POSTCODE_6","LED_POSTCODE_7", + /*O0-O7*/ "","","","","","","","", + /*P0-P7*/ "FP_SYS_PWRBTN_IN_N","BMC_SYS_PWRBTN_OUT_N", + "FP_RST_BTN_IN_N","","","","","", + /*Q0-Q7*/ "","","","","","","","", + /*R0-R7*/ "","","","","","","","", + /*S0-S7*/ "","","","","","","","", + /*T0-T7*/ "","","","","","","","", + /*U0-U7*/ "","","","","","","","", + /*V0-V7*/ "","","","","","","","", + /*W0-W7*/ "","","","","","","","", + /*X0-X7*/ "","","","","","","","", + /*Y0-Y7*/ "","","","","","","","", + /*Z0-Z7*/ "","","","","","","",""; +}; + +&sgpiom0 { + status = "okay"; + max-ngpios = <128>; + ngpios = <128>; + bus-frequency = <2000000>; + gpio-line-names = + /*in - out - in - out */ + /*A0-A3 line 0-7*/ + "","","","","","ENABLE_SENSORS","","", + /*A4-A7 line 8-15*/ + "","","","","","","","", + /*B0-B3 line 16-23*/ + "","","","","","BMC_RST_BTN_OUT_N","","", + /*B4-B7 line 24-31*/ + "","","","","","","","", + /*C0-C3 line 32-39*/ + "","","","","","","","", + /*C4-C7 line 40-47*/ + "","","","","","","","", + /*D0-D3 line 48-55*/ + "","","","","","","","", + /*D4-D7 line 56-63*/ + "","","","","","","","", + /*E0-E3 line 64-71*/ + "","","","","","","","", + /*E4-E7 line 72-79*/ + "","","","","","","","", + /*F0-F3 line 80-87*/ + "","","","","","","","", + /*F4-F7 line 88-95*/ + "","","","","","","","", + /*G0-G3 line 96-103*/ + "","","","","","","","", + /*G4-G7 line 104-111*/ + "","","","","","","","", + /*H0-H3 line 112-119*/ + "","","","","PLD_SYS_POWER_GOOD","","","", + /*H4-H7 line 120-127*/ + "","","","","","","","", + /*I0-I3 line 128-135*/ + "","","","","","","","", + /*I4-I7 line 136-143*/ + "","","","","","","","", + /*J0-J3 line 144-151*/ + "","","PLD_BIOS_POST_CMPLT_N","","","","","", + /*J4-J7 line 152-159*/ + "","","","","","","","", + /*K0-K3 line 160-167*/ + "","","","","","","","", + /*K4-K7 line 168-175*/ + "","","","","","","","", + /*L0-L3 line 176-183*/ + "","","","","","","","", + /*L4-L7 line 184-191*/ + "","","","","","","","", + /*M0-M3 line 192-199*/ + "","","","","","","","", + /*M4-M7 line 200-207*/ + "","","","","","","","", + /*N0-N3 line 208-215*/ + "","","","","","","","", + /*N4-N7 line 216-223*/ + "","","","","","","","", + /*O0-O3 line 224-231*/ + "","","","","","","","", + /*O4-O7 line 232-239*/ + "","","","","","","","", + /*P0-P3 line 240-247*/ + "","","","","","","","", + /*P4-P7 line 248-255*/ + "","","","","","","",""; +}; +
Add linux device tree entry related to Minerva specific devices connected to BMC SoC. Signed-off-by: peteryin <peteryin.openbmc@gmail.com> --- arch/arm/boot/dts/Makefile | 1 + .../boot/dts/aspeed-bmc-facebook-minerva.dts | 385 ++++++++++++++++++ 2 files changed, 386 insertions(+) create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-minerva.dts