Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758380AbdLRJdF (ORCPT ); Mon, 18 Dec 2017 04:33:05 -0500 Received: from 6.mo68.mail-out.ovh.net ([46.105.63.100]:57914 "EHLO 6.mo68.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758337AbdLRJcw (ORCPT ); Mon, 18 Dec 2017 04:32:52 -0500 Subject: Re: [PATCH v2 18/19] ARM: dts: aspeed-romulus: Update Romulus system To: Joel Stanley , Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org References: <20171215062443.23059-1-joel@jms.id.au> <20171215062443.23059-19-joel@jms.id.au> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: Date: Mon, 18 Dec 2017 10:32:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20171215062443.23059-19-joel@jms.id.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 10034582923375184749 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtuddrgedtgddthecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4570 Lines: 229 Some comments below, On 12/15/2017 07:24 AM, Joel Stanley wrote: > - Fix incorrect RAM size > - Remove alias; these are now specified in the dtsi > - Add newly upstreamed devices > - Include OpenBMC flash layout > > Signed-off-by: Joel Stanley > --- > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 153 ++++++++++++++++++++++++++- > 1 file changed, 148 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > index a7a9386f964d..bfdf643584df 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > @@ -7,17 +7,13 @@ > model = "Romulus BMC"; > compatible = "ibm,romulus-bmc", "aspeed,ast2500"; > > - aliases { > - serial4 = &uart5; > - }; > - > chosen { > stdout-path = &uart5; > bootargs = "console=ttyS4,115200 earlyprintk"; > }; > > memory { > - reg = <0x80000000 0x40000000>; > + reg = <0x80000000 0x20000000>; > }; > > reserved-memory { > @@ -29,6 +25,73 @@ > no-map; > reg = <0xbf000000 0x01000000>; /* 16M */ > }; > + > + flash_memory: region@98000000 { > + no-map; > + reg = <0x98000000 0x04000000>; /* 64M */ > + }; > + }; > + > + leds { > + compatible = "gpio-leds"; > + > + fault { > + gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>; > + }; > + > + identify { > + gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_HIGH>; > + }; > + > + power { > + gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>; > + }; > + }; > + > + fsi: gpio-fsi { > + compatible = "fsi-master-gpio", "fsi-master"; > + #address-cells = <2>; > + #size-cells = <0>; > + > + clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; > + data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>; > + mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; > + enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; > + trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>; > + }; > + > + gpio-keys { > + compatible = "gpio-keys"; > + > + checkstop { > + label = "checkstop"; > + gpios = <&gpio ASPEED_GPIO(J, 2) GPIO_ACTIVE_LOW>; > + linux,code = ; > + }; > + }; > +}; > + > +&fmc { > + status = "okay"; > + > + flash@0 { > + status = "okay"; > + label = "pnor"; > + m25p,fast-read; > +#include "openbmc-flash-layout.dtsi" > + }; > +}; > + > +&spi1 { > + status = "okay"; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_spi1_default>; > + > + flash@0 { > + status = "okay"; > + label = "pnor"; > + m25p,fast-read; > }; > }; hmm, the fmc and spi1 bindings were already added in commit 1142aea9ff9d. > @@ -38,6 +101,7 @@ > status = "okay"; > m25p,fast-read; > label = "bmc"; > +#include "openbmc-flash-layout.dtsi" This looks like an extra "fmc" node ? > }; > }; > > @@ -53,6 +117,12 @@ > }; > }; > > +&lpc_ctrl { > + status = "okay"; > + memory-region = <&flash_memory>; > + flash = <&spi1>; > +}; > + > &uart1 { > /* Rear RS-232 connector */ > status = "okay"; > @@ -81,6 +151,10 @@ > pinctrl-0 = <&pinctrl_rmii1_default>; > }; > > +&i2c1 { > + status = "okay"; > +}; > + > &i2c2 { > status = "okay"; > }; > @@ -133,8 +207,77 @@ > > &i2c12 { > status = "okay"; > + > + max31785@52 { > + compatible = "maxim,max31785"; > + reg = <0x52>; > + }; > +}; > + > +&gpio { > + nic_func_mode0 { > + gpio-hog; > + gpios = ; > + output-low; > + line-name = "nic_func_mode0"; > + }; > + nic_func_mode1 { > + gpio-hog; > + gpios = ; > + output-low; > + line-name = "nic_func_mode1"; > + }; > }; > > &vuart { > 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>; > + > + fan@0 { > + reg = <0x00>; > + aspeed,fan-tach-ch = /bits/ 8 <0x08>; > + }; > + > + fan@1 { > + reg = <0x00>; > + aspeed,fan-tach-ch = /bits/ 8 <0x09>; > + }; > + > + fan@2 { > + reg = <0x01>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0a>; > + }; > + > + fan@3 { > + reg = <0x01>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0b>; > + }; > + > + fan@4 { > + reg = <0x00>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0c>; > + }; > + > + fan@5 { > + reg = <0x00>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0d>; > + }; > + > + fan@6 { > + reg = <0x01>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0e>; > + }; > +}; >