Skip to contentSkip to conversation

ARM: dts: aspeed: Add Portwell Neptune machine

PATCH Joel Stanley 2 participants 2 messages Mar 13, 2018 – Mar 15, 2018 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 3 lines · Amithash Prasad

Initial introduction of Portwell Neptune family equipped with Aspeed 2500 BMC SoC. This adds the neptune platform device tree file including the flash layout used by the neptune machines.

I like to have a sentence about the machine it's in. Something like:

Neptune is a x86 server development kit with a ASPEED ast2500 BMC manufactured by Portwell.

Or whatever you think sounds good :)

The device tree looks good; I've made a few comments below and I've cc'd Andrew to get a review of the pinctrl parts.

Quoted 75 lines
---
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts  | 145 +++++++++++++++++++++
 3 files changed, 147 insertions(+)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
index 84601d8..9dbbe7d 100644
@@ -228,6 +228,7 @@ pine64      Pine64
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
+portwell       Portwell Inc.
 powervr        PowerVR (deprecated, use img)
 pulsedlight    PulsedLight, Inc
 qca    Qualcomm Atheros, Inc.
arch/arm/boot/dts/Makefile +1 -0
index 7c54fc8..044b960 100644
@@ -993,6 +993,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \
        aspeed-bmc-mellanox-msn.dtb \
        aspeed-bmc-quanta-q71l.dtb \
        aspeed-bmc-intel-s2600wf.dtb \
+       aspeed-bmc-portwell-neptune.dtb \
        aspeed-ast2500-evb.dtb
 endif
 
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts new file +36 -0
new file mode 100644
index 0000000..542a4cad
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2017 Facebook Inc.
+/dts-v1/;
+
+#include "aspeed-g5.dtsi"
+#include <dt-bindings/gpio/aspeed-gpio.h>
+
+/ {
+       model = "Portwell Neptune BMC";
+       compatible = "portwell,neptune-bmc", "aspeed,ast2500";
+       aliases {
+               serial0 = &uart1;
+               serial4 = &uart5;
+       };
+       chosen {
+               stdout-path = &uart5;
+               bootargs = "console=ttyS4,115200 earlyprintk";
+       };
+
+       memory {
+               reg = <0x80000000 0x20000000>;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               postcode0 {
+                       label="BMC_UP";
+                       gpios = <&gpio ASPEED_GPIO(H, 0) GPIO_ACTIVE_HIGH>;
+                       default-state = "on";
+               };
+               postcode1 {
+                       label="BMC_HB";
+                       gpios = <&gpio ASPEED_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+               };
+               postcode2 {

arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts line 46

Quoted 10 lines
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts new file +10 -0
+                       label="FAULT";
+                       gpios = <&gpio ASPEED_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
+               };
+               // postcode3-7 are GPIOH3-H7
+       };
+};
+
+&wdt2 {
+       status = "okay";
+};

We can drop this; the upstream dts now enables wdt1 and wdt2 by default.

Quoted 14 lines
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts new file +14 -0
+
+&fmc {
+       status = "okay";
+       flash@0 {
+               status = "okay";
+               m25p,fast-read;
+#include "openbmc-flash-layout.dtsi"
+       };
+};
+
+&spi1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_spi1_default>;

arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts line 70

Quoted 10 lines
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts new file +10 -0
+       flash@0 {
+               status = "okay";
+               m25p,fast-read;
+               label = "pnor";
+       };
+};
+
+&uart1 {
+       // Host Console
+       status = "okay";

I think you need the pinctrl nodes for this. Andrew J can provide more detail.

Quoted 78 lines
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts new file +75 -1
+};
+
+&uart5 {
+       // BMC Console
+       status = "okay";
+};
+
+&mac0 {
+       status = "okay";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_rmii1_default>;
+       use-ncsi;
+};
+
+&i2c3 {
+       status = "okay";
+       // SMBus to COMe AB
+};
+
+&i2c4 {
+       status = "okay";
+       // I2C to COMe AB
+};
+
+&i2c5 {
+       status = "okay";
+       pca9555@4e {
+               compatible = "nxp,pca9555";
+               pinctrl-names = "default";
+               gpio-controller;
+               #gpio-cells = <2>;
+               reg = <0x27>;
+       };
+};
+
+&i2c6 {
+       status = "okay";
+       tpm@20 {
+               compatible = "infineon,slb9645tt";
+               reg = <0x20>;
+       };
+       tmp421@9c {
+               compatible = "ti,tmp421";
+               reg = <0x4e>;
+       };
+       tmp421@9e {
+               compatible = "ti,tmp421";
+               reg = <0x4f>;
+       };
+};
+
+&i2c8 {
+       status = "okay";
+       eeprom@a2 {
+               compatible = "atmel,24c128";
+               reg = <0x51>;
+               pagesize = <0x32>;
+       };
+};
+
+&pwm_tacho {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default>;
+       fan@0 {
+               reg = <0x00>;
+               aspeed,fan-tach-ch = /bits/ 8 <0x00>;
+       };
+
+       fan@1 {
+               reg = <0x01>;
+               aspeed,fan-tach-ch = /bits/ 8 <0x01>;
+       };
+};
--

2.9.5

#2 lore raw
Quoted 3 lines

I like to have a sentence about the machine it's in. Something like:
Neptune is a x86 server development kit with a ASPEED ast2500 BMC
manufactured by Portwell.

Roger that! Will send out an update with more information.

Quoted 5 lines

Review

Quoted 4 lines

+&wdt2 {

(quoted diff) +2 -0
+       status = "okay";
+};    

We can drop this; the upstream dts now enables wdt1 and wdt2 by default.

I notice that 4.13 has this but 4.10 does not. How about have this for The 4.10 branch (Since the openbmc distro defaults to 4.10) and the cherry-pick to 4.13 (the upstream candidate) should drop it.

Quoted 5 lines

Review

Quoted 4 lines

+&uart1 {

(quoted diff) +2 -0
+       // Host Console
+       status = "okay";

I think you need the pinctrl nodes for this. Andrew J can provide more detail.

Thanks! Yes, I seem to be missing
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_txd1_default
+ &pinctrl_rxd1_default>;
(From inspecting the schematic, there seems to be just two pins hooked up). I will include this in V2.