From patchwork Wed Dec 20 03:23:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122443 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5025745qgn; Tue, 19 Dec 2017 19:27:17 -0800 (PST) X-Google-Smtp-Source: ACJfBos4nVLLc6Ra6UwZi+DuYBfv/VKX3jZZTViS/XjkyBXMzbM13xRq+wwSEOnc3d++g3vxrz/k X-Received: by 10.98.155.22 with SMTP id r22mr5331849pfd.96.1513740437181; Tue, 19 Dec 2017 19:27:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513740437; cv=none; d=google.com; s=arc-20160816; b=bmSyOy+9xXr2odnZbN2xRYfI0LZ683u4KOAuZeORsNV7VI2ezKsZaRMj8pRs4/AsN/ gNo8Hd/bY2mPyvgSgaIrkLNfvYuXDCk3Gqc5Bd9/J8g4aYWelJ5YOV045C+SdamnjPvp MQPAYCixGgePCYPI0GuIcW4jer71dEfkdfCcUw6zYBzhahM5bR1djODR9XW6quPqViva At09WKIiIBs8fE+aG3k911+vkCxIYQTWGUlrPDFJcWZPF4F6ezYjUupgzVw/7TmmSwv5 bknpw6sIlKGZRJOPoBDIzTKmHv3iUy6c77+r65ANXGNCfeZ8YFNlJIyQs6UgSu9yXPbO W96w== 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=EeEtCmuQLVUYH7TlIJo+r6l3rzR/heGrBkWklEqtYaQ=; b=KDM45X3ewI6zGKZHtHrodiyRiFwa8kmotyEmsHO2Jyq36eWf7eSKYcf/s21dnZ+I0Q T9e+3YWuQzIB/PswtChXZIfSMNUm8H5tFN2lt17V3M20L9d45pHtbTPDiwdByKfiTf0X i5Rqnw4jo/wHtVh4cFmntp+Zu6xtzoRUKhUPipxaf5Fn8RGyZS1+rWkOe5FJ3+ASXve2 XbhMTtgOAEP7J+Q019hU2JUdBR89X6lE6f9/jUXmM4KXNvhxOAro434Dr/Nj6NDhfsaT v70ipNgQbA4zOYlrmi/bFL7nEZvy0qegPTCJ8AW2i9X8b1KWDv4/LgkEpT6LqYOvuS8B xoIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=VlERFfsw; 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 d31si6532599pld.193.2017.12.19.19.27.16; Tue, 19 Dec 2017 19:27:17 -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=VlERFfsw; 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 S1754577AbdLTD1O (ORCPT + 28 others); Tue, 19 Dec 2017 22:27:14 -0500 Received: from mail-pl0-f66.google.com ([209.85.160.66]:34043 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753680AbdLTD1H (ORCPT ); Tue, 19 Dec 2017 22:27:07 -0500 Received: by mail-pl0-f66.google.com with SMTP id d21so8250983pll.1; Tue, 19 Dec 2017 19:27:07 -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=EeEtCmuQLVUYH7TlIJo+r6l3rzR/heGrBkWklEqtYaQ=; b=VlERFfswD5zv9zE066XWWMlqjYW2vyzvneGrZVE3V+5dd6qUYaC8pJBxO1WO2uHJEW VfCL17ttgycn4luRN4GIJkTM2w30IvoCOXP8wxG/v+9mr6Ax9W/7B+ZIcL6QVLT59uUQ cTqzeKdWLL2yzZgzM83Qxbphe58nKyV632Qxk7QLv+WO4FgxxdlSDWcfRl7n4UVkVKWG UuYV0FwmhxjTi2xDsIPqOZVMs7Lk7rRaRpc+1WnglpI0iHK4JMrAE4ZlxWMXgrxXAozP yVgeo68jPIFO4WM42CN3OfATBnrmbmFpPfqtH66nGDW0IPtg+2S0W7c7OzC14Nm8yvt/ xA1w== 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=EeEtCmuQLVUYH7TlIJo+r6l3rzR/heGrBkWklEqtYaQ=; b=hB5QKq9d+wPmLho+GYoJeOZttMX+hnYQBaewYRxhbiA1koakYo7fNKXsZZAbLITbtI ZhLZ/1iodbK+Z95+YPyEcVmzUqG0/tA8tE7NrPtd1JmdHUZ2wsdCdmPHfSLpCqJSkK7P IP0dYP/l6MZiDlGxDRhvRj23h4B1M3Y7t41D77UzkwoiYyZL0f5zo/jCL6e0xJsx5DTP Z4XJa+6h8TJcjGgP2Qr5c0+Hb2YOEAP0Lkf9nPK91HHLp+OdfAECQdabm4jVVGz+IRYU T65H5scEZmspZAv7N0MOAZ9Dc53/tyWlLYAKjD4/hrGpUNhCqLUKhClUxZfWwELVqUPA Yfbw== X-Gm-Message-State: AKGB3mIvFjzZBiDbIUlp4pY+Rn8sz8jjqGrUyUxahH/9wC2dNUmTVv2P HY3JXb03HXxXfggyUglEepw= X-Received: by 10.159.198.10 with SMTP id f10mr5382337plo.356.1513740427082; Tue, 19 Dec 2017 19:27:07 -0800 (PST) Received: from aurora.jms.id.au ([45.124.203.15]) by smtp.gmail.com with ESMTPSA id 77sm32295307pfh.43.2017.12.19.19.26.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2017 19:27:06 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 20 Dec 2017 13:56:56 +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 v3 18/20] ARM: dts: aspeed-romulus: Update Romulus system Date: Wed, 20 Dec 2017 13:53:26 +1030 Message-Id: <20171220032328.30584-19-joel@jms.id.au> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171220032328.30584-1-joel@jms.id.au> References: <20171220032328.30584-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 --- 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(-) -- 2.15.1 Reviewed-by: Cédric Le Goater 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>; + }; +};