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: 10124919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5B6736057F for ; Wed, 20 Dec 2017 03:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CDFD296BD for ; Wed, 20 Dec 2017 03:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 305F8296C1; Wed, 20 Dec 2017 03:43:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B23D4296BD for ; Wed, 20 Dec 2017 03:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=/6hhMn18WX8+a5VRIuTK+Bs9hRqUsJ2D5r448X+nylQ=; b=YxlmKcCT80CbcSYYcXq5HpAcJo /vZXPQXNWIWbTDkK3qwGrK0MYp37CeuDnl3DNJ82VPYWfKfcDy6MMi4Z3D2bmrOV/TXuFaOBWxD/L jlfAtLZ7aXBHKxmea0gTaxIxJ+mvVlGLk6HKf/O2C32sk3TFQ8+BS5ScLY25EHkGYLUPr/b1pPoa5 NNRw/1nGR8AUVzCWBFGO1RhvtQZEWe1gQXPFgy3pC25Q8J0ab32h7Q+D300o5y8VC3a6bHBWc0sSq 7F8bJVn9Nuym3hIlY/vanqKToiZqskQi3Emsmj52JKt+7i/u4rH8sSgHlDJrcfg69CwlerhBXfZZY j//q7Uig==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eRVIS-00008H-0z; Wed, 20 Dec 2017 03:43:56 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRVIP-00089b-NK for linux-arm-kernel@bombadil.infradead.org; Wed, 20 Dec 2017 03:43:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=EeEtCmuQLVUYH7TlIJo+r6l3rzR/heGrBkWklEqtYaQ=; b=NxwAxXRTncqLKrI4wjfFXC9PP MOS6a5kQfmjugwQbulHVbq6fRJmu3Og0EaQY52vfHNOTV/8NtbQ4/kjvzFu+bWsuJmFd+BkHk8eYM TmPdu/lO628P0nnSZQu2RFJgHsPM8lOOXBqEmkPJAxcD5YlWJSnsC6TDXEfkGFkyLqjvp5DTAZCZu uOCpIkD1avn9bCvLrQNZGjorFC11givGIN0Y9aKkbmnwsAgJ5BkeL+1OtusK6OPcAPxQ6aJY8THgs ejTi5te8XO0HO4fEUIZuwB1fU8KSohp7bbIOmlns7m3oOgT/D/2Fd2Dftt8EiEXchoG5fPWYa4WYG dj5rGqLNw==; Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRV2M-0000aL-Mo for linux-arm-kernel@lists.infradead.org; Wed, 20 Dec 2017 03:27:20 +0000 Received: by mail-pl0-x242.google.com with SMTP id b96so8256875pli.2 for ; Tue, 19 Dec 2017 19:27:08 -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=Api6Jfc9skfltRi49bRIvPuRLixNAVYgxQcR4jCeX6TATZFFsMH3mQeCL+Xdg014ug J7/5DsC2ROQ6xQ0yGO7xv+uiDLqDevHb2/BxDtTL67gRfgiyL+QO3C/fO+o2X1Fuhfn/ kyAzcZn+AZdsTckbdzQJRo7HizXdy+MWvrkoHlJlg9b82Maut7XQ24ZL+5QcTmAq020a fBxE3R1rK8VVhnCYcjE44/vDEh3R2A4ZuXVs/1khlZNoVUPYdQIYv3JPjp6ojtWlXHfl Zj5RswlhHxM7mhp/2NcHeagnbAw7ENXs1UH2AUGtmQU9GTAXdY58b4Z3VBB78BHakAJ8 qKhg== X-Gm-Message-State: AKGB3mJTimVbafbbij4WNeK5PDprQJjCWsLiu+DDD8McNDGu7KnabRKG hHVBX4g4OSJwOV8IRd1qqxc= X-Google-Smtp-Source: ACJfBoukdp2xZX+fuEarGCZek/mbbOt4rhCtbvnshwxsYUluywBUXdGjrEZSq1sMDgc5YGyt2M+hHg== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171220_032718_734513_4A271EA8 X-CRM114-Status: GOOD ( 13.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , linux-arm-kernel@lists.infradead.org, Jeremy Kerr MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP - 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>; + }; +};