From patchwork Fri Dec 15 06:24:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122062 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp74736qgn; Thu, 14 Dec 2017 22:28:19 -0800 (PST) X-Google-Smtp-Source: ACJfBotdhMMjuO378tj3tEQO4vea/nz37ShjjB7E7d8g702IVqHdpTGn/bPirm1t/rsLwEhRl+LF X-Received: by 10.98.215.19 with SMTP id b19mr12120786pfh.94.1513319299020; Thu, 14 Dec 2017 22:28:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319299; cv=none; d=google.com; s=arc-20160816; b=hMr3WI+mnu+PANhnyk5PjAPrZ/yabMtUp084M4AHj6OtZMEdrbdetdmxi4avtX+uSD 4XJQWTuQSw+7zd/U+6eQh6kHqaHzWgWVU68cUgAnfxeM6Jld1O6DPkmdpglgtG0kwO2w iUlZsvKJJERR/mhsTR7WUCZ4B9n+S40PaHzu4c9hHo7Zyj3UJ2r5kPAOhMvw4OZdcvr4 C1W47IlCSc1JqcmbMJ6+Hv1lvlSti5otSIfpx8vFX9kbD8KHHslOmQkWJG2uNYUxRHym SzKbOkdrEjTDM7l5auM+JTbPzeRmKPidTQ4wYJ/ASzBlEyxOVKJylj5uVLcr/AqZC+PQ Pkkw== 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=87LC8pRqpTStqzSkaeOrk2+xZJuKHQCoAl5xDWLEUBo=; b=dX50n2U8dCW1rBk1vDrsBKI7yJ5Vd3JWV5sxynsW2Wna5Ay3Xmndi1Jre4AeEUa0Vh KTPVjbKZKMT9Dd+o4WqwVlF0YyZOVvwALoJFhPAmGYBNiFkSAEECyIwG11Xira4QPzqC 4yQKYhSUd63PCSLtlA3EgAQ7qzp0MMUEVL2Jq5CCKEQsk/W9dj/kdow813FOBh6G5HgC gvxv8fBGFJ/xUFsR7TZWJ1OWKK0VRBPgII9F98dFSIIrpkQQ8nCPkGFOz6dpA0v7bfvJ 75EkUw00H0MyBk9eaEi5XwAib8vpfgn+h1yJKirfGnWLe3NByB0pkq/nKlSDLV6FTDRe 3Miw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=j7v8d8VU; 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 a3si3804902pgv.360.2017.12.14.22.28.18; Thu, 14 Dec 2017 22:28:19 -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=j7v8d8VU; 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 S1754662AbdLOG2O (ORCPT + 20 others); Fri, 15 Dec 2017 01:28:14 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:38648 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753700AbdLOG2J (ORCPT ); Fri, 15 Dec 2017 01:28:09 -0500 Received: by mail-pg0-f66.google.com with SMTP id f12so5173976pgo.5; Thu, 14 Dec 2017 22:28:09 -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=87LC8pRqpTStqzSkaeOrk2+xZJuKHQCoAl5xDWLEUBo=; b=j7v8d8VU872KcVNokAuD0KfAoHcsjUdWwKVYd3YtJoEy63Ki/Zwe4rfJhPCbVYEaCd ZQA1LxfhYndVlVHqGjIvur2Jhu6Ccyt7VimWdZ+eEnBjwnMf5So+MmLvGi1otahS/r15 rubsdhEa5/D3nXUMHH0apKB5Y2dc2e6F4shbw4/8o6u+HVZNkYLrzjG2fDe4lDKQEjqT lNgyjy0SVpjnCr0rG9qcrYzvl8FyZW2oeC1ByHkh/KcVqx+uDgCyr7vCjGmNLHh0HpEE KUZFzZNKGBlPg7v0ctYJu425qBYPhPryzRwjbl451r9OusZnj0KO6DTpmV1YCiC7iKMK LWpg== 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=87LC8pRqpTStqzSkaeOrk2+xZJuKHQCoAl5xDWLEUBo=; b=Kkl68qx3Rr3h992zlPSKV0ng2/gBKfrpPg5ZbY+NPAAXHEVueadlGD5D5ra+mQivwj /5cJDQdn+bdqOx+OiC0atMFbRHgWasCdIOT8xIwPW1CJIPyEjdV+GDFK3FiQRdz4006e pITxCvkp6aOAhXF4XtwFp9th3+Lz2bphmrgGVcD5g9bxAbvSTNJOSSl7JX6MJIQPvd5t jHCdprc8vb+3m33BFqacgO79ibEO6k7prVZhKwcPPlGn1twlKiluCSXbj2atXgcxMGgV lDGZUjwLddqjW5yefVdAlJX19w94w1NoHpQsxrPmuxTy2DLzFvl/CcRbxeaN9dtyDUwD j9nA== X-Gm-Message-State: AKGB3mJe99zdkkHFJLlA6JuBxXPajE+m+fyzOEM5I/d1XI+iK6opRuHt chpPCssOmOk5+ZJswpeoXqA= X-Received: by 10.101.89.78 with SMTP id g14mr10807361pgu.29.1513319288678; Thu, 14 Dec 2017 22:28:08 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id o88sm10601850pfj.175.2017.12.14.22.28.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:28:07 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:57:59 +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 v2 18/19] ARM: dts: aspeed-romulus: Update Romulus system Date: Fri, 15 Dec 2017 16:54:42 +1030 Message-Id: <20171215062443.23059-19-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-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 | 153 ++++++++++++++++++++++++++- 1 file changed, 148 insertions(+), 5 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 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; }; }; @@ -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>; + }; +};