From patchwork Mon Dec 11 05:07:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121331 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2372182qgn; Sun, 10 Dec 2017 21:11:21 -0800 (PST) X-Google-Smtp-Source: AGs4zMb1Y+QNZ4bM03JuZxqmfmuvthQh8T9Xff3W4pbJrwdbXVL/mWGO7feCdqhRaCo9K6scDLWp X-Received: by 10.99.167.69 with SMTP id w5mr35024736pgo.344.1512969081400; Sun, 10 Dec 2017 21:11:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512969081; cv=none; d=google.com; s=arc-20160816; b=KAOqhF1Mpi3rMZ664P5h6UK1wzTzbI5AxlRAE60fJncH2ohs62KckqJrr0YPqqnUe6 V66MR2ADcCPmvWKHRkcRTQyowI6XMHEblJFdIxVqCIgHaenBGCl4PNjwnOZb79UKPzgK Y0cTPgqtl2lv1bK2KZtAXmJc7h4Jgu+cKttkQVkyOrQIjdFG5IaVJKofPcSJIKmoMgV4 FKJ/i/0F3AbcWssgQ0G6TABeFkfVIlnM6PH0+fXx1H3KXbN+HP+QD2LL8BveS8W1RbB6 jyibMf3V928vt6NYzrkdzEBWFnHxwKKx9FmAYLfi0/vnLTFGREB7bnn7uO3nDAi7wor+ a7wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=+QkFlCFIdaxwnptOywHnbryDwk59l1aiXJplXTrKjd4=; b=LqMyAv9QJGghBvTME2txfY6OXHXeI8XQ2XBp9XuSYqpI00pZOAWKjFLDO8NWq04wmV 2bejNWc9bZQm8MQDr1CyqqneTVJ/HLGdM0kXicucwT6VYKaDdsMGsRHxZGE+nfDaVtzH Y8v/MFdVT1uDWN7TYVRJ9ycDXRst6qJnp3HLQF6M0BWLFUULv+EIfEUtVegn2MQi/xtI VBLjMybAwPoIlnS6B082zi4Bmg7RVsBjmrbvYROCDzQCJw551z2kS3pdGn1PgLBA0i5X cNVgp1aKjRB2lsOLBxwuvA8ZGVz9ijW415q5ES2ZJyEFWufrPMGT2MeehL0o1Bb7IAdo uKSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=GyhCaqVJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e1si9379780pld.493.2017.12.10.21.11.21; Sun, 10 Dec 2017 21:11:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=GyhCaqVJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752805AbdLKFLT (ORCPT + 24 others); Mon, 11 Dec 2017 00:11:19 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33611 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752522AbdLKFLP (ORCPT ); Mon, 11 Dec 2017 00:11:15 -0500 Received: by mail-pg0-f67.google.com with SMTP id g7so10167480pgs.0; Sun, 10 Dec 2017 21:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+QkFlCFIdaxwnptOywHnbryDwk59l1aiXJplXTrKjd4=; b=GyhCaqVJGk3DLCF+CirsidvXNdfWNbi+0pQxyYc12eb8lmSMxU9urSLGCH+AoxTJW2 6BtdzgCSSb6hsN2qgEwrwjyY1vMNATgSGCIA59LRotLXPxIBQYcbrosr1mqYCMODbikC O/YMRtjSVft1j2/Sh6RPkrvPjqFCRRalY09z34gZX48ykvdfqKNKgLTCcd1xyH3cBJ// r4+7zcAKGxWz2/DdUsYnNsQ/tKjRXRd/44Ktik07n/ORZyiSplr4ALS9O3KXpHfeWVE1 CY+I9uo6ectdHSIh3P7zSpvcRfHuI8nuEGi78IWPymlHYw3TmjmIvfH1Zb7SJIu4pIDa KlfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+QkFlCFIdaxwnptOywHnbryDwk59l1aiXJplXTrKjd4=; b=i0Ji0hpA5vtZrt5Hgmx7QXNtJcSoZaXhpDYztaE/YOq5IQo1u6q7HWn8AkPwcbNblz Ci0S5S8uSbLnYzJo9e8iISZdhto9O5D6qIzuzD+bs3xnblvWdwoYAIpLovIb0xxjFyv0 LxL2uAKtqf7iZX8oLtCyLuaG285qEuxWEu/p5xub2ZiCb09OmHFYig0HSzZCAY25dIvg 8EFwpn4HDfLmLV0o8FBZ8NjnGwCs/UF2j7lgQ01O904da20ZjbZ+rlCBhrlBncynMWxW L+hmyRmjrrLwwxALnbXvbjt2uncjVnbBZj1SbR14FK04Trx57hxEsIgiJB8Sr5d7yGBS 2kQg== X-Gm-Message-State: AJaThX7jxMm8AwvU1dh37vmucE4+WAGBCU889My6bxS3VUtTPSY8XVME ncsyBoxcmZyGNNdYPBYwUbk= X-Received: by 10.99.127.14 with SMTP id a14mr38464154pgd.315.1512969074373; Sun, 10 Dec 2017 21:11:14 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id h69sm24066476pfk.166.2017.12.10.21.11.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:11:13 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:41:05 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH 19/20] ARM: dts: aspeed-romulus: Update Romulus system Date: Mon, 11 Dec 2017 15:37:03 +1030 Message-Id: <20171211050704.20621-20-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171211050704.20621-1-joel@jms.id.au> References: <20171211050704.20621-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - 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 | 155 +++++++++++++++++++++++++-- 1 file changed, 149 insertions(+), 6 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index 8067793129ea..bfdf643584df 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0+ /dts-v1/; #include "aspeed-g5.dtsi" @@ -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; }; }; @@ -38,6 +101,7 @@ status = "okay"; m25p,fast-read; label = "bmc"; +#include "openbmc-flash-layout.dtsi" }; }; @@ -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>; + }; +};