[linux,dev-4.10,v2,2/2] ARM: dts: Add Wfp BMC Machine

Message ID 1511897285-23022-2-git-send-email-james.feist@linux.intel.com
State Changes Requested, archived
Headers show
Series
  • [linux,dev-4.10,v2,1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi
Related show

Commit Message

Feist, James Nov. 28, 2017, 7:28 p.m.
Wfp is a Intel system with an Aspeed ast2500 BMC.

Signed-off-by: James Feist <james.feist@linux.intel.com>
---
Changes since V1:
 - Fix mac 0 pinctrl and use existing flash layout.
 - Add dependency.

 arch/arm/boot/dts/Makefile                 |   1 +
 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts | 117 +++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts

Comments

Joel Stanley Nov. 29, 2017, 9:20 a.m. | #1
On Wed, Nov 29, 2017 at 5:58 AM, James Feist
<james.feist@linux.intel.com> wrote:
> Wfp is a Intel system with an Aspeed ast2500 BMC.

Is WFP an acronym? It would be good to spell it out in the commit message.

Andrew, can you please review the bits of the device tree that you're
familiar with (mostly pinmux)?


> +
> +       chosen {
> +               stdout-path = &uart5;
> +               bootargs = "115200 earlyprintk";

I don't think 115200 will do anything. Can you explain your intent here?

> +       };
> +
> +       memory {
> +               reg = <0x80000000 0x20000000>;
> +       };

There's no reserved region for the VGA framebuffer, but you enable the
GFX node below.

With the openbmc u-boot tree the size of the memory is adjusted to
account for the framebuffer at the top of memory, but I was lead to
believe Intel machines use their own u-boot fork.

Cheers,

Joel
Feist, James Nov. 29, 2017, 4:59 p.m. | #2
On 11/29/2017 01:20 AM, Joel Stanley wrote:
> On Wed, Nov 29, 2017 at 5:58 AM, James Feist
> <james.feist@linux.intel.com> wrote:
>> Wfp is a Intel system with an Aspeed ast2500 BMC.
> 
> Is WFP an acronym? It would be good to spell it out in the commit message.
> 
It is not an acronym, it is a short name to describe current generation 
Intel boards.

> Andrew, can you please review the bits of the device tree that you're
> familiar with (mostly pinmux)?
> 
> 
>> +
>> +       chosen {
>> +               stdout-path = &uart5;
>> +               bootargs = "115200 earlyprintk";
> 
> I don't think 115200 will do anything. Can you explain your intent here?

Will delete.

> 
>> +       };
>> +
>> +       memory {
>> +               reg = <0x80000000 0x20000000>;
>> +       };
> 
> There's no reserved region for the VGA framebuffer, but you enable the
> GFX node below.
> 
> With the openbmc u-boot tree the size of the memory is adjusted to
> account for the framebuffer at the top of memory, but I was lead to
> believe Intel machines use their own u-boot fork.
> 
We don't use u-boot, but I will fix this.

> Cheers,
> 
> Joel
> 

Thanks,

James
Joel Stanley Dec. 8, 2017, 3:27 a.m. | #3
On Thu, Nov 30, 2017 at 3:29 AM, James Feist
<james.feist@linux.intel.com> wrote:
> On 11/29/2017 01:20 AM, Joel Stanley wrote:
>>
>> On Wed, Nov 29, 2017 at 5:58 AM, James Feist
>> <james.feist@linux.intel.com> wrote:
>>>
>>> Wfp is a Intel system with an Aspeed ast2500 BMC.
>>
>>
>> Is WFP an acronym? It would be good to spell it out in the commit message.
>>
> It is not an acronym, it is a short name to describe current generation
> Intel boards.

Okay. Can you please update the commit message with this information,
and the long name?

Cheers,

Joel

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-wfp.dts b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
new file mode 100644
index 0000000..f15a5e7
--- /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 = "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 "openbmc-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_rmii1_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>;
+};