[linux,dev-4.10,1/1] arm: dts: Add Wfp BMC Machine

Message ID d011d483-b02d-b2ad-6b70-eb278a21fc33@linux.intel.com
State New
Headers show
Series
  • [linux,dev-4.10,1/1] arm: dts: Add Wfp BMC Machine
Related show

Commit Message

James Feist Nov. 10, 2017, 6:59 p.m.
Wfp is a Intel system with an Aspeed ast2500 BMC.

Signed-off-by: Feist, James <james.feist@linux.intel.com>
---
  arch/arm/boot/dts/Makefile                         |   1 +
  .../boot/dts/aspeed-bmc-intel-flash-layout.dtsi    |  26 +++++
  arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts         | 117 
+++++++++++++++++++++
  3 files changed, 144 insertions(+)
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts

Comments

Andrew Jeffery Nov. 13, 2017, 5:32 a.m. | #1
Hi James,

Thanks for the patch. A comment on pinmux below.

On Fri, 2017-11-10 at 10:59 -0800, James Feist wrote:
> Wfp is a Intel system with an Aspeed ast2500 BMC.
> 
> Signed-off-by: Feist, James <james.feist@linux.intel.com>
> ---
>   arch/arm/boot/dts/Makefile                         |   1 +
>   .../boot/dts/aspeed-bmc-intel-flash-layout.dtsi    |  26 +++++
>   arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts         | 117 
> +++++++++++++++++++++
>   3 files changed, 144 insertions(+)
>   create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
>   create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 6d6c9eb..987e23e 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -992,6 +992,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += 
> aspeed-bmc-opp-palmetto.dtb \
>   	aspeed-bmc-opp-lanyang.dtb \
>   	aspeed-bmc-mellanox-msn.dtb \
>   	aspeed-bmc-quanta-q71l.dtb \
> +	aspeed-bmc-intel-wfp.dtb \
>   	aspeed-ast2500-evb.dtb
>   endif
>   diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi 
> b/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
> new file mode 100644
> index 0000000..4bcfd1b
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
> @@ -0,0 +1,26 @@
> +		label = "bmc";
> +		partitions {
> +				#address-cells = < 1 >;
> +				#size-cells = < 1 >;
> +				compatible = "fixed-partitions";
> +				u-boot@0 {
> +					reg = < 0 0x60000 >;
> +					label = "u-boot";
> +				};
> +				u-boot-env@60000 {
> +					reg = < 0x60000 0x20000 >;
> +					label = "u-boot-env";
> +				};
> +				kernel@80000 {
> +					reg = < 0x80000 0x440000 >;
> +					label = "kernel";
> +				};
> +				rofs@0c0000 {
> +					reg = < 0x4c0000 0x1740000 >;
> +					label = "rofs";
> +				};
> +				rwfs@1c00000 {
> +					reg = < 0x1c00000 0x400000 >;
> +					label = "rwfs";
> +				};
> +		};
> diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts 
> b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
> new file mode 100644
> index 0000000..2b4f095
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
> @@ -0,0 +1,117 @@
> +/dts-v1/;
> +
> +#include "aspeed-g5.dtsi"
> +
> +/ {
> +	model = "WFP BMC";
> +	compatible = "intel,wfp-bmc", "aspeed,ast2500";
> +
> +	aliases {
> +		serial4 = &uart5;
> +	};
> +
> +	chosen {
> +		stdout-path = &uart5;
> +		bootargs = "console=ttyS4,115200 earlyprintk";
> +	};
> +
> +	memory {
> +		reg = <0x80000000 0x20000000>;
> +	};
> +
> +	iio-hwmon {
> +		compatible = "iio-hwmon";
> +		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
> +			<&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>,
> +			<&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,
> +			<&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>;
> +	};
> +
> +};
> +
> +&fmc {
> +	status = "okay";
> +	flash@0 {
> +		status = "okay";
> +#include "aspeed-bmc-intel-flash-layout.dtsi"
> +	};
> +};
> +
> +&spi1 {
> +	status = "okay";
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_spi1_default>;
> +
> +	flash@0 {
> +		status = "okay";
> +		label = "pnor";
> +	};
> +};
> +
> +&uart5 {
> +	status = "okay";
> +};
> +
> +&mac0 {
> +	status = "okay";
> +
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
> +	use-ncsi;

Have you tested the interface with this mux configuration? NCSI should
use pinctrl_rmii1_default (and doesn't need the MDIO mux).

Cheers,

Andrew

> +};
> +
> +&mac1 {
> +	status = "okay";
> +
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
> +};
> +
> +&i2c1 {
> +	status = "okay";
> +};
> +
> +&i2c2 {
> +	status = "okay";
> +};
> +
> +&i2c3 {
> +	status = "okay";
> +};
> +
> +&i2c4 {
> +	status = "okay";
> +};
> +
> +&i2c5 {
> +	status = "okay";
> +};
> +
> +&i2c6 {
> +	status = "okay";
> +};
> +
> +&i2c7 {
> +	status = "okay";
> +};
> +
> +&i2c13 {
> +	status = "okay";
> +};
> +
> +&gfx {
> +	status = "okay";
> +};
> +
> +&pinctrl {
> +	aspeed,external-nodes = <&gfx &lhc>;
> +};
> +
> +&pwm_tacho {
> +	status = "okay";
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default
> +			 &pinctrl_pwm2_default &pinctrl_pwm3_default
> +			 &pinctrl_pwm4_default &pinctrl_pwm5_default
> +			 &pinctrl_pwm6_default &pinctrl_pwm7_default>;
> +};
Joel Stanley Nov. 13, 2017, 7:36 a.m. | #2
On Sat, Nov 11, 2017 at 5:29 AM, James Feist
<james.feist@linux.intel.com> wrote:
> Wfp is a Intel system with an Aspeed ast2500 BMC.

What does WFP mean?

>
> Signed-off-by: Feist, James <james.feist@linux.intel.com>
> ---
>  arch/arm/boot/dts/Makefile                         |   1 +
>  .../boot/dts/aspeed-bmc-intel-flash-layout.dtsi    |  26 +++++
>  arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts         | 117
> +++++++++++++++++++++
>  3 files changed, 144 insertions(+)
>  create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
>  create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 6d6c9eb..987e23e 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -992,6 +992,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb
> \
>         aspeed-bmc-opp-lanyang.dtb \
>         aspeed-bmc-mellanox-msn.dtb \
>         aspeed-bmc-quanta-q71l.dtb \
> +       aspeed-bmc-intel-wfp.dtb \
>         aspeed-ast2500-evb.dtb
>  endif
>  diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
> b/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
> new file mode 100644
> index 0000000..4bcfd1b
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
> @@ -0,0 +1,26 @@
> +               label = "bmc";
> +               partitions {
> +                               #address-cells = < 1 >;
> +                               #size-cells = < 1 >;
> +                               compatible = "fixed-partitions";
> +                               u-boot@0 {
> +                                       reg = < 0 0x60000 >;
> +                                       label = "u-boot";
> +                               };
> +                               u-boot-env@60000 {
> +                                       reg = < 0x60000 0x20000 >;
> +                                       label = "u-boot-env";
> +                               };
> +                               kernel@80000 {
> +                                       reg = < 0x80000 0x440000 >;
> +                                       label = "kernel";
> +                               };
> +                               rofs@0c0000 {
> +                                       reg = < 0x4c0000 0x1740000 >;
> +                                       label = "rofs";
> +                               };
> +                               rwfs@1c00000 {
> +                                       reg = < 0x1c00000 0x400000 >;
> +                                       label = "rwfs";
> +                               };
> +               };

This is the same as aspeed-bmc-opp-flash-layout.dtsi. Is there any
reason we can't reuse that file?

> diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
> b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
> new file mode 100644
> index 0000000..2b4f095
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
> @@ -0,0 +1,117 @@
> +/dts-v1/;
> +
> +#include "aspeed-g5.dtsi"
> +
> +/ {
> +       model = "WFP BMC";
> +       compatible = "intel,wfp-bmc", "aspeed,ast2500";
> +
> +       aliases {
> +               serial4 = &uart5;
> +       };
> +
> +       chosen {
> +               stdout-path = &uart5;
> +               bootargs = "console=ttyS4,115200 earlyprintk";

You don't need the console=ttyS4 in bootargs if you've set the stdout-path.

We should drop that from the other systems in the tree.

> +       };
> +
> +       memory {
> +               reg = <0x80000000 0x20000000>;
> +       };
> +
> +       iio-hwmon {
> +               compatible = "iio-hwmon";
> +               io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
> +                       <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>,
> +                       <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,
> +                       <&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>;
> +       };
> +
> +};
> +
> +&fmc {
> +       status = "okay";
> +       flash@0 {
> +               status = "okay";
> +#include "aspeed-bmc-intel-flash-layout.dtsi"
> +       };
> +};
> +
> +&spi1 {
> +       status = "okay";
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_spi1_default>;
> +
> +       flash@0 {
> +               status = "okay";
> +               label = "pnor";
> +       };
> +};
> +
> +&uart5 {
> +       status = "okay";
> +};
> +
> +&mac0 {
> +       status = "okay";
> +
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
> +       use-ncsi;

As Andrew said; NCSI uses rmii so I think there's a mistake here.

> +};
> +
> +&mac1 {
> +       status = "okay";
> +
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
> +};
> +
> +&i2c1 {
> +       status = "okay";
> +};
> +
> +&i2c2 {
> +       status = "okay";
> +};
> +
> +&i2c3 {
> +       status = "okay";
> +};
> +
> +&i2c4 {
> +       status = "okay";
> +};
> +
> +&i2c5 {
> +       status = "okay";
> +};
> +
> +&i2c6 {
> +       status = "okay";
> +};
> +
> +&i2c7 {
> +       status = "okay";
> +};
> +
> +&i2c13 {
> +       status = "okay";
> +};
> +
> +&gfx {
> +       status = "okay";
> +};
> +
> +&pinctrl {
> +       aspeed,external-nodes = <&gfx &lhc>;
> +};
> +
> +&pwm_tacho {
> +       status = "okay";
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default
> +                        &pinctrl_pwm2_default &pinctrl_pwm3_default
> +                        &pinctrl_pwm4_default &pinctrl_pwm5_default
> +                        &pinctrl_pwm6_default &pinctrl_pwm7_default>;

The rest looks okay.

Cheers,

Joel
James Feist Nov. 13, 2017, 5:46 p.m. | #3
On 11/12/2017 11:36 PM, Joel Stanley wrote:
> On Sat, Nov 11, 2017 at 5:29 AM, James Feist
> <james.feist@linux.intel.com> wrote:
>> Wfp is a Intel system with an Aspeed ast2500 BMC.
> 
> What does WFP mean?
> 

WFP it is the model of the platform we are targeting.

>>
>> Signed-off-by: Feist, James <james.feist@linux.intel.com>
>> ---
>>   arch/arm/boot/dts/Makefile                         |   1 +
>>   .../boot/dts/aspeed-bmc-intel-flash-layout.dtsi    |  26 +++++
>>   arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts         | 117
>> +++++++++++++++++++++
>>   3 files changed, 144 insertions(+)
>>   create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
>>   create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 6d6c9eb..987e23e 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -992,6 +992,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb
>> \
>>          aspeed-bmc-opp-lanyang.dtb \
>>          aspeed-bmc-mellanox-msn.dtb \
>>          aspeed-bmc-quanta-q71l.dtb \
>> +       aspeed-bmc-intel-wfp.dtb \
>>          aspeed-ast2500-evb.dtb
>>   endif
>>   diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
>> b/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
>> new file mode 100644
>> index 0000000..4bcfd1b
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
>> @@ -0,0 +1,26 @@
>> +               label = "bmc";
>> +               partitions {
>> +                               #address-cells = < 1 >;
>> +                               #size-cells = < 1 >;
>> +                               compatible = "fixed-partitions";
>> +                               u-boot@0 {
>> +                                       reg = < 0 0x60000 >;
>> +                                       label = "u-boot";
>> +                               };
>> +                               u-boot-env@60000 {
>> +                                       reg = < 0x60000 0x20000 >;
>> +                                       label = "u-boot-env";
>> +                               };
>> +                               kernel@80000 {
>> +                                       reg = < 0x80000 0x440000 >;
>> +                                       label = "kernel";
>> +                               };
>> +                               rofs@0c0000 {
>> +                                       reg = < 0x4c0000 0x1740000 >;
>> +                                       label = "rofs";
>> +                               };
>> +                               rwfs@1c00000 {
>> +                                       reg = < 0x1c00000 0x400000 >;
>> +                                       label = "rwfs";
>> +                               };
>> +               };
> 
> This is the same as aspeed-bmc-opp-flash-layout.dtsi. Is there any
> reason we can't reuse that file?
> 

We could, however it seems a bit awkward to have this platform lumped in 
with open power, as it is not an open power platform. Also if we decide 
to modify the flash layout then this would have to be done anyways. I am 
fine either way, it just seemed to make more sense having them separate. 
Another alternative would be to rename aspeed-bmc-opp-flash-layout.dtsi 
to something more openbmc related instead of openpower.

>> diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
>> b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
>> new file mode 100644
>> index 0000000..2b4f095
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
>> @@ -0,0 +1,117 @@
>> +/dts-v1/;
>> +
>> +#include "aspeed-g5.dtsi"
>> +
>> +/ {
>> +       model = "WFP BMC";
>> +       compatible = "intel,wfp-bmc", "aspeed,ast2500";
>> +
>> +       aliases {
>> +               serial4 = &uart5;
>> +       };
>> +
>> +       chosen {
>> +               stdout-path = &uart5;
>> +               bootargs = "console=ttyS4,115200 earlyprintk";
> 
> You don't need the console=ttyS4 in bootargs if you've set the stdout-path.
> 
> We should drop that from the other systems in the tree.
> 

Will update.

>> +       };
>> +
>> +       memory {
>> +               reg = <0x80000000 0x20000000>;
>> +       };
>> +
>> +       iio-hwmon {
>> +               compatible = "iio-hwmon";
>> +               io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
>> +                       <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>,
>> +                       <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,
>> +                       <&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>;
>> +       };
>> +
>> +};
>> +
>> +&fmc {
>> +       status = "okay";
>> +       flash@0 {
>> +               status = "okay";
>> +#include "aspeed-bmc-intel-flash-layout.dtsi"
>> +       };
>> +};
>> +
>> +&spi1 {
>> +       status = "okay";
>> +       pinctrl-names = "default";
>> +       pinctrl-0 = <&pinctrl_spi1_default>;
>> +
>> +       flash@0 {
>> +               status = "okay";
>> +               label = "pnor";
>> +       };
>> +};
>> +
>> +&uart5 {
>> +       status = "okay";
>> +};
>> +
>> +&mac0 {
>> +       status = "okay";
>> +
>> +       pinctrl-names = "default";
>> +       pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
>> +       use-ncsi;
> 
> As Andrew said; NCSI uses rmii so I think there's a mistake here.
> 

Will investigate.

>> +};
>> +
>> +&mac1 {
>> +       status = "okay";
>> +
>> +       pinctrl-names = "default";
>> +       pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
>> +};
>> +
>> +&i2c1 {
>> +       status = "okay";
>> +};
>> +
>> +&i2c2 {
>> +       status = "okay";
>> +};
>> +
>> +&i2c3 {
>> +       status = "okay";
>> +};
>> +
>> +&i2c4 {
>> +       status = "okay";
>> +};
>> +
>> +&i2c5 {
>> +       status = "okay";
>> +};
>> +
>> +&i2c6 {
>> +       status = "okay";
>> +};
>> +
>> +&i2c7 {
>> +       status = "okay";
>> +};
>> +
>> +&i2c13 {
>> +       status = "okay";
>> +};
>> +
>> +&gfx {
>> +       status = "okay";
>> +};
>> +
>> +&pinctrl {
>> +       aspeed,external-nodes = <&gfx &lhc>;
>> +};
>> +
>> +&pwm_tacho {
>> +       status = "okay";
>> +       pinctrl-names = "default";
>> +       pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default
>> +                        &pinctrl_pwm2_default &pinctrl_pwm3_default
>> +                        &pinctrl_pwm4_default &pinctrl_pwm5_default
>> +                        &pinctrl_pwm6_default &pinctrl_pwm7_default>;
> 
> The rest looks okay.
> 
> Cheers,
> 
> Joel
>
Joel Stanley Nov. 13, 2017, 11:43 p.m. | #4
On Tue, Nov 14, 2017 at 4:16 AM, James Feist
<james.feist@linux.intel.com> wrote:
> On 11/12/2017 11:36 PM, Joel Stanley wrote:
>>
>> This is the same as aspeed-bmc-opp-flash-layout.dtsi. Is there any
>> reason we can't reuse that file?
>>
>
> We could, however it seems a bit awkward to have this platform lumped in
> with open power, as it is not an open power platform. Also if we decide to
> modify the flash layout then this would have to be done anyways. I am fine
> either way, it just seemed to make more sense having them separate. Another
> alternative would be to rename aspeed-bmc-opp-flash-layout.dtsi to something
> more openbmc related instead of openpower.

I'd be happy to accept a patch that renames it. I was never a fan of
the opp string in the device tree files; it's namespacing that
upstream dts and dtsi tend not to have.

Cheers,

Joel
James Feist Nov. 14, 2017, 12:02 a.m. | #5
On 11/13/2017 03:43 PM, Joel Stanley wrote:
> On Tue, Nov 14, 2017 at 4:16 AM, James Feist
> <james.feist@linux.intel.com> wrote:
>> On 11/12/2017 11:36 PM, Joel Stanley wrote:
>>>
>>> This is the same as aspeed-bmc-opp-flash-layout.dtsi. Is there any
>>> reason we can't reuse that file?
>>>
>>
>> We could, however it seems a bit awkward to have this platform lumped in
>> with open power, as it is not an open power platform. Also if we decide to
>> modify the flash layout then this would have to be done anyways. I am fine
>> either way, it just seemed to make more sense having them separate. Another
>> alternative would be to rename aspeed-bmc-opp-flash-layout.dtsi to something
>> more openbmc related instead of openpower.
> 
> I'd be happy to accept a patch that renames it. I was never a fan of
> the opp string in the device tree files; it's namespacing that
> upstream dts and dtsi tend not to have.
> 
> Cheers,
> 
> Joel
> 
Does aspeed-bmc-phosphor-flash-layout.dtsi sound reasonable?

Thanks,

James
Joel Stanley Nov. 14, 2017, 1:06 a.m. | #6
On Tue, Nov 14, 2017 at 10:32 AM, James Feist
<james.feist@linux.intel.com> wrote:
> On 11/13/2017 03:43 PM, Joel Stanley wrote:
>>
>> On Tue, Nov 14, 2017 at 4:16 AM, James Feist
>> <james.feist@linux.intel.com> wrote:
>>>
>>> On 11/12/2017 11:36 PM, Joel Stanley wrote:
>>>>
>>>>
>>>> This is the same as aspeed-bmc-opp-flash-layout.dtsi. Is there any
>>>> reason we can't reuse that file?
>>>>
>>>
>>> We could, however it seems a bit awkward to have this platform lumped in
>>> with open power, as it is not an open power platform. Also if we decide
>>> to
>>> modify the flash layout then this would have to be done anyways. I am
>>> fine
>>> either way, it just seemed to make more sense having them separate.
>>> Another
>>> alternative would be to rename aspeed-bmc-opp-flash-layout.dtsi to
>>> something
>>> more openbmc related instead of openpower.
>>
>>
>> I'd be happy to accept a patch that renames it. I was never a fan of
>> the opp string in the device tree files; it's namespacing that
>> upstream dts and dtsi tend not to have.
>>
> Does aspeed-bmc-phosphor-flash-layout.dtsi sound reasonable?

It's a bit verbose. How about openbmc-flash-layout.dtsi ?

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 6d6c9eb..987e23e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -992,6 +992,7 @@  dtb-$(CONFIG_ARCH_ASPEED) += 
aspeed-bmc-opp-palmetto.dtb \
  	aspeed-bmc-opp-lanyang.dtb \
  	aspeed-bmc-mellanox-msn.dtb \
  	aspeed-bmc-quanta-q71l.dtb \
+	aspeed-bmc-intel-wfp.dtb \
  	aspeed-ast2500-evb.dtb
  endif
  diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi 
b/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
new file mode 100644
index 0000000..4bcfd1b
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-intel-flash-layout.dtsi
@@ -0,0 +1,26 @@ 
+		label = "bmc";
+		partitions {
+				#address-cells = < 1 >;
+				#size-cells = < 1 >;
+				compatible = "fixed-partitions";
+				u-boot@0 {
+					reg = < 0 0x60000 >;
+					label = "u-boot";
+				};
+				u-boot-env@60000 {
+					reg = < 0x60000 0x20000 >;
+					label = "u-boot-env";
+				};
+				kernel@80000 {
+					reg = < 0x80000 0x440000 >;
+					label = "kernel";
+				};
+				rofs@0c0000 {
+					reg = < 0x4c0000 0x1740000 >;
+					label = "rofs";
+				};
+				rwfs@1c00000 {
+					reg = < 0x1c00000 0x400000 >;
+					label = "rwfs";
+				};
+		};
diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts 
b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
new file mode 100644
index 0000000..2b4f095
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
@@ -0,0 +1,117 @@ 
+/dts-v1/;
+
+#include "aspeed-g5.dtsi"
+
+/ {
+	model = "WFP BMC";
+	compatible = "intel,wfp-bmc", "aspeed,ast2500";
+
+	aliases {
+		serial4 = &uart5;
+	};
+
+	chosen {
+		stdout-path = &uart5;
+		bootargs = "console=ttyS4,115200 earlyprintk";
+	};
+
+	memory {
+		reg = <0x80000000 0x20000000>;
+	};
+
+	iio-hwmon {
+		compatible = "iio-hwmon";
+		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
+			<&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>,
+			<&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,
+			<&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>;
+	};
+
+};
+
+&fmc {
+	status = "okay";
+	flash@0 {
+		status = "okay";
+#include "aspeed-bmc-intel-flash-layout.dtsi"
+	};
+};
+
+&spi1 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spi1_default>;
+
+	flash@0 {
+		status = "okay";
+		label = "pnor";
+	};
+};
+
+&uart5 {
+	status = "okay";
+};
+
+&mac0 {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
+	use-ncsi;
+};
+
+&mac1 {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&i2c2 {
+	status = "okay";
+};
+
+&i2c3 {
+	status = "okay";
+};
+
+&i2c4 {
+	status = "okay";
+};
+
+&i2c5 {
+	status = "okay";
+};
+
+&i2c6 {
+	status = "okay";
+};
+
+&i2c7 {
+	status = "okay";
+};
+
+&i2c13 {
+	status = "okay";
+};
+
+&gfx {
+	status = "okay";
+};
+
+&pinctrl {
+	aspeed,external-nodes = <&gfx &lhc>;
+};
+
+&pwm_tacho {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default
+			 &pinctrl_pwm2_default &pinctrl_pwm3_default
+			 &pinctrl_pwm4_default &pinctrl_pwm5_default
+			 &pinctrl_pwm6_default &pinctrl_pwm7_default>;
+};