From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754622AbdLTIB0 (ORCPT ); Wed, 20 Dec 2017 03:01:26 -0500 Received: from 3.mo177.mail-out.ovh.net ([46.105.36.172]:43559 "EHLO 3.mo177.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753917AbdLTIBX (ORCPT ); Wed, 20 Dec 2017 03:01:23 -0500 X-Greylist: delayed 4610 seconds by postgrey-1.27 at vger.kernel.org; Wed, 20 Dec 2017 03:01:22 EST Subject: Re: [PATCH v3 18/20] 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: <20171220032328.30584-1-joel@jms.id.au> <20171220032328.30584-19-joel@jms.id.au> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <7b5e578b-3f83-1bad-df27-68071105edf0@kaod.org> Date: Wed, 20 Dec 2017 07:44:12 +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: <20171220032328.30584-19-joel@jms.id.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 490047934999989101 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtuddrgeefgddutddtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/20/2017 04:23 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 Reviewed-by: Cédric Le Goater > --- > v3: > - Add GPIO include > - Fix duplicate fmc and spi nodes > - Add unit name for memory node to fix warning > --- > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 133 +++++++++++++++++++++++++-- > 1 file changed, 126 insertions(+), 7 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..623b6ab42021 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > @@ -1,23 +1,19 @@ > // SPDX-License-Identifier: GPL-2.0+ > /dts-v1/; > - > #include "aspeed-g5.dtsi" > +#include > > / { > 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>; > + memory@80000000 { > + reg = <0x80000000 0x20000000>; > }; > > reserved-memory { > @@ -29,6 +25,49 @@ > 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 = ; > + }; > }; > }; > > @@ -38,6 +77,7 @@ > status = "okay"; > m25p,fast-read; > label = "bmc"; > +#include "openbmc-flash-layout.dtsi" > }; > }; > > @@ -53,6 +93,12 @@ > }; > }; > > +&lpc_ctrl { > + status = "okay"; > + memory-region = <&flash_memory>; > + flash = <&spi1>; > +}; > + > &uart1 { > /* Rear RS-232 connector */ > status = "okay"; > @@ -81,6 +127,10 @@ > pinctrl-0 = <&pinctrl_rmii1_default>; > }; > > +&i2c1 { > + status = "okay"; > +}; > + > &i2c2 { > status = "okay"; > }; > @@ -133,8 +183,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>; > + }; > +}; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Subject: Re: [PATCH v3 18/20] ARM: dts: aspeed-romulus: Update Romulus system Date: Wed, 20 Dec 2017 07:44:12 +0100 Message-ID: <7b5e578b-3f83-1bad-df27-68071105edf0@kaod.org> References: <20171220032328.30584-1-joel@jms.id.au> <20171220032328.30584-19-joel@jms.id.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171220032328.30584-19-joel@jms.id.au> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Joel Stanley , Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, Jeremy Kerr , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org T24gMTIvMjAvMjAxNyAwNDoyMyBBTSwgSm9lbCBTdGFubGV5IHdyb3RlOgo+ICAtIEZpeCBpbmNv cnJlY3QgUkFNIHNpemUKPiAgLSBSZW1vdmUgYWxpYXM7IHRoZXNlIGFyZSBub3cgc3BlY2lmaWVk IGluIHRoZSBkdHNpCj4gIC0gQWRkIG5ld2x5IHVwc3RyZWFtZWQgZGV2aWNlcwo+ICAtIEluY2x1 ZGUgT3BlbkJNQyBmbGFzaCBsYXlvdXQKPiAKPiBTaWduZWQtb2ZmLWJ5OiBKb2VsIFN0YW5sZXkg PGpvZWxAam1zLmlkLmF1PgoKUmV2aWV3ZWQtYnk6IEPDqWRyaWMgTGUgR29hdGVyIDxjbGdAa2Fv ZC5vcmc+Cgo+IC0tLQo+ICB2MzoKPiAgIC0gQWRkIEdQSU8gaW5jbHVkZQo+ICAgLSBGaXggZHVw bGljYXRlIGZtYyBhbmQgc3BpIG5vZGVzCj4gICAtIEFkZCB1bml0IG5hbWUgZm9yIG1lbW9yeSBu b2RlIHRvIGZpeCB3YXJuaW5nCj4gLS0tCj4gIGFyY2gvYXJtL2Jvb3QvZHRzL2FzcGVlZC1ibWMt b3BwLXJvbXVsdXMuZHRzIHwgMTMzICsrKysrKysrKysrKysrKysrKysrKysrKystLQo+ICAxIGZp bGUgY2hhbmdlZCwgMTI2IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAt LWdpdCBhL2FyY2gvYXJtL2Jvb3QvZHRzL2FzcGVlZC1ibWMtb3BwLXJvbXVsdXMuZHRzIGIvYXJj aC9hcm0vYm9vdC9kdHMvYXNwZWVkLWJtYy1vcHAtcm9tdWx1cy5kdHMKPiBpbmRleCBhN2E5Mzg2 Zjk2NGQuLjYyM2I2YWI0MjAyMSAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9ib290L2R0cy9hc3Bl ZWQtYm1jLW9wcC1yb211bHVzLmR0cwo+ICsrKyBiL2FyY2gvYXJtL2Jvb3QvZHRzL2FzcGVlZC1i bWMtb3BwLXJvbXVsdXMuZHRzCj4gQEAgLTEsMjMgKzEsMTkgQEAKPiAgLy8gU1BEWC1MaWNlbnNl LUlkZW50aWZpZXI6IEdQTC0yLjArCj4gIC9kdHMtdjEvOwo+IC0KPiAgI2luY2x1ZGUgImFzcGVl ZC1nNS5kdHNpIgo+ICsjaW5jbHVkZSA8ZHQtYmluZGluZ3MvZ3Bpby9hc3BlZWQtZ3Bpby5oPgo+ ICAKPiAgLyB7Cj4gIAltb2RlbCA9ICJSb211bHVzIEJNQyI7Cj4gIAljb21wYXRpYmxlID0gImli bSxyb211bHVzLWJtYyIsICJhc3BlZWQsYXN0MjUwMCI7Cj4gIAo+IC0JYWxpYXNlcyB7Cj4gLQkJ c2VyaWFsNCA9ICZ1YXJ0NTsKPiAtCX07Cj4gLQo+ICAJY2hvc2VuIHsKPiAgCQlzdGRvdXQtcGF0 aCA9ICZ1YXJ0NTsKPiAgCQlib290YXJncyA9ICJjb25zb2xlPXR0eVM0LDExNTIwMCBlYXJseXBy aW50ayI7Cj4gIAl9Owo+ICAKPiAtCW1lbW9yeSB7Cj4gLQkJcmVnID0gPDB4ODAwMDAwMDAgMHg0 MDAwMDAwMD47Cj4gKwltZW1vcnlAODAwMDAwMDAgewo+ICsJCXJlZyA9IDwweDgwMDAwMDAwIDB4 MjAwMDAwMDA+Owo+ICAJfTsKPiAgCj4gIAlyZXNlcnZlZC1tZW1vcnkgewo+IEBAIC0yOSw2ICsy NSw0OSBAQAo+ICAJCQluby1tYXA7Cj4gIAkJCXJlZyA9IDwweGJmMDAwMDAwIDB4MDEwMDAwMDA+ OyAvKiAxNk0gKi8KPiAgCQl9Owo+ICsKPiArCQlmbGFzaF9tZW1vcnk6IHJlZ2lvbkA5ODAwMDAw MCB7Cj4gKwkJCW5vLW1hcDsKPiArCQkJcmVnID0gPDB4OTgwMDAwMDAgMHgwNDAwMDAwMD47IC8q IDY0TSAqLwo+ICsJCX07Cj4gKwl9Owo+ICsKPiArCWxlZHMgewo+ICsJCWNvbXBhdGlibGUgPSAi Z3Bpby1sZWRzIjsKPiArCj4gKwkJZmF1bHQgewo+ICsJCQlncGlvcyA9IDwmZ3BpbyBBU1BFRURf R1BJTyhOLCAyKSBHUElPX0FDVElWRV9MT1c+Owo+ICsJCX07Cj4gKwo+ICsJCWlkZW50aWZ5IHsK PiArCQkJZ3Bpb3MgPSA8JmdwaW8gQVNQRUVEX0dQSU8oTiwgNCkgR1BJT19BQ1RJVkVfSElHSD47 Cj4gKwkJfTsKPiArCj4gKwkJcG93ZXIgewo+ICsJCQlncGlvcyA9IDwmZ3BpbyBBU1BFRURfR1BJ TyhSLCA1KSBHUElPX0FDVElWRV9MT1c+Owo+ICsJCX07Cj4gKwl9Owo+ICsKPiArCWZzaTogZ3Bp by1mc2kgewo+ICsJCWNvbXBhdGlibGUgPSAiZnNpLW1hc3Rlci1ncGlvIiwgImZzaS1tYXN0ZXIi Owo+ICsJCSNhZGRyZXNzLWNlbGxzID0gPDI+Owo+ICsJCSNzaXplLWNlbGxzID0gPDA+Owo+ICsK PiArCQljbG9jay1ncGlvcyA9IDwmZ3BpbyBBU1BFRURfR1BJTyhBQSwgMCkgR1BJT19BQ1RJVkVf SElHSD47Cj4gKwkJZGF0YS1ncGlvcyA9IDwmZ3BpbyBBU1BFRURfR1BJTyhBQSwgMikgR1BJT19B Q1RJVkVfSElHSD47Cj4gKwkJbXV4LWdwaW9zID0gPCZncGlvIEFTUEVFRF9HUElPKEEsIDYpIEdQ SU9fQUNUSVZFX0hJR0g+Owo+ICsJCWVuYWJsZS1ncGlvcyA9IDwmZ3BpbyBBU1BFRURfR1BJTyhE LCAwKSBHUElPX0FDVElWRV9ISUdIPjsKPiArCQl0cmFucy1ncGlvcyA9IDwmZ3BpbyBBU1BFRURf R1BJTyhSLCAyKSBHUElPX0FDVElWRV9ISUdIPjsKPiArCX07Cj4gKwo+ICsJZ3Bpby1rZXlzIHsK PiArCQljb21wYXRpYmxlID0gImdwaW8ta2V5cyI7Cj4gKwo+ICsJCWNoZWNrc3RvcCB7Cj4gKwkJ CWxhYmVsID0gImNoZWNrc3RvcCI7Cj4gKwkJCWdwaW9zID0gPCZncGlvIEFTUEVFRF9HUElPKEos IDIpIEdQSU9fQUNUSVZFX0xPVz47Cj4gKwkJCWxpbnV4LGNvZGUgPSA8QVNQRUVEX0dQSU8oSiwg Mik+Owo+ICsJCX07Cj4gIAl9Owo+ICB9Owo+ICAKPiBAQCAtMzgsNiArNzcsNyBAQAo+ICAJCXN0 YXR1cyA9ICJva2F5IjsKPiAgCQltMjVwLGZhc3QtcmVhZDsKPiAgCQlsYWJlbCA9ICJibWMiOwo+ ICsjaW5jbHVkZSAib3BlbmJtYy1mbGFzaC1sYXlvdXQuZHRzaSIKPiAgCX07Cj4gIH07Cj4gIAo+ IEBAIC01Myw2ICs5MywxMiBAQAo+ICAJfTsKPiAgfTsKPiAgCj4gKyZscGNfY3RybCB7Cj4gKwlz dGF0dXMgPSAib2theSI7Cj4gKwltZW1vcnktcmVnaW9uID0gPCZmbGFzaF9tZW1vcnk+Owo+ICsJ Zmxhc2ggPSA8JnNwaTE+Owo+ICt9Owo+ICsKPiAgJnVhcnQxIHsKPiAgCS8qIFJlYXIgUlMtMjMy IGNvbm5lY3RvciAqLwo+ICAJc3RhdHVzID0gIm9rYXkiOwo+IEBAIC04MSw2ICsxMjcsMTAgQEAK PiAgCXBpbmN0cmwtMCA9IDwmcGluY3RybF9ybWlpMV9kZWZhdWx0PjsKPiAgfTsKPiAgCj4gKyZp MmMxIHsKPiArCXN0YXR1cyA9ICJva2F5IjsKPiArfTsKPiArCj4gICZpMmMyIHsKPiAgCXN0YXR1 cyA9ICJva2F5IjsKPiAgfTsKPiBAQCAtMTMzLDggKzE4Myw3NyBAQAo+ICAKPiAgJmkyYzEyIHsK PiAgCXN0YXR1cyA9ICJva2F5IjsKPiArCj4gKwltYXgzMTc4NUA1MiB7Cj4gKwkJY29tcGF0aWJs ZSA9ICJtYXhpbSxtYXgzMTc4NSI7Cj4gKwkJcmVnID0gPDB4NTI+Owo+ICsJfTsKPiArfTsKPiAr Cj4gKyZncGlvIHsKPiArCW5pY19mdW5jX21vZGUwIHsKPiArCQlncGlvLWhvZzsKPiArCQlncGlv cyA9IDxBU1BFRURfR1BJTyhELCAzKSBHUElPX0FDVElWRV9ISUdIPjsKPiArCQlvdXRwdXQtbG93 Owo+ICsJCWxpbmUtbmFtZSA9ICJuaWNfZnVuY19tb2RlMCI7Cj4gKwl9Owo+ICsJbmljX2Z1bmNf bW9kZTEgewo+ICsJCWdwaW8taG9nOwo+ICsJCWdwaW9zID0gPEFTUEVFRF9HUElPKEQsIDQpIEdQ SU9fQUNUSVZFX0hJR0g+Owo+ICsJCW91dHB1dC1sb3c7Cj4gKwkJbGluZS1uYW1lID0gIm5pY19m dW5jX21vZGUxIjsKPiArCX07Cj4gIH07Cj4gIAo+ICAmdnVhcnQgewo+ICAJc3RhdHVzID0gIm9r YXkiOwo+ICB9Owo+ICsKPiArJmdmeCB7Cj4gKwlzdGF0dXMgPSAib2theSI7Cj4gK307Cj4gKwo+ ICsmcGluY3RybCB7Cj4gKwlhc3BlZWQsZXh0ZXJuYWwtbm9kZXMgPSA8JmdmeCAmbGhjPjsKPiAr fTsKPiArCj4gKyZwd21fdGFjaG8gewo+ICsJc3RhdHVzID0gIm9rYXkiOwo+ICsJcGluY3RybC1u YW1lcyA9ICJkZWZhdWx0IjsKPiArCXBpbmN0cmwtMCA9IDwmcGluY3RybF9wd20wX2RlZmF1bHQg JnBpbmN0cmxfcHdtMV9kZWZhdWx0PjsKPiArCj4gKwlmYW5AMCB7Cj4gKwkJcmVnID0gPDB4MDA+ Owo+ICsJCWFzcGVlZCxmYW4tdGFjaC1jaCA9IC9iaXRzLyA4IDwweDA4PjsKPiArCX07Cj4gKwo+ ICsJZmFuQDEgewo+ICsJCXJlZyA9IDwweDAwPjsKPiArCQlhc3BlZWQsZmFuLXRhY2gtY2ggPSAv Yml0cy8gOCA8MHgwOT47Cj4gKwl9Owo+ICsKPiArCWZhbkAyIHsKPiArCQlyZWcgPSA8MHgwMT47 Cj4gKwkJYXNwZWVkLGZhbi10YWNoLWNoID0gL2JpdHMvIDggPDB4MGE+Owo+ICsJfTsKPiArCj4g KwlmYW5AMyB7Cj4gKwkJcmVnID0gPDB4MDE+Owo+ICsJCWFzcGVlZCxmYW4tdGFjaC1jaCA9IC9i aXRzLyA4IDwweDBiPjsKPiArCX07Cj4gKwo+ICsJZmFuQDQgewo+ICsJCXJlZyA9IDwweDAwPjsK PiArCQlhc3BlZWQsZmFuLXRhY2gtY2ggPSAvYml0cy8gOCA8MHgwYz47Cj4gKwl9Owo+ICsKPiAr CWZhbkA1IHsKPiArCQlyZWcgPSA8MHgwMD47Cj4gKwkJYXNwZWVkLGZhbi10YWNoLWNoID0gL2Jp dHMvIDggPDB4MGQ+Owo+ICsJfTsKPiArCj4gKwlmYW5ANiB7Cj4gKwkJcmVnID0gPDB4MDE+Owo+ ICsJCWFzcGVlZCxmYW4tdGFjaC1jaCA9IC9iaXRzLyA4IDwweDBlPjsKPiArCX07Cj4gK307Cj4g CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgt YXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQu b3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJt LWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: clg@kaod.org (=?UTF-8?Q?C=c3=a9dric_Le_Goater?=) Date: Wed, 20 Dec 2017 07:44:12 +0100 Subject: [PATCH v3 18/20] ARM: dts: aspeed-romulus: Update Romulus system In-Reply-To: <20171220032328.30584-19-joel@jms.id.au> References: <20171220032328.30584-1-joel@jms.id.au> <20171220032328.30584-19-joel@jms.id.au> Message-ID: <7b5e578b-3f83-1bad-df27-68071105edf0@kaod.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 12/20/2017 04:23 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 Reviewed-by: C?dric Le Goater > --- > v3: > - Add GPIO include > - Fix duplicate fmc and spi nodes > - Add unit name for memory node to fix warning > --- > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 133 +++++++++++++++++++++++++-- > 1 file changed, 126 insertions(+), 7 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..623b6ab42021 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > @@ -1,23 +1,19 @@ > // SPDX-License-Identifier: GPL-2.0+ > /dts-v1/; > - > #include "aspeed-g5.dtsi" > +#include > > / { > 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>; > + memory at 80000000 { > + reg = <0x80000000 0x20000000>; > }; > > reserved-memory { > @@ -29,6 +25,49 @@ > no-map; > reg = <0xbf000000 0x01000000>; /* 16M */ > }; > + > + flash_memory: region at 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 = ; > + }; > }; > }; > > @@ -38,6 +77,7 @@ > status = "okay"; > m25p,fast-read; > label = "bmc"; > +#include "openbmc-flash-layout.dtsi" > }; > }; > > @@ -53,6 +93,12 @@ > }; > }; > > +&lpc_ctrl { > + status = "okay"; > + memory-region = <&flash_memory>; > + flash = <&spi1>; > +}; > + > &uart1 { > /* Rear RS-232 connector */ > status = "okay"; > @@ -81,6 +127,10 @@ > pinctrl-0 = <&pinctrl_rmii1_default>; > }; > > +&i2c1 { > + status = "okay"; > +}; > + > &i2c2 { > status = "okay"; > }; > @@ -133,8 +183,77 @@ > > &i2c12 { > status = "okay"; > + > + max31785 at 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 at 0 { > + reg = <0x00>; > + aspeed,fan-tach-ch = /bits/ 8 <0x08>; > + }; > + > + fan at 1 { > + reg = <0x00>; > + aspeed,fan-tach-ch = /bits/ 8 <0x09>; > + }; > + > + fan at 2 { > + reg = <0x01>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0a>; > + }; > + > + fan at 3 { > + reg = <0x01>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0b>; > + }; > + > + fan at 4 { > + reg = <0x00>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0c>; > + }; > + > + fan at 5 { > + reg = <0x00>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0d>; > + }; > + > + fan at 6 { > + reg = <0x01>; > + aspeed,fan-tach-ch = /bits/ 8 <0x0e>; > + }; > +}; >