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: 10114003 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 6C98860327 for ; Fri, 15 Dec 2017 06:30:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4812629F5C for ; Fri, 15 Dec 2017 06:30:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4688A29F5E; Fri, 15 Dec 2017 06:30:53 +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 B533D29EBA for ; Fri, 15 Dec 2017 06:30:36 +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=IE3HBC/05MdqG0MRsRe2tX196G97lunX4PlPV6CLdbQ=; b=Xssd10UTI4+uMcACdTn99WkwyQ pvKZDcbNsuFybjaVPyT7SrEJUNZQozFjomeKMBrh1ATvur15MzqlRDSsLm0Zo9/6wS/wA1E5AMeEb t0AhX8PZb3ZRjEr1MiQ6cdpsar8RGqPp3NGVGQEynjnDZeT8VTCM1POUong6D/HAp6WhTNTQEg68+ s+45JU+HE8K9f1OyiyefzKxKLX95PMmSS4pTw4BZUpipd+VcOzIyx3QCPokd+fa1NXDXIGsTIT3jW bXaNKn0GM9ZmZoW/JCRHzmgkszTIgTXuB8s16cI+NUQf17nrCyIFj2zm7gsnBYrzmypCdKMz+I8eB 6AHs30ig==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ePjW0-0002xC-4t; Fri, 15 Dec 2017 06:30:36 +0000 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ePjTx-0000Jk-IL for linux-arm-kernel@lists.infradead.org; Fri, 15 Dec 2017 06:29:04 +0000 Received: by mail-pg0-x242.google.com with SMTP id e14so5165620pgr.9 for ; 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=VG7EAHBEFjqZtlBNwfoKNbOYRmg1+3UloPPRZIld/EUQi9kJMZviYuxnT60+bNccaf rPUO4PihrAZTsVdN86CdoQ7WifDX0BhojnghTXtbLtUgA5f0yuCZdr6vT0rB1cyRJf5E mzaJq2rf+0bQneH1L9lA5fMsO/N77CfN+36qYLjLfJCbYCv4opdmiKvcKccF5uYaTiKI K0583BIswdHCXYaChBGBnjhiXFdSafKd8OpY+rPFufeqz8gRTVhF2X1VNgNyJS1Hd2Oh Qv8XYgkpq2efKT299x91vjJ8hyIncffIgXZwa2VWxTSiXTkL2elOfaal7Em8AjsqkAch 7v0A== X-Gm-Message-State: AKGB3mJOAY74EYTSQYFNBsYr4gJ4NiPJOk7Xohpixp+BkwCPZJg9xYJn STISuB7eg+0tNEgIc3e1qCs= X-Google-Smtp-Source: ACJfBotscD9KpSno0bpBA1mkSM0MDnPEw+fNMy3QE/fsGxFPjz2L2KTGxIuMkKdWvT7/xqMkAHaWrw== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171214_222830_166415_A62C8ADE X-CRM114-Status: GOOD ( 12.50 ) 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 --- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 153 ++++++++++++++++++++++++++- 1 file changed, 148 insertions(+), 5 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..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>; + }; +};