From patchwork Mon Dec 11 05:06:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121314 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2370306qgn; Sun, 10 Dec 2017 21:08:30 -0800 (PST) X-Google-Smtp-Source: AGs4zMaUoR0VLPdJlqU75Hs3Byaq90p8EohANBXqZZA2/rOHESlqMmbh19OLvxuo1cMhWwoAj3JO X-Received: by 10.84.233.207 with SMTP id m15mr37126721pln.424.1512968910007; Sun, 10 Dec 2017 21:08:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512968910; cv=none; d=google.com; s=arc-20160816; b=IjLAJOVx0F1OiBNQLtIbA1T1bONR4Y5OU/Yuf7DCd0c7ozqA/jzaUlGm02bCwNUB4J pqfN7N5X8Sgsp80IJPFomKRjNQXl/r862IqbIZI4ZsSGiFSreeN+5CxiTqDsJLK+igw1 HARPQJcTQWX9QJPHrlwbfO1cXxTg7dbVgEdLAnLM21pAhDWvSWaLa4G/QcT0xhMTex66 zhrCIERwVBYVDcEkXtORD3e1WDbZzJsA/juG9nFQOZRrWlCmwPBWGXi2FWGpP/XTLrx/ VB7jbF2ZaXHOBj3KeunhzcoTMofvWTgIUq3JEXheUBvOJiirlNpLE4ohlawAjxru26CG h3nw== 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=h3V+zjUuLXfGaZ13W3JQN+SZRDMI9YAZ1Gmgc72wsNs=; b=phjIyeVGwOw6pdxzpb9tf858WI1mYdVTy9LJNdr0KH2lILb5urt5k/K+igBe8d3o5F rwaJWgz1eN//xwpNEQ5eubUUKm/Vu0xFB2keI+jz8RxkeuJA2B0y2cyi19Tp4/ERnCCC fFc4tUILwKnGeg3V6E83US0JGoX2F1EkIqcxhDtJzaEgTfpzh+piac/zYvH3H56nJn7O vXvXioQrGf2z8Wx/90nvOQIGkgoOlqL49Iq1a/24dlpPaCWjcvMbSAMGwYCqQn/9apan 01PnC2Ds15LdQWwdKQbXYJ7CAIEDGMimFRhJh2EAJMxgngd8sNBZfXGyB+2RG7CP7KLt YZVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ett96tSY; 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 s24si3123369plp.113.2017.12.10.21.08.29; Sun, 10 Dec 2017 21:08:29 -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=ett96tSY; 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 S1752355AbdLKFI2 (ORCPT + 24 others); Mon, 11 Dec 2017 00:08:28 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:46335 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752277AbdLKFIX (ORCPT ); Mon, 11 Dec 2017 00:08:23 -0500 Received: by mail-pg0-f66.google.com with SMTP id b11so10137780pgu.13; Sun, 10 Dec 2017 21:08:23 -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=h3V+zjUuLXfGaZ13W3JQN+SZRDMI9YAZ1Gmgc72wsNs=; b=ett96tSYBkNBYK2MSIFf4M4++BwmpwOf/5MbXYk4ILVmb57Q9Xy6MhBlGNbJisbgGo G1wXTSa+MB0dLXudwwTvBojvj1uhMxvG7Rj/HMvibcaE63tcz6cDCQFcVBKVUMKVlbXZ NmZRzaguEwzu9vlwVRak5nvGRL34CsCfrMREbLOmDB9icFtT6AFVJtBd5u/wIzOCOxE3 HuElGtk1Xis2TlbsDdDd7IrjVJpHDLQ30PfV5sX+jZMcfR+Pt18SCWb50jWiaNjSFoWy 3VepLC/iPhJwO3GmhfmHxP7cehHELneaOGTggo51QrovBnDTqE7yz7DBAh2x6aShhVMz tz4g== 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=h3V+zjUuLXfGaZ13W3JQN+SZRDMI9YAZ1Gmgc72wsNs=; b=s72K0E+sX0b8kOKawddiTzW/+BWs5dbpJsvjX2TlZtlvRPFo3+9AsJ1FnHsyiJERRV MI2Ma0SXg1mX1O/0QzspqbB5okpH4+xtGX3n1eIoLzbmeHwqOspUMQ9co29qaB4UqxuD 2qE3lJB3sk8k2hhAOVHS2yeEAsoE8pSnn4i8ZWRS6xYWjq3gbp8yfLs1jHMUtG22caaP Tzm1uqXs8aZdzVAh62LI+3G0sz4PB7Jtr5teI4EWpJWDAus6YJeUn7n/FqPwC27HQj7O qRRBlSlByiFAGW8st537nqPiwsXREu0XPtKdPlYQJLVVETaq6tu7hE9lvYHG6Adm/XKZ w0TA== X-Gm-Message-State: AJaThX5cGHD92wz1m0gLz0vqqaB7jNQMfcNPamJPtcNeBPXBD5RCVYFB Iu3K9FRn+B+/0q/3sB3AJ74= X-Received: by 10.99.103.70 with SMTP id b67mr37238633pgc.211.1512968903063; Sun, 10 Dec 2017 21:08:23 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id c24sm24685612pfl.2.2017.12.10.21.08.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:08:21 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:38:13 +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 02/20] dt-bindings: gpio: Add ASPEED constants Date: Mon, 11 Dec 2017 15:36:46 +1030 Message-Id: <20171211050704.20621-3-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 These are used to by the device tree to map pin numbers to constants required by the GPIO bindings. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 1 + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + include/dt-bindings/gpio/aspeed-gpio.h | 49 ++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 include/dt-bindings/gpio/aspeed-gpio.h -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 45d815a86d42..100d092e6c07 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "skeleton.dtsi" +#include / { model = "Aspeed BMC"; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 5c4ecdba3a6b..1f9d28313f82 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "skeleton.dtsi" +#include / { model = "Aspeed BMC"; diff --git a/include/dt-bindings/gpio/aspeed-gpio.h b/include/dt-bindings/gpio/aspeed-gpio.h new file mode 100644 index 000000000000..56fc4889b2c4 --- /dev/null +++ b/include/dt-bindings/gpio/aspeed-gpio.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * This header provides constants for binding aspeed,*-gpio. + * + * The first cell in Aspeed's GPIO specifier is the GPIO ID. The macros below + * provide names for this. + * + * The second cell contains standard flag values specified in gpio.h. + */ + +#ifndef _DT_BINDINGS_GPIO_ASPEED_GPIO_H +#define _DT_BINDINGS_GPIO_ASPEED_GPIO_H + +#include + +#define ASPEED_GPIO_PORT_A 0 +#define ASPEED_GPIO_PORT_B 1 +#define ASPEED_GPIO_PORT_C 2 +#define ASPEED_GPIO_PORT_D 3 +#define ASPEED_GPIO_PORT_E 4 +#define ASPEED_GPIO_PORT_F 5 +#define ASPEED_GPIO_PORT_G 6 +#define ASPEED_GPIO_PORT_H 7 +#define ASPEED_GPIO_PORT_I 8 +#define ASPEED_GPIO_PORT_J 9 +#define ASPEED_GPIO_PORT_K 10 +#define ASPEED_GPIO_PORT_L 11 +#define ASPEED_GPIO_PORT_M 12 +#define ASPEED_GPIO_PORT_N 13 +#define ASPEED_GPIO_PORT_O 14 +#define ASPEED_GPIO_PORT_P 15 +#define ASPEED_GPIO_PORT_Q 16 +#define ASPEED_GPIO_PORT_R 17 +#define ASPEED_GPIO_PORT_S 18 +#define ASPEED_GPIO_PORT_T 19 +#define ASPEED_GPIO_PORT_U 20 +#define ASPEED_GPIO_PORT_V 21 +#define ASPEED_GPIO_PORT_W 22 +#define ASPEED_GPIO_PORT_X 23 +#define ASPEED_GPIO_PORT_Y 24 +#define ASPEED_GPIO_PORT_Z 25 +#define ASPEED_GPIO_PORT_AA 26 +#define ASPEED_GPIO_PORT_AB 27 +#define ASPEED_GPIO_PORT_AC 28 + +#define ASPEED_GPIO(port, offset) \ + ((ASPEED_GPIO_PORT_##port * 8) + offset) + +#endif From patchwork Mon Dec 11 05:06:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121315 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2370422qgn; Sun, 10 Dec 2017 21:08:40 -0800 (PST) X-Google-Smtp-Source: AGs4zMYGrsXjmEq+u8UpQmP+XQwvCYRm6NMEvrjrPOQKe85e+dl158VS5HMTVWL5aJj1Jejquvkq X-Received: by 10.159.241.149 with SMTP id s21mr29146190plr.248.1512968920449; Sun, 10 Dec 2017 21:08:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512968920; cv=none; d=google.com; s=arc-20160816; b=YQW1wpG6ksGUvcJAvc+VWjhSLwE8fLXGuWiK2C7fjpct7bdZoci57uqjx7FkV4mE8v ArPr0Fo+W5qzL2fPxN1wg3XjbBMoy9hUl1iNsggUe0ydVHrfnFRycmLk8jm5MVGtq8Fj dlJ7efPamUVaXowZXiwp4ZF3oli/+LH+KI3Zla/oW8I2X014Jm+Cek4tODhgrO2uNLu9 Vx5P1Jgf4L5YBpHq1Xet55MFLPkYjrEiaXLppUjzQCNNE7MLiSBinIovUFrUaXF69Az/ P06uc/tVEHbLk5OPib5OL6dLseOV7lJu/8lUO6F3jVmKvBpMQ6EA/tJe3dCTla5AApB2 GLkQ== 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=oX6VfYacLRDAKE9tQ05lQyKl6/EHdkru61RZWh/kEV0=; b=W93uotf2J2NdimMhgqiR/6nzfLw6EjqeRaBHcd3cjPTgE0p39+HRcJ3I2a3el5M+mU 5ru2hYPRDcLPcx/is7P33F1MkJppr9R3i1MAWAvMFoer58QwxmZLQvVYYExaZoqQllGR lGCg/v60TrBH1QzgPdchuQi+0NjatdPqf50jZW0jSWzh8ilqqv7SvLFz69Xk8lFZ0C/S zTVrPZnFkKROEd3wTFQySNnPFFNohV1MXy9iwwix/S4J20Pjz8atgZ22pz7xGYIjQ024 hfRyaBDJ9A1R4AyLz5cSoJBdgYhF2UKo+/6gpj5Yc8Z6Kt7X6TKyaSDaj3ebTioUEv8q 1Oxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=aQlIOQc5; 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 y4si10333091pfl.122.2017.12.10.21.08.40; Sun, 10 Dec 2017 21:08:40 -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=aQlIOQc5; 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 S1752425AbdLKFIj (ORCPT + 24 others); Mon, 11 Dec 2017 00:08:39 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:39164 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751622AbdLKFId (ORCPT ); Mon, 11 Dec 2017 00:08:33 -0500 Received: by mail-pg0-f68.google.com with SMTP id w7so10142423pgv.6; Sun, 10 Dec 2017 21:08:33 -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=oX6VfYacLRDAKE9tQ05lQyKl6/EHdkru61RZWh/kEV0=; b=aQlIOQc5vTZ7XAfTbiCilK1jFcy2jR4l3LB2l1S7MTgacmkv9lkSan/SvYlVt+t1U7 QpEtl3cFP17cPv+znQgZv5f2/D4rKRZB28lIxCUU4XKQUl1AUyCHIuu5yCRkfu4dj2rH Gl/5lf2IduGyBRpcxfIS3D8LdkSiuFIhihYU1JlNR0bIPzLxO+pHHkwg0bES3mhzDOkg /fQep7xj03MJh6cLM3VEjYdMoM1c408B07t9u849UwDdev8FdoeI9WZ7cLfjSXe6Ksck /lJEJ0lCMHOF14WZKCpAzrsdcEeWQegPXMd2Nkyz5o6T8Dz6M6ZF3h4PLkWL7aeWHDCR OFKA== 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=oX6VfYacLRDAKE9tQ05lQyKl6/EHdkru61RZWh/kEV0=; b=rVH7FV4kIs3fLa/Wj4mSLq1YsD3e5TKiiKCiYscLV8iRGvhZ23jpquM7YLMCdMPzA6 WIF9cWrAZiKfSbmG4gUVP5hNX7WL9cfyMSN7Izb4Bz+Zqo7je/A9puCmKWOub9fP2Giv Z1Bl2cBS8jpuUBj2QUfhblClBobLWcmoHxSZX7UFU0fOKKCPBf+ynasvNQg/+L4j/uJ8 S79RW1/7FwUcAfXpUqwkLai4CG/0eTa/262z+Ks7wyxytL1rCX0YOwzypQPF+bWijSbD HoZ5C/xd1GyE8xprj1ynEgVkndHLac0UcoiuKPexUJO89XAmLxO0IjFjLXZj6TLl6eHF I31w== X-Gm-Message-State: AJaThX5uiD+oh1ETEYfBhMixyErURjk+VShuJKNISGrGE0fz++u4Cyed 0JlfW3FtQGOmOQho2ZeBjhI= X-Received: by 10.99.160.100 with SMTP id u36mr37093700pgn.22.1512968913175; Sun, 10 Dec 2017 21:08:33 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id x4sm23219614pfb.13.2017.12.10.21.08.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:08:31 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:38:23 +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 03/20] ARM: dts: aspeed-g4: Correct VUART IRQ number Date: Mon, 11 Dec 2017 15:36:47 +1030 Message-Id: <20171211050704.20621-4-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 This should have always been 8. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 100d092e6c07..9ebf90f34709 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -220,7 +220,7 @@ compatible = "aspeed,ast2400-vuart"; reg = <0x1e787000 0x40>; reg-shift = <2>; - interrupts = <10>; + interrupts = <8>; clocks = <&clk_uart>; no-loopback-test; status = "disabled"; From patchwork Mon Dec 11 05:06:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121316 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2370500qgn; Sun, 10 Dec 2017 21:08:51 -0800 (PST) X-Google-Smtp-Source: AGs4zMYkBO0MzQbASqIbOzDPnZcQpBG6K30SYdBkjt80VMcQdhwv8qVylSYTrKukTrO+ikPVlqTR X-Received: by 10.101.80.76 with SMTP id k12mr37383289pgo.32.1512968931756; Sun, 10 Dec 2017 21:08:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512968931; cv=none; d=google.com; s=arc-20160816; b=xYT28WWYk1Wauo0HoXvuPCP0doitPUeGImPtB3XOpg0lJsZosX8SkTXkWPBu5+Rk/8 aJmsfdb6diwqUz7Y9o27VLHAb/mJxenP1S8nK55fai0/mQKWM1wEs5ALgRnNE84R41iD ICUQIcIdl7ZnQ+JyC7+E6psXs96y+ENNWRIxssUB9VPc8szkUM/VUwdf6nNuzUlGqeYo rp6FpkRpaV5F6idXWFQcVE6qs9e2A5gcN4R2p/bCuhpEWJ5e8zcISycy6UxIjhVO0Cgw TW7fQTvbijmGF4rfGHmwq65AdS9rgRDOUzL5t6ZKFtKshe0+l6nHBZGWeEQa07AHlXMK 5GvA== 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=aRlU5Ks8NNMvyjzX5ok3fAh3aZjAOHXvIOO5buaccdU=; b=pZ59n3Fm55dONEri8mjlYFFbiUmlTJr33Ew2oQ7iJSDeuZWYJFMWayLPOVjnJ6zV/8 sWDlVbzl60O2stiDM74shVhdkzBYT/5A9L9fFXwG8jwjC+4RmVKw3A4Q4Bycn4dvTQqR vHAuJnV8gTgM2I9z0TXid1dUfJoVwDWelOA73ucgRhgZaElFuJ9XMRgAgHQ+dQjBNbmA Quh9RIwrZSoyFEGFi8+AJ3bPh66JgPorCYiUpAxf7AHjQVh5nN1q3tQ+7uZTpz4KrwdW Kim3aDxzk/K0UE2aS0Tmo48Lzay4bFv0zDK9qyFvqGq00LjkPUJmMjltrsMkLZcDn6sw uJkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=H/WXlyxh; 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 y4si10333091pfl.122.2017.12.10.21.08.51; Sun, 10 Dec 2017 21:08:51 -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=H/WXlyxh; 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 S1752495AbdLKFIu (ORCPT + 24 others); Mon, 11 Dec 2017 00:08:50 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:42400 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434AbdLKFIo (ORCPT ); Mon, 11 Dec 2017 00:08:44 -0500 Received: by mail-pg0-f68.google.com with SMTP id e14so10148718pgr.9; Sun, 10 Dec 2017 21:08:43 -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=aRlU5Ks8NNMvyjzX5ok3fAh3aZjAOHXvIOO5buaccdU=; b=H/WXlyxh83rntZCLyWCURkhstxY3eTY08+gGG/Ngi7LwwEbh54AvAxGFy5SUpomQuW zo8ffK0tTnHLD19F74V/apa8YwCUjOXSCsHjFmLGyI1uW2fxbrh8TYJyuhLCqaU4Ge05 Qwbct3knaj9yO8O3nEPpHYgxKY5PRq1zowFwC2NZ8BQgSC6bFNgWEHIakDDNRu26rWHU s5Bg5AUSeZNYP4pBIIaytG1VL9bcnpEVD1TqmSUQ6AczZl4y7vm/ld0UDo41kW53KyWV NQxnGrxXzCVceLjFnP+DmKfWkpQ9IM/UW3uaXN0SeCNsq97h3RCg4W0IRVoPxL0r/mI3 mhOg== 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=aRlU5Ks8NNMvyjzX5ok3fAh3aZjAOHXvIOO5buaccdU=; b=Yu+lLUrNW3J9bq9URhd1+TAlCALAr/C4dxt0zsYVQYQL2+XLDlF2ePCrwt2SDGxSmG aXHKtcWeS1C0l3jAOLlEv9qCvrLpyNLLZTfNsmQeX12ranu8MjQzNKt8HrO299zQMFOk o16PopVF9Hz6suUuBhNdfB0MaXGMiNWwTM7wPImFP0RQ1E2bStyRp3r4NDofyBL7WWW0 Cour0+GVwdAcSnfdkjDGCPXMGdycK6AW/TI1Cu66Ak0DZKI6EhmcQ7zhv9VpukfLAX/+ NEFZ46KJjw1h1dUIcx50VRcXgtdRfALXd0SIxbGurD7aJWM44I6Lxq2a09ELeErLKXk+ 2JbA== X-Gm-Message-State: AKGB3mJzxt4XR+4HPKv72Zl7B30JAIfTL+zDgddZNCxixrLUaFC5LiZD nbHDBLTxVMX9hgcr8XDX6WM= X-Received: by 10.98.211.73 with SMTP id q70mr6217996pfg.107.1512968923426; Sun, 10 Dec 2017 21:08:43 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id z5sm20182977pgb.6.2017.12.10.21.08.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:08:42 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:38:33 +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 04/20] ARM: dts: aspeed: Add LPC and child devices Date: Mon, 11 Dec 2017 15:36:48 +1030 Message-Id: <20171211050704.20621-5-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 From: Andrew Jeffery Ensure the ordering is correct and add all of the children in the SoC device trees for the ast2400 and ast2500. Signed-off-by: Andrew Jeffery Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 35 +++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/aspeed-g5.dtsi | 27 +++++++++++++++++---------- 2 files changed, 52 insertions(+), 10 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 9ebf90f34709..b6d01523555a 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -226,6 +226,41 @@ status = "disabled"; }; + lpc: lpc@1e789000 { + compatible = "aspeed,ast2400-lpc", "simple-mfd"; + reg = <0x1e789000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x1e789000 0x1000>; + + lpc_bmc: lpc-bmc@0 { + compatible = "aspeed,ast2400-lpc-bmc"; + reg = <0x0 0x80>; + }; + + lpc_host: lpc-host@80 { + compatible = "aspeed,ast2400-lpc-host", "simple-mfd", "syscon"; + reg = <0x80 0x1e0>; + reg-io-width = <4>; + + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x80 0x1e0>; + + lpc_ctrl: lpc-ctrl@0 { + compatible = "aspeed,ast2400-lpc-ctrl"; + reg = <0x0 0x80>; + status = "disabled"; + }; + + lhc: lhc@20 { + compatible = "aspeed,ast2500-lhc"; + reg = <0x20 0x24 0x48 0x8>; + }; + }; + }; + uart2: serial@1e78d000 { compatible = "ns16550a"; reg = <0x1e78d000 0x20>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 1f9d28313f82..7861631940fe 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -266,6 +266,16 @@ status = "disabled"; }; + vuart: serial@1e787000 { + compatible = "aspeed,ast2500-vuart"; + reg = <0x1e787000 0x40>; + reg-shift = <2>; + interrupts = <10>; + clocks = <&clk_uart>; + no-loopback-test; + status = "disabled"; + }; + lpc: lpc@1e789000 { compatible = "aspeed,ast2500-lpc", "simple-mfd"; reg = <0x1e789000 0x1000>; @@ -289,6 +299,13 @@ reg-io-width = <4>; + lpc_ctrl: lpc-ctrl@0 { + compatible = "aspeed,ast2500-lpc-ctrl"; + reg = <0x0 0x80>; + status = "disabled"; + }; + + lhc: lhc@20 { compatible = "aspeed,ast2500-lhc"; reg = <0x20 0x24 0x48 0x8>; @@ -296,16 +313,6 @@ }; }; - vuart: serial@1e787000 { - compatible = "aspeed,ast2500-vuart"; - reg = <0x1e787000 0x40>; - reg-shift = <2>; - interrupts = <10>; - clocks = <&clk_uart>; - no-loopback-test; - status = "disabled"; - }; - uart2: serial@1e78d000 { compatible = "ns16550a"; reg = <0x1e78d000 0x20>; From patchwork Mon Dec 11 05:06:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121317 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2370568qgn; Sun, 10 Dec 2017 21:09:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMYJYWX8LBZck61cf1Dm6mJLJK9+OU05e141xpqNDP+UPy4GOi6v5BDrN6uxzfMImXJLIsok X-Received: by 10.98.112.71 with SMTP id l68mr6193752pfc.11.1512968940130; Sun, 10 Dec 2017 21:09:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512968940; cv=none; d=google.com; s=arc-20160816; b=azHGHzIbsbJCyDDFWSTC6rL6etWiQ6dkdLlU0pBzFyX8x6TcnH7q8CV5Cv16ICwBXS 2Kh6oHOxwad6LN1cuZICBf69Z4krad2gnZtz9+J5XRgKvBOV0R79jjz9kkdN3rc0nG5G mt52mmkcNDCl6nmEfsvXhq+ovAJqwjWzC5f3pccv0xq89MlT6vo7FwxMJJqXYZU2PpGD Nm4qbCdh4RHiosigvPMVEIU3KJ4Zy2zcZ9Mwa3CZVrYG3Maw+W8OL0/5S3/OBkQXDYmZ lUVbU/iH0EG6Sl8ftOMm5fARxnLWn6XA6IYs74UTWzrbSTtTjHXAYTV0ShWO0AgLkgza W9+A== 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=Axg++5JEku3ax4OC9+5PI8FbOBQWa58dZS8WwnRtNFk=; b=RNoef26x9O7o25QP7bDU+MEGp97XXTcJ6wyrVXu82gCPk+FfJvWETFC4JfdTR3kWKO k58eYj9GviyR9rKfPbdzy96y/nSDlmjNN1kyoLTwAZSBu5KOU3KWLS8RJc+wU+2o649r 0QXtX37bZl9GZJxa2QeIkijs8my8UVlkwkhsrvSdxkD/4kUoNIx4AgFvcdDdndY+FsZO 2OmfCEjD2hZTsasyWJKki/rouWc6khsvz3ITAcy5S3vrD5ytoo5QZULVsEvUzaMMXOMx sIg743UcUQxcfXo+GbzuJPcyqCJuZJoNdzyE4VsphuWG1MdvKhUTzH5dgJM6fDF2PLQm T5tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=SrQZVTlS; 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 g34si9415666pld.328.2017.12.10.21.08.59; Sun, 10 Dec 2017 21:09:00 -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=SrQZVTlS; 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 S1752531AbdLKFI6 (ORCPT + 24 others); Mon, 11 Dec 2017 00:08:58 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:40609 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750709AbdLKFIy (ORCPT ); Mon, 11 Dec 2017 00:08:54 -0500 Received: by mail-pf0-f195.google.com with SMTP id v26so10720311pfl.7; Sun, 10 Dec 2017 21:08:54 -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=Axg++5JEku3ax4OC9+5PI8FbOBQWa58dZS8WwnRtNFk=; b=SrQZVTlSi2qijQ74rRQxlZvvPybskqSQFq/prX+0vEX4p4AIikoeCv6lWSiAp8jjym P41Bc9DQ2BE8Zk/3OKXSU74xF3W57lAonwZFCujfktKbCOTblTkLx7xCT2iTpcK2zDzT iteMcGg3dkxLyg1SMSyoCbNVEYo064Gef2wBLEDtwE8hlNWlI9AD9xum+nJjnntdnok3 IAZ8l/Fla9VGIKnA0ulC65O565lP6vGNMgKfdjqOtyMYDApFflNREBjJNhKhp7it3z+4 RS3+weIMcH5Ifev3K0BwVeGZhTGRAjgiKredyj5fYpY5eqwRAeW1H7O46hPSdNqXmm3j C/eA== 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=Axg++5JEku3ax4OC9+5PI8FbOBQWa58dZS8WwnRtNFk=; b=Bsj0E3vZEVH5hIOUu4WwzTh1VC89bI0y+Bk0EiJNq7IsXVpLfOOG4iJBOWSxgyP2xJ mwocVoxufmxM2rKPLoqNgLqDQ5vmOcFdQGYLSGObaz3Sb26nYHkDZGHvEEAXMuXO+ijx jJ1qg2UYBukJu+V0sxl2/tQwXPOWgCUde+NT4irRSI/Aa+iSdKn2StjA/PY3oEQs/vQ9 FBLxjrJ2gQ5s/x136aClMf7akZ0DryaL/gEiiiXG0fsqEhdGdJXYZJl+HxHhwKPy5c6y cf1/UGyI4BJEakvO/eh77/+mLoPEbvEPQKUdBa5EcH/RpS+KIFjON5EZcGb7Pmydp8ED 6KYQ== X-Gm-Message-State: AJaThX6xKQQPhjbz1wRud6wdJtKC58QC/5A+vQqmTNi1tNbZSV87y5nh D5E/6+gv/tuxkCTqXMnoQtg= X-Received: by 10.101.90.8 with SMTP id y8mr36902800pgs.21.1512968933508; Sun, 10 Dec 2017 21:08:53 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id f3sm20286468pgt.15.2017.12.10.21.08.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:08:52 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:38:43 +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 05/20] ARM: dts: aspeed: Add proper clock references Date: Mon, 11 Dec 2017 15:36:49 +1030 Message-Id: <20171211050704.20621-6-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 The existing device trees use fixed-clocks in order to boot without a clk driver. The newly added clk driver provides proper clock support, including gating, so we move the device trees over to properly request clocks. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 100 +++++++++++++++---------------------- arch/arm/boot/dts/aspeed-g5.dtsi | 104 +++++++++++++++------------------------ 2 files changed, 81 insertions(+), 123 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index b6d01523555a..c87883a7f250 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "skeleton.dtsi" +#include #include / { @@ -107,47 +108,12 @@ ranges; syscon: syscon@1e6e2000 { - compatible = "aspeed,g4-scu", "syscon", "simple-mfd"; + compatible = "aspeed,ast2400-scu", "syscon", "simple-mfd"; reg = <0x1e6e2000 0x1a8>; #address-cells = <1>; #size-cells = <0>; - - clk_clkin: clk_clkin { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <48000000>; - }; - - clk_hpll: clk_hpll@70 { - #clock-cells = <0>; - compatible = "aspeed,g4-hpll-clock", "fixed-clock"; - reg = <0x70>; - clocks = <&clk_clkin>; - clock-frequency = <384000000>; - }; - - clk_ahb: clk_ahb@70 { - #clock-cells = <0>; - compatible = "aspeed,g4-ahb-clock", "fixed-clock"; - reg = <0x70>; - clocks = <&clk_hpll>; - clock-frequency = <192000000>; - }; - - clk_apb: clk_apb@8 { - #clock-cells = <0>; - compatible = "aspeed,g4-apb-clock", "fixed-clock"; - reg = <0x08>; - clocks = <&clk_hpll>; - clock-frequency = <48000000>; - }; - - clk_uart: clk_uart@2c{ - #clock-cells = <0>; - compatible = "aspeed,g4-uart-clock", "fixed-clock"; - reg = <0x2c>; - clock-frequency = <24000000>; - }; + #clock-cells = <1>; + #reset-cells = <1>; pinctrl: pinctrl { compatible = "aspeed,g4-pinctrl"; @@ -157,7 +123,7 @@ adc: adc@1e6e9000 { compatible = "aspeed,ast2400-adc"; reg = <0x1e6e9000 0xb0>; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; #io-channel-cells = <1>; status = "disabled"; }; @@ -182,7 +148,7 @@ compatible = "aspeed,ast2400-timer"; reg = <0x1e782000 0x90>; interrupts = <16 17 18 35 36 37 38 39>; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; clock-names = "PCLK"; }; @@ -191,7 +157,7 @@ reg = <0x1e783000 0x20>; reg-shift = <2>; interrupts = <9>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART1CLK>; no-loopback-test; status = "disabled"; }; @@ -201,7 +167,7 @@ reg = <0x1e784000 0x20>; reg-shift = <2>; interrupts = <10>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART5CLK>; no-loopback-test; status = "disabled"; }; @@ -221,7 +187,7 @@ reg = <0x1e787000 0x40>; reg-shift = <2>; interrupts = <8>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_APB>; no-loopback-test; status = "disabled"; }; @@ -266,7 +232,7 @@ reg = <0x1e78d000 0x20>; reg-shift = <2>; interrupts = <32>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART2CLK>; no-loopback-test; status = "disabled"; }; @@ -276,7 +242,7 @@ reg = <0x1e78e000 0x20>; reg-shift = <2>; interrupts = <33>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART3CLK>; no-loopback-test; status = "disabled"; }; @@ -286,7 +252,7 @@ reg = <0x1e78f000 0x20>; reg-shift = <2>; interrupts = <34>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART4CLK>; no-loopback-test; status = "disabled"; }; @@ -317,7 +283,8 @@ reg = <0x40 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <0>; interrupt-parent = <&i2c_ic>; @@ -332,7 +299,8 @@ reg = <0x80 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <1>; interrupt-parent = <&i2c_ic>; @@ -347,7 +315,8 @@ reg = <0xc0 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <2>; interrupt-parent = <&i2c_ic>; @@ -363,7 +332,8 @@ reg = <0x100 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <3>; interrupt-parent = <&i2c_ic>; @@ -379,7 +349,8 @@ reg = <0x140 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <4>; interrupt-parent = <&i2c_ic>; @@ -395,7 +366,8 @@ reg = <0x180 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <5>; interrupt-parent = <&i2c_ic>; @@ -411,7 +383,8 @@ reg = <0x1c0 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <6>; interrupt-parent = <&i2c_ic>; @@ -427,7 +400,8 @@ reg = <0x300 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <7>; interrupt-parent = <&i2c_ic>; @@ -443,7 +417,8 @@ reg = <0x340 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <8>; interrupt-parent = <&i2c_ic>; @@ -459,7 +434,8 @@ reg = <0x380 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <9>; interrupt-parent = <&i2c_ic>; @@ -475,7 +451,8 @@ reg = <0x3c0 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <10>; interrupt-parent = <&i2c_ic>; @@ -491,7 +468,8 @@ reg = <0x400 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <11>; interrupt-parent = <&i2c_ic>; @@ -507,7 +485,8 @@ reg = <0x440 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <12>; interrupt-parent = <&i2c_ic>; @@ -523,7 +502,8 @@ reg = <0x480 0x40>; compatible = "aspeed,ast2400-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <13>; interrupt-parent = <&i2c_ic>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 7861631940fe..90bc09d93ea6 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "skeleton.dtsi" +#include #include / { @@ -141,55 +142,18 @@ ranges; syscon: syscon@1e6e2000 { - compatible = "aspeed,g5-scu", "syscon", "simple-mfd"; + compatible = "aspeed,ast2500-scu", "syscon", "simple-mfd"; reg = <0x1e6e2000 0x1a8>; #address-cells = <1>; #size-cells = <0>; - - clk_clkin: clk_clkin@70 { - #clock-cells = <0>; - compatible = "aspeed,g5-clkin-clock", "fixed-clock"; - reg = <0x70>; - clock-frequency = <24000000>; - }; - - clk_hpll: clk_hpll@24 { - #clock-cells = <0>; - compatible = "aspeed,g5-hpll-clock", "fixed-clock"; - reg = <0x24>; - clocks = <&clk_clkin>; - clock-frequency = <792000000>; - }; - - clk_ahb: clk_ahb@70 { - #clock-cells = <0>; - compatible = "aspeed,g5-ahb-clock", "fixed-clock"; - reg = <0x70>; - clocks = <&clk_hpll>; - clock-frequency = <198000000>; - }; - - clk_apb: clk_apb@8 { - #clock-cells = <0>; - compatible = "aspeed,g5-apb-clock", "fixed-clock"; - reg = <0x08>; - clocks = <&clk_hpll>; - clock-frequency = <24750000>; - }; - - clk_uart: clk_uart@2c { - #clock-cells = <0>; - compatible = "aspeed,uart-clock", "fixed-clock"; - reg = <0x2c>; - clock-frequency = <24000000>; - }; + #clock-cells = <1>; + #reset-cells = <1>; pinctrl: pinctrl { compatible = "aspeed,g5-pinctrl"; aspeed,external-nodes = <&gfx &lhc>; }; - }; gfx: display@1e6e6000 { @@ -201,7 +165,7 @@ adc: adc@1e6e9000 { compatible = "aspeed,ast2500-adc"; reg = <0x1e6e9000 0xb0>; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; #io-channel-cells = <1>; status = "disabled"; }; @@ -226,7 +190,7 @@ compatible = "aspeed,ast2400-timer"; reg = <0x1e782000 0x90>; interrupts = <16 17 18 35 36 37 38 39>; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; clock-names = "PCLK"; }; @@ -235,7 +199,7 @@ reg = <0x1e783000 0x20>; reg-shift = <2>; interrupts = <9>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART1CLK>; no-loopback-test; status = "disabled"; }; @@ -245,7 +209,7 @@ reg = <0x1e784000 0x20>; reg-shift = <2>; interrupts = <10>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART5CLK>; no-loopback-test; status = "disabled"; }; @@ -270,8 +234,8 @@ compatible = "aspeed,ast2500-vuart"; reg = <0x1e787000 0x40>; reg-shift = <2>; - interrupts = <10>; - clocks = <&clk_uart>; + interrupts = <8>; + clocks = <&syscon ASPEED_CLK_APB>; no-loopback-test; status = "disabled"; }; @@ -318,7 +282,7 @@ reg = <0x1e78d000 0x20>; reg-shift = <2>; interrupts = <32>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART2CLK>; no-loopback-test; status = "disabled"; }; @@ -328,7 +292,7 @@ reg = <0x1e78e000 0x20>; reg-shift = <2>; interrupts = <33>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART3CLK>; no-loopback-test; status = "disabled"; }; @@ -338,7 +302,7 @@ reg = <0x1e78f000 0x20>; reg-shift = <2>; interrupts = <34>; - clocks = <&clk_uart>; + clocks = <&syscon ASPEED_CLK_GATE_UART4CLK>; no-loopback-test; status = "disabled"; }; @@ -369,7 +333,8 @@ reg = <0x40 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <0>; interrupt-parent = <&i2c_ic>; @@ -384,7 +349,8 @@ reg = <0x80 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <1>; interrupt-parent = <&i2c_ic>; @@ -399,7 +365,8 @@ reg = <0xc0 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <2>; interrupt-parent = <&i2c_ic>; @@ -415,7 +382,8 @@ reg = <0x100 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <3>; interrupt-parent = <&i2c_ic>; @@ -431,7 +399,8 @@ reg = <0x140 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <4>; interrupt-parent = <&i2c_ic>; @@ -447,7 +416,8 @@ reg = <0x180 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <5>; interrupt-parent = <&i2c_ic>; @@ -463,7 +433,8 @@ reg = <0x1c0 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <6>; interrupt-parent = <&i2c_ic>; @@ -479,7 +450,8 @@ reg = <0x300 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <7>; interrupt-parent = <&i2c_ic>; @@ -495,7 +467,8 @@ reg = <0x340 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <8>; interrupt-parent = <&i2c_ic>; @@ -511,7 +484,8 @@ reg = <0x380 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <9>; interrupt-parent = <&i2c_ic>; @@ -527,7 +501,8 @@ reg = <0x3c0 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <10>; interrupt-parent = <&i2c_ic>; @@ -543,7 +518,8 @@ reg = <0x400 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <11>; interrupt-parent = <&i2c_ic>; @@ -559,7 +535,8 @@ reg = <0x440 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <12>; interrupt-parent = <&i2c_ic>; @@ -575,7 +552,8 @@ reg = <0x480 0x40>; compatible = "aspeed,ast2500-i2c-bus"; - clocks = <&clk_apb>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_I2C>; bus-frequency = <100000>; interrupts = <13>; interrupt-parent = <&i2c_ic>; From patchwork Mon Dec 11 05:06:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121319 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2370809qgn; Sun, 10 Dec 2017 21:09:19 -0800 (PST) X-Google-Smtp-Source: AGs4zMYO08Em2FTw0OK38MgBIyb6TbHcTSoMpB4afETZxVxwbxWR1mvktjttiQeIxqypErqh1IhT X-Received: by 10.84.234.136 with SMTP id n8mr22872666plk.387.1512968959131; Sun, 10 Dec 2017 21:09:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512968959; cv=none; d=google.com; s=arc-20160816; b=krrEPVGHX4K+D/x53zqP8Gil1N/tDIIcb6+7I4nJlmVO+/HhiGcJRhBVI/2NwUi89l MwxuGFVj949pJmKylocHenUkUWfkAvh4B1BweOBXP1CrcoS7SyFApqdXhHj2AgA0fy/r qKsSJVWiVjyS1fiFpBU1LwK4pSWShVHeeejn1sonaE0cSqqRGMnqU1MxvL5EBPZPz+Ki U3BZDYtE4MdzIqWcoFULSRjOebG3dYBYFqF+puMrObmsN4yBzyvg/p3FFUZLNhB2zBHc Xy7b5L/18S4/tR3AZBLJEcF/fdUlwpfzZokswPYv9kjNVT8CsXz6wGjBVO5tk5tgsJ8R F5Bg== 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=7BoT0+keA2NrrSeiOxkAt1atyBW/4p72jpeHjl4Zlz0=; b=CdsUSW+8fq/xc2v2ElIUnyi8M0dhGcJYq/7UUV/Hyp6t7/5crEqKSR+CezwRkKLHnl XjCxsgfa4AjZvTJAtBw+bao5QKQO5wqkc5lcdARJ5pVLTWxLYGA0RthnWymqzaNr6HWE iQ44oiq98Pd1q7CkWbLAU33Vx5NOnmG/6/f+ZQ7QKqhHRImwW0f48fPh4KqOC/EQlBqL v9k9GTb2K99aJ6XvIXZ3ORJcdIqjMjAoO+P5TCJ30BBbV8AcX6EmkR3V2MM31CsrChQd PnLKkEq99eWEbOklkJXB8iA5damgN8fqEQNIEcvvdMctSMOFKsvNx+P5syGJzwv30cK4 6mrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=g0UrH52H; 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 i65si9367906pgd.828.2017.12.10.21.09.18; Sun, 10 Dec 2017 21:09: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=g0UrH52H; 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 S1752572AbdLKFJS (ORCPT + 24 others); Mon, 11 Dec 2017 00:09:18 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:46394 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751434AbdLKFJN (ORCPT ); Mon, 11 Dec 2017 00:09:13 -0500 Received: by mail-pg0-f65.google.com with SMTP id b11so10139132pgu.13; Sun, 10 Dec 2017 21:09:13 -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=7BoT0+keA2NrrSeiOxkAt1atyBW/4p72jpeHjl4Zlz0=; b=g0UrH52HSH27Azi5HT9h4N0MPGgyoLICESM15QVcTba0FnTu5zEC4TM4FyR5NLeQ34 s76EsKVRVmBsoLTcf8ZiqUujwbq4afvwE4QquHZlF/0Np3hI+N2zeqwhLTsp6dgtIeTD ixYFExj+uNGcJPrw9U4w24S6fayQCHnPsADmND5QExjk5UIruX99JVgwMe5W8FlZ4/Ro VUPSxvdowRt4GqRf4Ba6Iz4CFJ0KsEm6oNQkDzDFKH0CTtu97HP9tsBMNzstj1sSpZwy xaH5Nk/CDyB6U2lJC7CTPujLoD03GQFRn8SWmXVqWW2o3CKRK35hvlnHhvMn2Qsf+Ncn zq0A== 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=7BoT0+keA2NrrSeiOxkAt1atyBW/4p72jpeHjl4Zlz0=; b=mD21vrsbOEUGhVpG6UlEYLnRVukJkF4O6dqTVBEsuUMVDJMOWGSrcWUkOcblLEDR90 A6HlbQLSrHu2IWX67+nZsfWifJYSuHX5EEZyyTpQJ6KM1wVjpYlUmirb8jpSo1/4khvQ HCXcMaOtpnc2SU092HjBSVI7FJwW5oiQTYo4UZj+B9lrESl58uipodUgZLuiKYBJEZqz k8p3P9XvflyBtb1L1G41jQtlsYxPnScqeeTItT7igRHls7r/q2OFXQxaOGr1wqDRnURN I4JsdAFqyfYTYLyKpXnt7MgANx2Nox2Gt+KhOvQ+seI9/ryTA4U0Z4tGqfSFgsXRP+C2 pnzQ== X-Gm-Message-State: AJaThX5eWstPVfwMFfilWF1xZOzekLTg4G2s3DcgkUlGsuf+cQci+/7F z0mVzDF5nLLlUD2vUz1z1yA= X-Received: by 10.159.197.1 with SMTP id bj1mr38495213plb.118.1512968952930; Sun, 10 Dec 2017 21:09:12 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id k2sm21655769pfg.53.2017.12.10.21.09.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:09:11 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:39:03 +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 07/20] ARM: dts: aspeed: Add watchdog clocks Date: Mon, 11 Dec 2017 15:36:51 +1030 Message-Id: <20171211050704.20621-8-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 Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 2 ++ arch/arm/boot/dts/aspeed-g5.dtsi | 3 +++ 2 files changed, 5 insertions(+) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index cf407b4db630..2e3666d4fbeb 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -177,11 +177,13 @@ wdt1: watchdog@1e785000 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785000 0x1c>; + clocks = <&syscon ASPEED_CLK_APB>; }; wdt2: watchdog@1e785020 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785020 0x1c>; + clocks = <&syscon ASPEED_CLK_APB>; }; vuart: serial@1e787000 { diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index ab26156d6822..24bb2d16b900 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -219,16 +219,19 @@ wdt1: watchdog@1e785000 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785000 0x20>; + clocks = <&syscon ASPEED_CLK_APB>; }; wdt2: watchdog@1e785020 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785020 0x20>; + clocks = <&syscon ASPEED_CLK_APB>; }; wdt3: watchdog@1e785040 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785040 0x20>; + clocks = <&syscon ASPEED_CLK_APB>; status = "disabled"; }; From patchwork Mon Dec 11 05:06:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121320 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2370876qgn; Sun, 10 Dec 2017 21:09:28 -0800 (PST) X-Google-Smtp-Source: AGs4zMYsOG8TD1OyEa4VTeBC6NLPKTAn/NJqRnkuTM5QNOPD7WaMcbeIiEocAB6noi6ngRkND3o5 X-Received: by 10.98.102.74 with SMTP id a71mr6085621pfc.184.1512968968513; Sun, 10 Dec 2017 21:09:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512968968; cv=none; d=google.com; s=arc-20160816; b=ZcI0GABFxFmELmXyAGLZbuaYNZcXUy42k/5WpYLTcmA6S8buy4jxWmERSCajoXx0Dj B3HR1Q4938GcZ8WGuu+usI9CyASrMUch/wFSv2r6be3+J6uhR5rreI1W61Qh5IhVpAV2 vRruI64jmjr7nthpqwY4cfhOQUmaki8XQvfPAZYEtgO4SvT5m843x/0v6nU4myXZAeYe gF3ToZeecrNJK4QK8ZErwgJje9+EmZE4iwjGKNcUVV/EKePEk1DKXOQR9FI4x3sHQanL FcY8ygM8KWFmQ5OKz9zAYBK++SDy13C9SW0IbQM924X1GjTIQETq0z2kteby8Es25VYV 0J1g== 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=geRSmLXPVH4DGmsAu9Uy3SgxCprz45cFvvwXPSqD9vA=; b=rk8nEb4cDDWh/lIaaYQrL4Vp6CKulXrHFVmNYeExoZVlD/CmThasbQf9Tm7MQUY6CQ DOKuvj1n/mSDr8Hbjma1Yzz5LIc8Km6RMMUBibl3awlO9YfVFsbtv67t4Ncz3KnZUvmi AIBN6ZbvYQ43U7PvBWrUyI/GjtUxurUjpmzjjWpaZ98VWnhWUSv0Y1jND8dBfA8TizVy FP666mm8PX5wSD5vcDDaK9OvHhcLkEaCkr7BiMt2iImQiu6Mx2Yvz5Yc/xqIAwh4s3Ec j0VRPOaAv8mJaHIbHqAVRS+rFsqgV6uIP8Co7Wbz1Q4gi/WHk5llrsD0Kdd6w9vzCrvi mzyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=kTyx5LX6; 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 75si10402378pfm.352.2017.12.10.21.09.28; Sun, 10 Dec 2017 21:09:28 -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=kTyx5LX6; 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 S1752593AbdLKFJ1 (ORCPT + 24 others); Mon, 11 Dec 2017 00:09:27 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:41236 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752259AbdLKFJX (ORCPT ); Mon, 11 Dec 2017 00:09:23 -0500 Received: by mail-pg0-f68.google.com with SMTP id o2so10144767pgc.8; Sun, 10 Dec 2017 21:09:23 -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=geRSmLXPVH4DGmsAu9Uy3SgxCprz45cFvvwXPSqD9vA=; b=kTyx5LX6xr6hK0q2NVJN2wGOntZdoHBstvc5qTCcHm4BqxL/VNAc/OAkR8EqSIvNGJ bzEnOEY+FiSvuadT0l6uHr+kTQg01ilUp9OWlRmo2GVw0tMRFBCj1CyaBBoJVKTw9hSd mxYKiwAtrfOrha1TecTw0/fLECdK0U8EOIp4uH61uXNqcwAiv9/S4qsudDcmOHhkpego oG/IJNBIGMXzkY1hPoOCAmHjriF09VWgVWJiVpfLjS+MrufDLsKgqFIjGRJS0LQsvzpt oVUt+uc2Tv+0DMCeLwPBl1LkFiPPS2R2YGwEHYoyQr6LJtiPq6PSpkQx2prFGR9fl7yd fxEQ== 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=geRSmLXPVH4DGmsAu9Uy3SgxCprz45cFvvwXPSqD9vA=; b=SOttgQcaGvuawfQE8Q/0uNarKb/npdEwumRTm98pcYKeR5zTIS/+reYRgYdjvbCtBD 2srIbD/0y7NL1L7B9dy3Rv5lI6fIN5bCnz+6X4g7msqQcrKYmTVPbFKgDv8/T0k86BZX LikBeuI38LrxKeJTuz8oXGJbyxvcLlgAcX19meBJ6J9RpbytwpfXwax6tXF2GxvTSSNE RO+LyliqP3JWzP1pn8G8bLPlXv+Wuk2IXW9UeVNd+zMlPAopZEpH82f31xkglRpk/G8+ 8sCZVaoO6JpkaaI2qP1LANxCw43sEUqYt3UxeY757Ey/+GikdtKvjLLcmrC+Fr836uGG 7Pqw== X-Gm-Message-State: AKGB3mJ21dsq5GYOx9iOc2ae7/d0WC162ILMpNq97I5KVI6t53TCGNnh YfPurSlH/2lREpeXmxvz6yM= X-Received: by 10.98.93.92 with SMTP id r89mr6167059pfb.1.1512968962831; Sun, 10 Dec 2017 21:09:22 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id e9sm24313142pfl.138.2017.12.10.21.09.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:09:21 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:39:13 +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 08/20] ARM: dts: aspeed: Add flash controller clocks Date: Mon, 11 Dec 2017 15:36:52 +1030 Message-Id: <20171211050704.20621-9-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 Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 2 ++ arch/arm/boot/dts/aspeed-g5.dtsi | 3 +++ 2 files changed, 5 insertions(+) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 2e3666d4fbeb..afac0ca0cb10 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -56,6 +56,7 @@ #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2400-fmc"; + clocks = <&syscon ASPEED_CLK_AHB>; status = "disabled"; interrupts = <19>; flash@0 { @@ -71,6 +72,7 @@ #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2400-spi"; + clocks = <&syscon ASPEED_CLK_AHB>; status = "disabled"; flash@0 { reg = < 0 >; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 24bb2d16b900..f3689caf6fe2 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -56,6 +56,7 @@ #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2500-fmc"; + clocks = <&syscon ASPEED_CLK_AHB>; status = "disabled"; interrupts = <19>; flash@0 { @@ -81,6 +82,7 @@ #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2500-spi"; + clocks = <&syscon ASPEED_CLK_AHB>; status = "disabled"; flash@0 { reg = < 0 >; @@ -100,6 +102,7 @@ #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2500-spi"; + clocks = <&syscon ASPEED_CLK_AHB>; status = "disabled"; flash@0 { reg = < 0 >; From patchwork Mon Dec 11 05:06:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121321 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2370982qgn; Sun, 10 Dec 2017 21:09:40 -0800 (PST) X-Google-Smtp-Source: AGs4zMZNJLmDQdkSTPQcioPwnhZzNRnaIwo0VsfUMB/2YU5KItjFYqL5jkZbBMrexzLFRfzvaO7k X-Received: by 10.84.253.150 with SMTP id a22mr27558997plm.65.1512968980060; Sun, 10 Dec 2017 21:09:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512968980; cv=none; d=google.com; s=arc-20160816; b=kDiZot5Q5q4Z3H78giteadhAITdLrcKztBL7NQZVmiT83EXAx5QIPhXjJ68fZuP0iF y9aPOtUXPS9kvf9Ze4p71hyh2+2r+9V/t6e6QNmInW4zm46ZCUbUTAIkmUB6XPBF+eVz P+h3v0g9TzTw8Oh7iY/Bi6YnJn50S5QoqC8alFnCJA4U9H06a4PnPIdBk3JuD58CBkPB 3y4DsbIs1RLZ0Bm50wyXyC7dmf3pRu0kUtErk3J5xa1PnL38O2NwPzBIxKypzSfWmvFo R1XEsWuwWxl3/IhUtf8/x1hJx//aGHfqsld/o2dqhubNCaf0tsW+9ZrAbDOjCSmqeOZo mYvg== 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=7lgUcKlrUZcoL+HC7TB9Fdchpbq5zZ/7QV0LwjyuFpo=; b=Peq61/+Nt4rjT1d12DtYghx7FZgpimvEEBS9e6Zuous2x5v/XXN2UQifgWZKfp6Q1Z cNyZzXndB8JV6YpaNzVBYCN76qTUE+OW2G004doRD1RWQ4/xZ/znCz9H8LCuoap+mlSB 7Cwesc95DcMjINxZ374BiAsZngpNHtPRbTbNlDPF8lqMJNZyemazW43+u8dBjTR27YTD jNe8zZJptfbvT9cAWJc/DFqypJShgi+PK8L6VjPzdBTWUuc3RogAl3WW6elxecySKsnV MaeCOTow/726TreeDtPimxsDhEdiP0I6q9aTztMQhUnnY7Ou9/QgUpRpXzdNlxSWARNW BQzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Iadl8K/q; 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 j137si9319274pgc.831.2017.12.10.21.09.39; Sun, 10 Dec 2017 21:09:40 -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=Iadl8K/q; 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 S1752612AbdLKFJi (ORCPT + 24 others); Mon, 11 Dec 2017 00:09:38 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34293 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751274AbdLKFJd (ORCPT ); Mon, 11 Dec 2017 00:09:33 -0500 Received: by mail-pg0-f66.google.com with SMTP id j4so10159020pgp.1; Sun, 10 Dec 2017 21:09:33 -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=7lgUcKlrUZcoL+HC7TB9Fdchpbq5zZ/7QV0LwjyuFpo=; b=Iadl8K/qyYjZG3a1dzTngSnj3T8aASuNAEncVJzrwdh70TBCOF9i7JYlMpsexG+6aX JgNDWYb+Q7I7dmi63MF4jwTAh7QtBydAvbNbWIhDUeneubWQeAH0PCkd58bNM0HOc1wz RWzLRWqr1vaj1EdNtBrZ2aQb+dR8jjuG3L8FVOGwYeQKQ/snLNPQ+XpbcgEKgGj9ham+ 0S210/Nji/+wgvpRZemc0XtoAb7jsS0ESVTap7Hm/6aLxxHhvcmP6rJcBVgSYRTUp9se O0Z/92KWKmmc61gX2MBviAe2N/2OKegFLahmrwuf+5tKsnioKtBcc8b3A4UcfAPHNRtY Lciw== 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=7lgUcKlrUZcoL+HC7TB9Fdchpbq5zZ/7QV0LwjyuFpo=; b=Z7OzX0VH7WrLVDQ7YbIaSpWE2t++xM8UEqj+96Fo8w8noT4U+Lg0NSJQHzDnqXxLBD 6D8MXnB1PUfmZOw9XI3/9GawayoymRxeVmfS7it8LD/hc6QZcrjNRbqILqM9AkRfAQBb LmjbJ8tR2qkY+WWd7vDGTSwgUsAXRsaHCDyhsvFxhC4m4RPL0YjPkbT3Au2OlAo92EX9 tf1ftxfxUFXLFvhFesb0KyFkZr1h4BzpqMAsP5baYWk6oS2aMJFjEKpGksuKwgKfXuwD KuSPHCJbRqfTsJsAWMK3Ne3FVsxQD82UpesqRgnkmWST82V9Hkiv6DzK7EAjoZp6VzoV fqWw== X-Gm-Message-State: AKGB3mIpKmmYhFOunzdL4BUvcb+oeblxyTp/cZygR5aay1tPOVhqwRKh y7lKY8AtOgCHxAxU21o2/Zo= X-Received: by 10.84.232.141 with SMTP id i13mr5256658plk.315.1512968973057; Sun, 10 Dec 2017 21:09:33 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id n12sm25394382pfb.5.2017.12.10.21.09.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:09:31 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:39:23 +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 09/20] ARM: dts: aspeed: Add clock phandle to GPIO Date: Mon, 11 Dec 2017 15:36:53 +1030 Message-Id: <20171211050704.20621-10-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 This enables a feature where the driver can debounce inputs. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 1 + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + 2 files changed, 2 insertions(+) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index afac0ca0cb10..fa52a01f50b5 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -144,6 +144,7 @@ reg = <0x1e780000 0x1000>; interrupts = <20>; gpio-ranges = <&pinctrl 0 0 220>; + clocks = <&syscon ASPEED_CLK_APB>; interrupt-controller; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index f3689caf6fe2..5e6db2aa5c23 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -187,6 +187,7 @@ reg = <0x1e780000 0x1000>; interrupts = <20>; gpio-ranges = <&pinctrl 0 0 220>; + clocks = <&syscon ASPEED_CLK_APB>; interrupt-controller; }; From patchwork Mon Dec 11 05:06:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121322 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2371091qgn; Sun, 10 Dec 2017 21:09:51 -0800 (PST) X-Google-Smtp-Source: AGs4zMb2ogPga//2XdjAxwmerUMOwz42T1LLJNMB7CQ1Qenth0sNHT5O6mydZNPLTxhH04mnkREC X-Received: by 10.98.58.208 with SMTP id v77mr10420561pfj.150.1512968991097; Sun, 10 Dec 2017 21:09:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512968991; cv=none; d=google.com; s=arc-20160816; b=h9kL2Gc2xa12BGY6VTzoUhJCxbZYxZJARKAwHpjfpN+HxGzVPpyoM++aMKEtXrBmGr DTYF+TOOxdrSUFYHUUnRa5m+84mIYdtZUOSCWsAdMy9qEu5yD30Ak90ag91HQ4qrwRnR rRPTZaHHX2UCK8hEFBEPWURTdGPsfw6ZBnxQZKmLmF4F1akfAozNFT35F0D8nNOl5gDq sKKh09zMjHqnb77QgKUOmSN8y29Q4HzJ/RZ2UcYnvo22OWB7mz7nRtt596U6tl4/KUWK ET6GJGY0zoEEoB6vc3Q5+4urrysndWPw+9KtKkF9MR+xhzHloMeAAhceHjS2zeXeTXWt WuOw== 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=usXMvqPHj9RNqriSpcaWOC/U72N8rb7Msxr5T83F3TA=; b=CPt+AYI8RWGUbH8VCK3KyD2VRdu6036p5FxbymsHxCnc3qBOAhN7r319CQEcrEdhYK rI/RnskPZLlDLs2RRy80MnVUx64XjZYjUPbUQ1bg+B8+xsVUHzyYNQqVUJX6A2kH2/17 s0DFN/VGR7mJjyniih7BjCvr5LxmwYQEYWReRz1V1xuXQmo9iNLRvklErbxoPEXiCBXz dPMirdj+Tacc67G03TjGilZ4NOTyJXrvDRg103K7lqVoBuXBOqiZWR5kYROkXkS1x24M mDxSDb0Ip+XQfGsgSdnQrn2IBAdEB9oAkEK2xVwoDiDcV4RHAgG1g4imLXQvuSA6JbXA PxBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Zy5so36X; 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 j137si9319274pgc.831.2017.12.10.21.09.50; Sun, 10 Dec 2017 21:09:51 -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=Zy5so36X; 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 S1752632AbdLKFJt (ORCPT + 24 others); Mon, 11 Dec 2017 00:09:49 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:37504 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751274AbdLKFJn (ORCPT ); Mon, 11 Dec 2017 00:09:43 -0500 Received: by mail-pf0-f195.google.com with SMTP id n6so10731510pfa.4; Sun, 10 Dec 2017 21:09:43 -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=usXMvqPHj9RNqriSpcaWOC/U72N8rb7Msxr5T83F3TA=; b=Zy5so36XrnRtXBV32I1xi8qHtLxpQWSEvejicHG4tre2+t8dORXlOdnLzLji7+ntm+ jG/38u1OBipM3JI/sxvluc+yzMx/0Vlno09QC+F6TLy1BH644mJgRVgRiOhMu6/gIBUG pEapI+I6p9THp4vCWiMV0iozt4B+KFw2DnIznTLl7zN83i7UawhaOjMIH2LRAIuvkfX8 F16YnDAlbXcbqhdzGA73KlqA2nFnSbrys+T4VxiSchEbY52N2af1+qGQUejN27QwYDkt Olw1EYMSVxePkNzITjmnC3RC47BPIBxmA1PSlhp4VYYxeDXzV3W8JeWgCRW8GXvfTxJO VQ5g== 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=usXMvqPHj9RNqriSpcaWOC/U72N8rb7Msxr5T83F3TA=; b=IAGfH1YUiwBIGwzz83+y/wgDd2VDhJ0Xp7bs2iXRNmZQqEJEI18RRy+fKfGnemax4S nlCQ9ZiN+dHNNljI39prJCvSRqpOWzWIlQzNc8KI14/XMYKshY75mEUZi6/qTNKjFWSM xX4dh4UnhD9QGooh4QxZqK+QD8607foUcVJvVxRg61ZU0vuvRDQBp0IXmAcGp+pV01KN tkTm/iP5htDeWPJOrl2Vsii+pkMMM2KB5yPaJfKCkt84zyu5TgGeALvTulE6ANTfeDJM 0kvpLD2PkFFvG7DSbzRre2nrgxWC2zdIZB+i6sQUgkFYZMr0Wx/tOGXIYHo6dMI77iAe OOMg== X-Gm-Message-State: AJaThX40oPvuiZOA1HRYiD+twqR4OhSiwAkIKGfkaB+holxFu7Ri3w+t G8mSI2eqTO3IxLqktGNx/58= X-Received: by 10.159.198.1 with SMTP id f1mr37507098plo.450.1512968983017; Sun, 10 Dec 2017 21:09:43 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id t62sm19920025pgt.23.2017.12.10.21.09.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:09:41 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:39:33 +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 10/20] ARM: dts: aspeed: Add PWM and tachometer node Date: Mon, 11 Dec 2017 15:36:54 +1030 Message-Id: <20171211050704.20621-11-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 Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 9 +++++++++ arch/arm/boot/dts/aspeed-g5.dtsi | 9 +++++++++ 2 files changed, 18 insertions(+) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index fa52a01f50b5..f6fee40c04c0 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -189,6 +189,15 @@ clocks = <&syscon ASPEED_CLK_APB>; }; + pwm_tacho: pwm-tacho-controller@1e786000 { + compatible = "aspeed,ast2400-pwm-tacho"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1e786000 0x1000>; + clocks = <&syscon ASPEED_CLK_APB>; + status = "disabled"; + }; + vuart: serial@1e787000 { compatible = "aspeed,ast2400-vuart"; reg = <0x1e787000 0x40>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 5e6db2aa5c23..96a9d2fe3f0d 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -239,6 +239,15 @@ status = "disabled"; }; + pwm_tacho: pwm-tacho-controller@1e786000 { + compatible = "aspeed,ast2500-pwm-tacho"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1e786000 0x1000>; + clocks = <&syscon ASPEED_CLK_APB>; + status = "disabled"; + }; + vuart: serial@1e787000 { compatible = "aspeed,ast2500-vuart"; reg = <0x1e787000 0x40>; From patchwork Mon Dec 11 05:06:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121323 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2371173qgn; Sun, 10 Dec 2017 21:10:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMYiwlJk+WEp12Y7bIdC3FwTyA1EILoG2GF/who/OtA8T9+2ur9YrmFcsEKIfkd0MnbwM/6U X-Received: by 10.101.101.211 with SMTP id y19mr36673444pgv.138.1512969000308; Sun, 10 Dec 2017 21:10:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512969000; cv=none; d=google.com; s=arc-20160816; b=RTmraBH/s4BE4se+jp8CFnDq5n6EKsPghAEyGFriAHq3CBrA+1x0hsSuDjqSNXza7d iLkzh1JQtsSWDrJHT+jSU4O7UvbwoP6WFjVLOUroP7Ve8Yqh/9AUByZWtxDcNURkR0WE olwDmBKXwAQIRaUE6eTXN3MLqcI+rpYmMxHK9Yf9xiXFzY8kQMieI71tq3I3b/yBYlnx nXuXIEsnsO1taa1HA9FR0Ks1RVApeXc5sFKt9X6JjEQgrOLaLktzLglFH7LJeLNvOB5i iXdUC6d5anuPBmM/2nY0RZK4dPwisraNJsXxTCeKAEb6Xp7d2q92L3LSF5w2iVOY8pkV XDVQ== 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=JU6whANX1vnxj/PgmMAVIYepVAiG747vm43w8vJuVec=; b=XEK19NUGjDy7ZvtHrHuR+GMPueA7C7qpBVdJHoUrmExoH0ooXI9oWDvqM57p/sYvZ7 a1gfSHTEqlF345hOHmMJg5qxfKE9ry3xACOjkbNaXrOWo2QNeNq13o1doGLotNHEjx0v fAZ8HRCW0ZvWCFF3NHaGpXYp+PFcg5ALIWOqwvFPdN72dUzDlZBG7Kjx55S7abB4nQEp 4DNnre+76DejuNX5EgTBibsBa25BEEV1AQGpkf13Xri5d0tf61IOhzoQqCJ2tebaIEXi WqgQHBiE/PLq6FDNLs3S3wtEEK3XIg3LDUmlJfpnNmo8LYLljlLROTSzFrVTR48KYM/3 PwaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=tNeIlx10; 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 c15si9329972pgu.316.2017.12.10.21.10.00; Sun, 10 Dec 2017 21:10:00 -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=tNeIlx10; 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 S1752654AbdLKFJ7 (ORCPT + 24 others); Mon, 11 Dec 2017 00:09:59 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:37518 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751274AbdLKFJx (ORCPT ); Mon, 11 Dec 2017 00:09:53 -0500 Received: by mail-pf0-f193.google.com with SMTP id n6so10731748pfa.4; Sun, 10 Dec 2017 21:09:53 -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=JU6whANX1vnxj/PgmMAVIYepVAiG747vm43w8vJuVec=; b=tNeIlx10yBoKtTtX/lUxlyi2TW1mdnUjUrb8MGfvw/v5Th3PPX6vpYIahopcjE57Df xgZxSe5+Im603dcxkBLmKIGc21RXXb19vSxwQ8p0rR/7lF8f5BhFl3VVeiU8rbYr/A/q loRUx/DjN/Y37doqsu097gvDuy7fYnQ3W9MeGZGNgPiHlXqtWYnhiPRWU9ASB0DdSkSn kTlsy/3EVMC+h9lXDJkCYfnoFyG+qRsRMoqZtV/Zz1lIzY1wVPILOdFniDW7pRKwMCcQ TDStNLYR1wZM71W0uh0f9fpHd9zacZvEhzA4RnpskGuDpm0FA96nic7WkcYUbtmBi/83 l7sQ== 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=JU6whANX1vnxj/PgmMAVIYepVAiG747vm43w8vJuVec=; b=VLvtKuyCnV0KZdu7I6DVZTgaj51W01MyaCUMDvXr2xH7+EtiEJx9oUC6I6aaZHuJbv UHkTaIQSKq1fTT3ICtwZohLNTTsi8KzD47rrduFHut8E0oSXIowADn3EPDYXNaaGNAus QfGxzv1xne9gQg5mTuGkHgWA1g6gOJ6T/GQ9eBi75LeE2nsJoo6ANrdysnYib/7nMvYV 53HXXrZMxJTAYOsFLcjt7DL5p9GMFcHUop+Uiv142mhtLiEuPIvCsI/kWAQmFpgP55Rg mRlagmr3BpZDflyY8UNC/HdsDFAhBG7rrm4MF6alRRQNSLhogZZmfIdRDuQ+bqSnDS+3 Gniw== X-Gm-Message-State: AJaThX5Bf0BJtxcnSoRj1IRD/Nf0OYa8eymQLxgInA//LP6/RAyZAxrO V+ZYz4bn0bHLBI+c8gfqFvA= X-Received: by 10.84.195.36 with SMTP id i33mr36766987pld.27.1512968992824; Sun, 10 Dec 2017 21:09:52 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id r68sm25050713pfb.149.2017.12.10.21.09.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:09:51 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:39:43 +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 11/20] ARM: dts: aspeed: Add LPC Snoop device Date: Mon, 11 Dec 2017 15:36:55 +1030 Message-Id: <20171211050704.20621-12-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 LPC snoop hardware on the ASPEED BMC, used for monitoring host I/O port activity. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++++++ arch/arm/boot/dts/aspeed-g5.dtsi | 6 ++++++ 2 files changed, 13 insertions(+) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index f6fee40c04c0..b3580f37f507 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -236,6 +236,13 @@ status = "disabled"; }; + lpc_snoop: lpc-snoop@0 { + compatible = "aspeed,ast2500-lpc-snoop"; + reg = <0x0 0x80>; + interrupts = <8>; + status = "disabled"; + }; + lhc: lhc@20 { compatible = "aspeed,ast2500-lhc"; reg = <0x20 0x24 0x48 0x8>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 96a9d2fe3f0d..50766f0629f8 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -287,6 +287,12 @@ status = "disabled"; }; + lpc_snoop: lpc-snoop@0 { + compatible = "aspeed,ast2500-lpc-snoop"; + reg = <0x0 0x80>; + interrupts = <8>; + status = "disabled"; + }; lhc: lhc@20 { compatible = "aspeed,ast2500-lhc"; From patchwork Mon Dec 11 05:06:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121326 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2371590qgn; Sun, 10 Dec 2017 21:10:33 -0800 (PST) X-Google-Smtp-Source: AGs4zMa/QM+c+jiFQQnsUVviMvdx2ZGmIjlI2QT5w22WzH4vdC/Bm63oNNSra+Vgl5QyDY2ohL7d X-Received: by 10.84.143.34 with SMTP id 31mr10090450ply.446.1512969033734; Sun, 10 Dec 2017 21:10:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512969033; cv=none; d=google.com; s=arc-20160816; b=tO/LXO1yEVvJfpXRU5H60vLBpPn2JoGwcJ7kgr6l7eWPvZesQ5lpy1mY4iIhFkckpg CO/iD1eCtixSJoqRRkTKjdUoy7jHAREFtFv/7xX5FvJOg0WhEYMkiPD4BARcHMqGZ87+ oj0PhLfweZj6E4VShpsxomTglQom7c3hZCvR/BODPs45xCnAZCd/6jmaIiN3ECRD/R7m ht+CCxuFhubJ8OzkTiqjAEroNxH3Tjn3FnplysufTqqRTNTsdzI81WIVGLE6YSuc+iJq 908N8Iq2oa94fW3FLRn+rbSmLysWruulxDBVdogxlNtKeTWAuXahpMa+gCLlWOjdmfpD KKkQ== 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=V2xKeTbA7vMM9cLogMteGhhUVwqNkCCemikiOy7t1uk=; b=1JMzQ/FPuSkfbbjcgVjQyeIv2sPbBiWmCObj7HdDbZXC5x628QEZiyabfsaiFQAnP9 A1fUCFdHEB+/zMyaLv5rq0lK6gOyXQYSAZ8itFtBZwoDCJkSgbSU9JBQpfUC43ottTJT jm4wMsfdnzo0fwfaAfnSJckY46wFNwHiITmoNGgVvRU/tXCpmsVt7ON5C2YuNIjKV5ji KeJMXc/6L4Z/2tZYPdBy8wOYhQ0DtjIuVRwNxDsjwjFRV/HOkpdrsAeewe7MJ1zK45v0 fW96qcZt44pi+Xkly+NB65+/M2+scTiWciF7MrMWXOQcJF3VPnBImJg10G2d3ml4W6qp I5jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=OS7KOL3Z; 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 c15si9329972pgu.316.2017.12.10.21.10.33; Sun, 10 Dec 2017 21:10:33 -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=OS7KOL3Z; 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 S1752720AbdLKFK3 (ORCPT + 24 others); Mon, 11 Dec 2017 00:10:29 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:45572 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751622AbdLKFKX (ORCPT ); Mon, 11 Dec 2017 00:10:23 -0500 Received: by mail-pg0-f65.google.com with SMTP id m25so10141739pgv.12; Sun, 10 Dec 2017 21:10:23 -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=V2xKeTbA7vMM9cLogMteGhhUVwqNkCCemikiOy7t1uk=; b=OS7KOL3ZUJgEVtGKO7EForiF0sdt7xsqFHxnWLMS4X1qT+NEEvAC6AzgqM3riSFn2C eW/hASQtls71h2X9+sDFkIrv7lUZjObDjAhhGNtYBF3Gb0+bbb0D9rXoI4uqWRGEanj5 D9MclSFNVazpx0W490FDe+kK8cdUkXyBxl1Gvfi4hm9xvIuU7cnsop3z0D5hHYBIEEYj rJC8Kem83zjtG/Wke5dS5r+nOgT7PdRoitRA7d47QlJjMID4POomlTr9HxNpdBlW5gEK eVTE75bY5VKklWEMzrmrMI5xOU2djrHDXnJPRv5wHMjdtmOwmKoQW0lNvDpNgKTqdZ/5 tAvw== 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=V2xKeTbA7vMM9cLogMteGhhUVwqNkCCemikiOy7t1uk=; b=qabol/+ZHX8TdFv69Zr7vcA2/gJ1BbfKCGPj5aUeFPRNg2VxxCnfOPaHwwz96swCm/ IcR8hmqEuYkM/HkiJPTqKgsx9Y2Alw5otvPsdM/QyvNkU6wo60aXYRwU3itwtdcqb3/4 DFzhksKZ21dWM1IdwSa37VxG+raTArcWJMZ14eJWDC5+ifdkE59fIhDK+VcSydPa9KON Pp8UjklTHGn3EFQnwv/esZQHr/+hg/6aOq84c9dc5NwJVjCNJpOTRcKtgLhP3Wtv8dhg A7tMVwCjkcW6S/MMaHrOR0pDYWDmpN9xQLWnGTaJRw+WSOgSYaBLahPJPh+iY64l/Xw/ tgOA== X-Gm-Message-State: AJaThX7NL47TWQFSx6SrLFKE9EKpotS28XKGGMiBa14gPlpnXDMl7K0n TJ5Dwx/NBmhzzSBM9jvrv0o= X-Received: by 10.84.229.5 with SMTP id b5mr38372686plk.405.1512969022509; Sun, 10 Dec 2017 21:10:22 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id q69sm23452550pfa.161.2017.12.10.21.10.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:10:21 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:40:13 +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 14/20] ARM: dts: Add OpenBMC flash layout Date: Mon, 11 Dec 2017 15:36:58 +1030 Message-Id: <20171211050704.20621-15-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 This is a layout used by OpenBMC systems. It describes the fixed flash layout of a 32MB mtd device. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/openbmc-flash-layout.dtsi | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi -- 2.14.1 diff --git a/arch/arm/boot/dts/openbmc-flash-layout.dtsi b/arch/arm/boot/dts/openbmc-flash-layout.dtsi new file mode 100644 index 000000000000..63ad8db7a431 --- /dev/null +++ b/arch/arm/boot/dts/openbmc-flash-layout.dtsi @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ + +partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + u-boot@0 { + reg = <0x0 0x60000>; + label = "u-boot"; + }; + + u-boot-env@60000 { + reg = <0x60000 0x20000>; + label = "u-boot-env"; + }; + + kernel@80000 { + reg = <0x80000 0x440000>; + label = "kernel"; + }; + + rofs@0c0000 { + reg = <0x4c0000 0x1740000>; + label = "rofs"; + }; + + rwfs@1c00000 { + reg = <0x1c00000 0x400000>; + label = "rwfs"; + }; +}; From patchwork Mon Dec 11 05:06:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121327 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2371671qgn; Sun, 10 Dec 2017 21:10:40 -0800 (PST) X-Google-Smtp-Source: AGs4zMaxUwQVPUH6/+23Yfal+RurA1dxfIF0nPzffi/3VRy1URqaVt8hkrAm2BtKh/Ggpv9DWhd8 X-Received: by 10.159.242.132 with SMTP id u4mr37923077plr.296.1512969040370; Sun, 10 Dec 2017 21:10:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512969040; cv=none; d=google.com; s=arc-20160816; b=Eo5OlRq/HWPWc1G+1E9NETlkohR6lMe9gwe7txOIqLrfHQqP2jgrFbFXWRhoBU5ODo R1G80yIPXbUP8e02gcPePSqyGBmUcwDqayr10Eswkou0+53J4NqwjIPdHsNNld12VmkH brft5L7qzgAxyVglIVIG7+vzhLM6rTbFHA3T9qXLlyAkvRHCb/gak/25iwn7ys8I6/Ki saCeIgyq9MgGez85CSnTjfHEQ/38co30OhuB2DLpNF0bZg/kfg0H/hkbpkZInHrSlDyo KlCkzeZdfXHkX40PihOnVYKAcMRjtVhiobzko9YdKlSln0HeAKco902oUFXalM/sP/iF oERg== 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=NhAr71gR5EPDzNzYLSK4c8Ih53MW4jfj7Caj/cp9/O0=; b=br05+xjx16OxLZ3qbaidRx3jWy3NaljCYAfrbkU+Sa4m4WYBCngXt3ev5YAhIJmRdG az0NvFLb+DNYuLBDuy63vyOiCUEozC+BYTMEGy3Fb67H2zjVh2TOMYMa+UyHCNrHtEGe BmmzT5ZyVLseDdxK4WSPWsbtq8v9QnxvpsQ/CWfY4Lt9vuEwzOwxzpGFX1LzAommX8Qn ViKvzQoMcBWygfYmcfkuFeJc25tT+d6AChGS0ijVEw9y6OP4wpHkoYSw1AMv/Y5xZLm9 KcjXy1rIN0LSh+xGSSCdNhMxvxKsTmAEl08Pu7jQIH3o/ejXunOggMBjexKfB/TpG65m P9/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=kQXCnZWp; 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 c15si9329972pgu.316.2017.12.10.21.10.40; Sun, 10 Dec 2017 21:10:40 -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=kQXCnZWp; 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 S1752749AbdLKFKi (ORCPT + 24 others); Mon, 11 Dec 2017 00:10:38 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:45584 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751622AbdLKFKc (ORCPT ); Mon, 11 Dec 2017 00:10:32 -0500 Received: by mail-pg0-f67.google.com with SMTP id m25so10141976pgv.12; Sun, 10 Dec 2017 21:10:32 -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=NhAr71gR5EPDzNzYLSK4c8Ih53MW4jfj7Caj/cp9/O0=; b=kQXCnZWp9ZvI64zPxgONeZKWVjcFm1fvt+FP1gYYteNemK31yKQ2PoU2M3++vXfjWE l4tauI0q+lLgxbyY6+I+Y3pDgiRTG2B6Kc8be9QgIOvNSQmxSjcqV1fS5TJzPavKFsii /vFTNBxM8alKmCh2S1Dx/FysR9qL6CwtTZ4JORek3CYTQbnXkBwZ9gszSuTaapXyZTzn PQw1m/GF/OOT1XE+AyJehQm2tfnKk76Jha4+rhiHI4dr1B1OlAkrlI0353jI3PcWi96a 5Wop+cLaNqQsBAKTlGrnZzrYBRniorZVqG2C+t9SL0iZQ6FsMJMnfCaH9E1U0gy2Q38F 89ZA== 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=NhAr71gR5EPDzNzYLSK4c8Ih53MW4jfj7Caj/cp9/O0=; b=Ozw4akSgVWJuhnfAkzhzucyZk+kU5qYIgFYeeIagewOXmcnZh0RL+TvBw885JeEGG9 7pUukIJdFGvEUXsllDTdDol/SGwsj/SMc6oQAMzY79uAo4lxVw35wXRx6BUiT49Mrjmf 57upaYt0XC9OxLXIeRf08DhMY1sTifjIeHPtjoVVbg3Rq2AdxB+IiIcJZolV75KVzg72 CYA6I/NeRY69YnUio2833BwOiCYwREm4Hlwl0XkugHVMBs8XTSXlLIHR3HvluKIl0sy4 77vpe5Dc1zQuY75OXQA063JekzSiQA/whjBXZVsmUMEtBqATMVxOjwb4CY/scER0z5ju Fs/A== X-Gm-Message-State: AKGB3mK23cR77XC7R0faIWL6pvh7K6Fi/PjO/cT4c5zKYPOpxV57ZfS4 LkY0sV4z8gvUZNp7lPVSUgc= X-Received: by 10.98.11.71 with SMTP id t68mr6045619pfi.79.1512969032316; Sun, 10 Dec 2017 21:10:32 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id y19sm18553076pgv.19.2017.12.10.21.10.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:10:31 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:40:22 +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 15/20] ARM: dts: aspeed: Sort ASPEED entries in makefile Date: Mon, 11 Dec 2017 15:36:59 +1030 Message-Id: <20171211050704.20621-16-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 In preperation for adding more boards. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d0381e9caf21..5d1e9d37bf3a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1101,7 +1101,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt8127-moose.dtb \ mt8135-evbp1.dtb dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb -dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \ - aspeed-bmc-opp-romulus.dtb \ - aspeed-ast2500-evb.dtb +dtb-$(CONFIG_ARCH_ASPEED) += \ + aspeed-ast2500-evb.dtb \ + aspeed-bmc-opp-palmetto.dtb \ + aspeed-bmc-opp-romulus.dtb endif From patchwork Mon Dec 11 05:07:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121328 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2371794qgn; Sun, 10 Dec 2017 21:10:50 -0800 (PST) X-Google-Smtp-Source: ACJfBov/8DF8Eud1VGBih8x96ruliU7KUFYdGmfXf8edNiPtK+MSz9lYSGm7jTKD4QSQmtewScJh X-Received: by 10.84.242.134 with SMTP id d6mr891776pll.98.1512969050151; Sun, 10 Dec 2017 21:10:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512969050; cv=none; d=google.com; s=arc-20160816; b=tS2Gpo9zsvh6mSBH7FC5SN9JhubS9Veyf4SAGwIJSsiJaMkV8fIdmu2U63eVs4T70C I4TGY9j4Z+fz5Ei1aSTzpInar/1+4Bfh3H4XPETHleqtLciSvxnLDX0ypmyTu0agquq6 1RyKsbtClPYld83OA42h94UA4BVhqkjHL5r5SO8NW93akUzTUZgqbr34Tz2th94ef8aP 4xsI6xW3BohZ2rzyCcAttBiT4glk4PxOds7M5Z7QjHElDoi5h+QSmXcb/oM6WexREBG3 9zCXKdxWyaNnI4IDVaTBzTa0aJNxKfmDJc1NUlK2dqcnXy8Ojfjc6SntZnBpYMz1Oe2J MSCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=H4ISeR+XtJPp+5DHLTLn35P4j9ONZGKcsHNj/YQ1rmw=; b=FAw+LmOJZuWHm5rWOwNhkFDrsZv6pECv+bsyBCNn9IS5fTiYXPDVRnvnP1ApW0zOZo nGUYZUwu4/VrokOXXMhQqGjLxRRKVKIii6N0RmUvY04Y/GlFWSJd91VdoBY6mSUsbdEO PuQuKMFh30GKti9NoUabNcMd0HiJmyA+DmTJrI260TFG8s6iLG4lfDJEBZ6yWzO89+X2 wBA+alU4MFm79K34PXFgOKptW+QuaV5QTaRDyO96N25E4Q6J5/ySNMPJmzyJ1EtzGnyq xAzmVPVvp88CO/NcdI3/Nhhl3PfQEnvCpSQ3cmGj4rAjQdH5ZWzjNqSGrcTrBjr0jR3E +3PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=VLP26G2D; 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 c15si9329972pgu.316.2017.12.10.21.10.49; Sun, 10 Dec 2017 21:10:50 -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=VLP26G2D; 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 S1752755AbdLKFKt (ORCPT + 24 others); Mon, 11 Dec 2017 00:10:49 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:39313 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751584AbdLKFKo (ORCPT ); Mon, 11 Dec 2017 00:10:44 -0500 Received: by mail-pg0-f67.google.com with SMTP id w7so10145944pgv.6; Sun, 10 Dec 2017 21:10:44 -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 :mime-version:content-transfer-encoding; bh=H4ISeR+XtJPp+5DHLTLn35P4j9ONZGKcsHNj/YQ1rmw=; b=VLP26G2DrsewbJSAGaf5g4SEFtgnTiaUDAkOuHu5pOEKym/2PjAH2Fytgki3spCase 9HM6D1jOD6J3yif69tfk6wThfTYNirSlNgjFOXO81MZ4vM26EIkk0SZOt4MI+j/Ncare HfRj712gE7mgrW+ZlNFfq77eGPQMdtHgTc1ZCwgYouvD4KytSDYKjNH1OicKgXOVFM8f uYPLtYe2Ul1yxvYTI46BVRGH8l/YPLhlkhanePr+429bZaLHa5RY59pSi4MH7/nPws+V UkBMOoYdacZldBzj/XFkBiOd3mHR+3X+339Dfp3apcZk7EpI4+6hDDkrjXKCrRzMOjkf 9lIA== 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:mime-version:content-transfer-encoding; bh=H4ISeR+XtJPp+5DHLTLn35P4j9ONZGKcsHNj/YQ1rmw=; b=rug9AcNHLnSETMHvj1u17Nr30ffJ7q6JaJvqtpABUXEUkj8nqcP4QblgU1n6mB9iuE 4CUABcGVWJTc68TqA4cBWTE447advncDnnc0o9zwuFwnhjYLz2by2hmXKNE8tkkqDoQQ y4NvINFNzQv73IioqvPhafdtf10mcFSCCHzLX39oGR2uZlFd6muNbMOtKc5kRTESFYwh zkcq4vPrbayG+I8j3IqcCja1VLrjWp23ganPadAcmHiyyXiTdy/+60Uznz6VWhrs4usA oNhY3I6ROFj0EzO4kwzz1nZigRNkp+4VMW9pOVbOa27bic2unqqCCC3rT1UEgQnnPvr/ 1OuA== X-Gm-Message-State: AJaThX66TccevikFiRa7zDognLE/Ssho2mEdQrYPt67uP1yfv2V6d3hK wmqqj3WJUqur6WRjqSDBS4g= X-Received: by 10.99.56.26 with SMTP id f26mr36977944pga.328.1512969043422; Sun, 10 Dec 2017 21:10:43 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id z78sm25155894pfk.115.2017.12.10.21.10.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:10:42 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:40:32 +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, Brandon Wyman , Matt Spinler , Brad Bishop , "Edward A . James" Subject: [PATCH 16/20] ARM: dts: aspeed: Add Witherspoon BMC machine Date: Mon, 11 Dec 2017 15:37:00 +1030 Message-Id: <20171211050704.20621-17-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> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Witherspoon BMC is an ASPEED ast2500 based BMC that is part of an OpenPower Power9 server. This adds the device tree description for most upstream components. It is a squashed commit from the OpenBMC kernel tree. Signed-off-by: Brandon Wyman Signed-off-by: Matt Spinler Signed-off-by: Brad Bishop Signed-off-by: Edward A. James Signed-off-by: Cédric Le Goater Signed-off-by: Andrew Jeffery Signed-off-by: Joel Stanley --- arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 547 +++++++++++++++++++++++ 2 files changed, 550 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts -- 2.14.1 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5d1e9d37bf3a..15a9207319c1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1104,5 +1104,7 @@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-ast2500-evb.dtb \ aspeed-bmc-opp-palmetto.dtb \ - aspeed-bmc-opp-romulus.dtb + aspeed-bmc-opp-romulus.dtb \ + aspeed-bmc-opp-witherspoon.dtb + endif diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts new file mode 100644 index 000000000000..9a0937512e5b --- /dev/null +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -0,0 +1,547 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; +#include "aspeed-g5.dtsi" +#include + +/ { + model = "Witherspoon BMC"; + compatible = "ibm,witherspoon-bmc", "aspeed,ast2500"; + + chosen { + stdout-path = &uart5; + bootargs = "console=ttyS4,115200 earlyprintk"; + }; + + memory { + reg = <0x80000000 0x20000000>; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + flash_memory: region@98000000 { + no-map; + reg = <0x98000000 0x04000000>; /* 64M */ + }; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <1000>; + + fan0-presence { + label = "fan0-presence"; + gpios = <&pca0 4 GPIO_ACTIVE_LOW>; + linux,code = <4>; + }; + + fan1-presence { + label = "fan1-presence"; + gpios = <&pca0 5 GPIO_ACTIVE_LOW>; + linux,code = <5>; + }; + + fan2-presence { + label = "fan2-presence"; + gpios = <&pca0 6 GPIO_ACTIVE_LOW>; + linux,code = <6>; + }; + + fan3-presence { + label = "fan3-presence"; + gpios = <&pca0 7 GPIO_ACTIVE_LOW>; + linux,code = <7>; + }; + }; + + leds { + compatible = "gpio-leds"; + + fan0 { + retain-state-shutdown; + default-state = "keep"; + gpios = <&pca0 0 GPIO_ACTIVE_LOW>; + }; + + fan1 { + retain-state-shutdown; + default-state = "keep"; + gpios = <&pca0 1 GPIO_ACTIVE_LOW>; + }; + + fan2 { + retain-state-shutdown; + default-state = "keep"; + gpios = <&pca0 2 GPIO_ACTIVE_LOW>; + }; + + fan3 { + retain-state-shutdown; + default-state = "keep"; + gpios = <&pca0 3 GPIO_ACTIVE_LOW>; + }; + + front-fault { + retain-state-shutdown; + default-state = "keep"; + gpios = <&pca0 13 GPIO_ACTIVE_LOW>; + }; + + front-power { + retain-state-shutdown; + default-state = "keep"; + gpios = <&pca0 14 GPIO_ACTIVE_LOW>; + }; + + front-id { + retain-state-shutdown; + default-state = "keep"; + gpios = <&pca0 15 GPIO_ACTIVE_LOW>; + }; + + rear-fault { + gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>; + }; + + rear-id { + gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_LOW>; + }; + + rear-power { + gpios = <&gpio ASPEED_GPIO(N, 3) GPIO_ACTIVE_LOW>; + }; + + power-button { + 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(E, 0) 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>; + }; + + iio-hwmon-dps310 { + compatible = "iio-hwmon"; + io-channels = <&dps 0>; + }; + + iio-hwmon-bmp280 { + compatible = "iio-hwmon"; + io-channels = <&bmp 1>; + }; + +}; + +&fmc { + status = "okay"; + + flash@0 { + status = "okay"; + label = "bmc"; + m25p,fast-read; +#include "openbmc-flash-layout.dtsi" + }; + + flash@1 { + status = "okay"; + label = "alt"; + m25p,fast-read; + }; +}; + +&spi1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; + + flash@0 { + status = "okay"; + label = "pnor"; + m25p,fast-read; + }; +}; + +&uart1 { + /* Rear RS-232 connector */ + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_txd1_default + &pinctrl_rxd1_default + &pinctrl_nrts1_default + &pinctrl_ndtr1_default + &pinctrl_ndsr1_default + &pinctrl_ncts1_default + &pinctrl_ndcd1_default + &pinctrl_nri1_default>; +}; + +&uart2 { + /* APSS */ + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_txd2_default &pinctrl_rxd2_default>; +}; + +&uart5 { + status = "okay"; +}; + +&lpc_ctrl { + status = "okay"; + memory-region = <&flash_memory>; + flash = <&spi1>; +}; + +&mac0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rmii1_default>; + use-ncsi; +}; + +&i2c2 { + status = "okay"; + + /* MUX -> + * Samtec 1 + * Samtec 2 + */ +}; + +&i2c3 { + status = "okay"; + + bmp: bmp280@77 { + compatible = "bosch,bmp280"; + reg = <0x77>; + #io-channel-cells = <1>; + }; + + max31785@52 { + compatible = "maxim,max31785a"; + reg = <0x52>; + #address-cells = <1>; + #size-cells = <0>; + }; + + dps: dps310@76 { + compatible = "infineon,dps310"; + reg = <0x76>; + #io-channel-cells = <0>; + }; + + pca0: pca9552@60 { + compatible = "nxp,pca9552"; + reg = <0x60>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + + gpio@0 { + reg = <0>; + type = ; + }; + + gpio@1 { + reg = <1>; + type = ; + }; + + gpio@2 { + reg = <2>; + type = ; + }; + + gpio@3 { + reg = <3>; + type = ; + }; + + gpio@4 { + reg = <4>; + type = ; + }; + + gpio@5 { + reg = <5>; + type = ; + }; + + gpio@6 { + reg = <6>; + type = ; + }; + + gpio@7 { + reg = <7>; + type = ; + }; + + gpio@8 { + reg = <8>; + type = ; + }; + + gpio@9 { + reg = <9>; + type = ; + }; + + gpio@10 { + reg = <10>; + type = ; + }; + + gpio@11 { + reg = <11>; + type = ; + }; + + gpio@12 { + reg = <12>; + type = ; + }; + + gpio@13 { + reg = <13>; + type = ; + }; + + gpio@14 { + reg = <14>; + type = ; + }; + + gpio@15 { + reg = <15>; + type = ; + }; + }; + + power-supply@68 { + compatible = "ibm,cffps1"; + reg = <0x68>; + }; + + power-supply@69 { + compatible = "ibm,cffps1"; + reg = <0x69>; + }; +}; + +&i2c4 { + status = "okay"; + + tmp423a@4c { + compatible = "ti,tmp423"; + reg = <0x4c>; + }; + + ir35221@70 { + compatible = "infineon,ir35221"; + reg = <0x70>; + }; + + ir35221@71 { + compatible = "infineon,ir35221"; + reg = <0x71>; + }; +}; + + +&i2c5 { + status = "okay"; + + tmp423a@4c { + compatible = "ti,tmp423"; + reg = <0x4c>; + }; + + ir35221@70 { + compatible = "infineon,ir35221"; + reg = <0x70>; + }; + + ir35221@71 { + compatible = "infineon,ir35221"; + reg = <0x71>; + }; +}; + +&i2c9 { + status = "okay"; + + tmp275@4a { + compatible = "ti,tmp275"; + reg = <0x4a>; + }; +}; + +&i2c10 { + /* MUX + * -> PCIe Slot 3 + * -> PCIe Slot 4 + */ + status = "okay"; +}; + +&i2c11 { + status = "okay"; + + pca9552: pca9552@60 { + compatible = "nxp,pca9552"; + reg = <0x60>; + #address-cells = <1>; + #size-cells = <0>; + gpio-controller; + #gpio-cells = <2>; + + gpio-line-names = "PS_SMBUS_RESET_N", "APSS_RESET_N", + "GPU0_TH_OVERT_N_BUFF", "GPU1_TH_OVERT_N_BUFF", + "GPU2_TH_OVERT_N_BUFF", "GPU3_TH_OVERT_N_BUFF", + "GPU4_TH_OVERT_N_BUFF", "GPU5_TH_OVERT_N_BUFF", + "GPU0_PWR_GOOD_BUFF", "GPU1_PWR_GOOD_BUFF", + "GPU2_PWR_GOOD_BUFF", "GPU3_PWR_GOOD_BUFF", + "GPU4_PWR_GOOD_BUFF", "GPU5_PWR_GOOD_BUFF", + "12V_BREAKER_FLT_N", "THROTTLE_UNLATCHED_N"; + + gpio@0 { + reg = <0>; + type = ; + }; + + gpio@1 { + reg = <1>; + type = ; + }; + + gpio@2 { + reg = <2>; + type = ; + }; + + gpio@3 { + reg = <3>; + type = ; + }; + + gpio@4 { + reg = <4>; + type = ; + }; + + gpio@5 { + reg = <5>; + type = ; + }; + + gpio@6 { + reg = <6>; + type = ; + }; + + gpio@7 { + reg = <7>; + type = ; + }; + + gpio@8 { + reg = <8>; + type = ; + }; + + gpio@9 { + reg = <9>; + type = ; + }; + + gpio@10 { + reg = <10>; + type = ; + }; + + gpio@11 { + reg = <11>; + type = ; + }; + + gpio@12 { + reg = <12>; + type = ; + }; + + gpio@13 { + reg = <13>; + type = ; + }; + + gpio@14 { + reg = <14>; + type = ; + }; + + gpio@15 { + reg = <15>; + type = ; + }; + }; + + rtc@32 { + compatible = "epson,rx8900"; + reg = <0x32>; + }; + + eeprom@51 { + compatible = "atmel,24c64"; + reg = <0x51>; + }; + + ucd90160@64 { + compatible = "ti,ucd90160"; + reg = <0x64>; + }; +}; + +&i2c12 { + status = "okay"; +}; + +&i2c13 { + status = "okay"; +}; + +&vuart { + status = "okay"; +}; + +&gfx { + status = "okay"; +}; + +&pinctrl { + aspeed,external-nodes = <&gfx &lhc>; +}; + +&wdt1 { + aspeed,reset-type = "none"; + aspeed,external-signal; + aspeed,ext-push-pull; + aspeed,ext-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdtrst1_default>; +}; From patchwork Mon Dec 11 05:07:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121329 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2371920qgn; Sun, 10 Dec 2017 21:11:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMa4wgDQfnzRvD15AsLt2Dh6U+S7LuvUctsPsiqY9sYopyS/U4en1CzbK8M+vGGmMnzQWpaJ X-Received: by 10.99.135.199 with SMTP id i190mr14258876pge.356.1512969060681; Sun, 10 Dec 2017 21:11:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512969060; cv=none; d=google.com; s=arc-20160816; b=Dx0aLVb2/qOgKmlCpnrb/igZfnVurW4rg+9zmq+MN3Pz/rsLAuJ3UjxeXIu4yECB/q pleCUWRecZkNVQNTMbnNFLc+XN6Atv8y9DFYCtxsoDrHFNz42z/TBHp+HysVJ4eymHwk UP4Q3Uuz6Bs6xEjwyMz7ZimoodVbO+g+zpSdcW+ptyFjvwVRdgQ7P97hVll9Wm49du6J deZ+V+zrP05kIyB7fZLPAHo5vH6PfSYhQIp8rcbHfCx4Vv/vBl5jSKJtCVkO6UicQBwr ONhcYz3cNmfO3+fRgRviejWNtVJflqVFtsvoGX8NyRB49mYsdFeIBME43f7fzcvY+Hzn KUaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=u44KoxlRGnwS1+PE9zvNZ9xysZ/Omeree7V/gomXqI8=; b=iG9ld4HeGXw+HrdIR9LvEYJZLWipvqLevts1YPSzoOj2qGoe23oozYj/B5DUz1jO7J Hyy80H/kVsta9/4p5mCcBK0TeUu4RPBdbfRUoD8myLjPwKv4uOGUrJK++rKOOJcuPwXW 5VP5pacfc4VNIRygfNnnYuZYEmwKjIEHDGgFRw4SRgTd86d0w/s/6RdUqTghUxmjqSlJ Yiw9wcB6DhqUlKBDfelYpCkw0bFcPX0gHqKvqRY9sBx48sQMb3FW425/sFxbq7I4hCX8 XWrvBjUwsNq8XF6cJMVWCkDCI1NzD64eZeItLZUkAg3ePBYsYVpGXAb+7Foqutxgv8ka yHOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=uUK4adRe; 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 c15si9329972pgu.316.2017.12.10.21.11.00; Sun, 10 Dec 2017 21:11:00 -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=uUK4adRe; 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 S1752772AbdLKFK7 (ORCPT + 24 others); Mon, 11 Dec 2017 00:10:59 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:38736 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752758AbdLKFKz (ORCPT ); Mon, 11 Dec 2017 00:10:55 -0500 Received: by mail-pg0-f65.google.com with SMTP id f12so10153910pgo.5; Sun, 10 Dec 2017 21:10:54 -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 :mime-version:content-transfer-encoding; bh=u44KoxlRGnwS1+PE9zvNZ9xysZ/Omeree7V/gomXqI8=; b=uUK4adRekSvCh7ORLfWch71Q+j+sNLKuxDZxMYqdAjA8S2MdmRDln9zjhbtZuY04SC bRZK8YsUvAzP5gS6ON9J0CrqZPrTDC4iLVFsDvmQphNj5dQpnbtvWhYERaA/wpbTHHB2 FiO5G70z+NsJEr23fZ2eQ5fMg+X7kaXFIsd9VNJRd+tmj8kYrSASNL0qTd/V/7wRtRz0 qqzVelpPaWJGS8pfb4vCbj1ENwr2KmDzKl74biyWYL64mtvyUN91WRtNBreWgrr4uYzt 8mrQos8x7yHJ0POsBEV7q+dKz9kRrKSSTDF1uLE0of++L6CgS1z2zXZjGsSW8EcSyhik XuXw== 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:mime-version:content-transfer-encoding; bh=u44KoxlRGnwS1+PE9zvNZ9xysZ/Omeree7V/gomXqI8=; b=Z3tHtWbKlrL9nNVL/da0eMuzIltgKpqQXtU/EH5F9EW/w2OOPNwtIZNMLHF8an4S2d p8FyYis/eArKVZf4bP0RMEuGZ3iF786tzHUQb9FPS9PoLu5XkCGxVN2vw9S5klFNxaD8 jj7ydRJh15BNc60kIZUNdooqtQtBev+uiiawxLdYn5Xx4AKH7PXJeR7GJeMg8UVZuZdU R6by9Z3DoKnFf7C/KfGGXPVtOZzO2YpPnZZVhaOfm2nPn4kguTgXafyKyQQAK7adYNvj je6ggkua3vy+LugCzjEyMeL/97TDaqNZR/zpCPMD7Mo0KLcBIaNrwPIhNnCRNuoqSe4x hDog== X-Gm-Message-State: AJaThX5Vb9Oj68lh0jlav+fJ40WGd4Gi+khwRofKGsTQvFe4rJWfLM6m YcnGJgO7BxFPsNoR5JmgMu4= X-Received: by 10.99.95.70 with SMTP id t67mr37234003pgb.49.1512969054177; Sun, 10 Dec 2017 21:10:54 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id 68sm22727009pfx.186.2017.12.10.21.10.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:10:53 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:40:43 +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, Robert Lippert , Peter Hanson , Rick Altherr Subject: [PATCH 17/20] ARM: dts: aspeed: Add Ingrasys Zaius BMC machine Date: Mon, 11 Dec 2017 15:37:01 +1030 Message-Id: <20171211050704.20621-18-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> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xo Wang Zaius is a POWER9 platform announced at OpenPOWER Summit 2016. This adds basic DTS support for its AST2500 BMC. This adds the device tree description for most upstream components. It is a squashed commit of all of the patches from the OpenBMC kernel tree. Signed-off-by: Xo Wang Signed-off-by: Patrick Venture Signed-off-by: Robert Lippert Signed-off-by: Peter Hanson Signed-off-by: Jeremy Kerr Signed-off-by: Cédric Le Goater Signed-off-by: Rick Altherr Signed-off-by: Joel Stanley --- arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 427 +++++++++++++++++++++++++++++ 2 files changed, 429 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts -- 2.14.1 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 15a9207319c1..48c55f307aa9 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1105,6 +1105,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-ast2500-evb.dtb \ aspeed-bmc-opp-palmetto.dtb \ aspeed-bmc-opp-romulus.dtb \ - aspeed-bmc-opp-witherspoon.dtb - + aspeed-bmc-opp-witherspoon.dtb \ + aspeed-bmc-opp-zaius.dtb endif diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts new file mode 100644 index 000000000000..90d77012495d --- /dev/null +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts @@ -0,0 +1,427 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; + +#include "aspeed-g5.dtsi" +#include + +/ { + model = "Zaius BMC"; + compatible = "ingrasys,zaius-bmc", "aspeed,ast2500"; + + chosen { + stdout-path = &uart5; + bootargs = "console=ttyS4,115200 earlyprintk"; + }; + + memory { + reg = <0x80000000 0x40000000>; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + flash_memory: region@98000000 { + no-map; + reg = <0x98000000 0x04000000>; /* 64M */ + }; + }; + + onewire0 { + compatible = "w1-gpio"; + gpios = <&gpio ASPEED_GPIO(H, 0) GPIO_ACTIVE_HIGH>; + }; + + onewire1 { + compatible = "w1-gpio"; + gpios = <&gpio ASPEED_GPIO(H, 1) GPIO_ACTIVE_HIGH>; + }; + + onewire2 { + compatible = "w1-gpio"; + gpios = <&gpio ASPEED_GPIO(H, 2) GPIO_ACTIVE_HIGH>; + }; + + onewire3 { + compatible = "w1-gpio"; + gpios = <&gpio ASPEED_GPIO(H, 3) GPIO_ACTIVE_HIGH>; + }; + + gpio-keys { + compatible = "gpio-keys"; + + checkstop { + label = "checkstop"; + gpios = <&gpio ASPEED_GPIO(F, 7) GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + sys_boot_status { + label = "System boot status"; + gpios = <&gpio ASPEED_GPIO(D, 5) GPIO_ACTIVE_LOW>; + }; + + attention { + label = "Attention"; + gpios = <&gpio ASPEED_GPIO(D, 6) GPIO_ACTIVE_LOW>; + }; + + plt_fault { + label = "Platform fault"; + gpios = <&gpio ASPEED_GPIO(D, 7) GPIO_ACTIVE_LOW>; + }; + + hdd_fault { + label = "Onboard drive fault"; + gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_LOW>; + }; + }; + + fsi: gpio-fsi { + compatible = "fsi-master-gpio", "fsi-master"; + #address-cells = <2>; + #size-cells = <0>; + + trans-gpios = <&gpio ASPEED_GPIO(O, 6) GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; + clock-gpios = <&gpio ASPEED_GPIO(G, 0) GPIO_ACTIVE_HIGH>; + data-gpios = <&gpio ASPEED_GPIO(G, 1) GPIO_ACTIVE_HIGH>; + mux-gpios = <&gpio ASPEED_GPIO(P, 6) GPIO_ACTIVE_HIGH>; + }; + + iio-hwmon { + compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, + <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>, + <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>, + <&adc 13>, <&adc 14>, <&adc 15>; + }; + + iio-hwmon-battery { + compatible = "iio-hwmon"; + io-channels = <&adc 12>; + }; + +}; + +&fmc { + status = "okay"; + + flash@0 { + status = "okay"; + label = "bmc"; + 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; + }; +}; + +&spi2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2ck_default + &pinctrl_spi2cs0_default + &pinctrl_spi2cs1_default + &pinctrl_spi2miso_default + &pinctrl_spi2mosi_default>; + + flash@0 { + status = "okay"; + }; +}; + +&uart1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_txd1_default + &pinctrl_rxd1_default>; +}; + +&lpc_ctrl { + status = "okay"; + memory-region = <&flash_memory>; + flash = <&spi1>; +}; + +&lpc_snoop { + status = "okay"; + snoop-ports = <0x80>; +}; + + +&uart5 { + status = "okay"; +}; + +&mac0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rmii1_default>; + use-ncsi; +}; + +&mac1 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; +}; + +&i2c0 { + status = "okay"; + + eeprom@50 { + compatible = "atmel,24c64"; + reg = <0x50>; + pagesize = <32>; + }; + + rtc@68 { + compatible = "nxp,pcf8523"; + reg = <0x68>; + }; + + ucd90160@64 { + compatible = "ti,ucd90160"; + reg = <0x64>; + }; + + /* Power sequencer UCD90160 PMBUS @64h + * FRU AT24C64D @50h + * RTC PCF8523 @68h + * Clock buffer 9DBL04 @6dh + */ +}; + +&i2c1 { + status = "okay"; + + i2c-switch@71 { + compatible = "nxp,pca9546"; + reg = <0x71>; + #address-cells = <1>; + #size-cells = <0>; + }; + + /* MUX1 PCA9546A @71h + * PCIe 0 + * PCIe 1 + * PCIe 2 + * TPM header + */ +}; + +&i2c2 { + status = "disabled"; + + /* OCP Mezz Connector A (OOB SMBUS) */ +}; + +&i2c3 { + status = "disabled"; + + /* OCP Mezz Connector A (PCIe slot SMBUS) */ +}; + +&i2c4 { + status = "okay"; + + i2c-switch@71 { + compatible = "nxp,pca9546"; + reg = <0x71>; + #address-cells = <1>; + #size-cells = <0>; + }; + + /* MUX1 PCA9546A @71h + * PCIe 3 + * PCIe 4 + */ +}; + + +&i2c5 { + status = "disabled"; + + /* CPU0 PRM 0.7V */ + /* CPU0 PRM 1.2V CH03 */ + /* CPU0 PRM 0.8V */ + /* CPU0 PRM 1.2V CH47 */ +}; + +&i2c6 { + status = "disabled"; + + /* CPU1 PRM 0.7V */ + /* CPU1 PRM 1.2V CH03 */ + /* CPU1 PRM 0.8V */ + /* CPU1 PRM 1.2V CH47 */ +}; + +&i2c7 { + status = "okay"; + + pca9541a@70 { + compatible = "nxp,pca9541"; + reg = <0x70>; + + i2c-arb { + #address-cells = <1>; + #size-cells = <0>; + + hotswap@54 { + compatible = "ti,lm5066i"; + reg = <0x54>; + }; + }; + }; + + /* Master selector PCA9541A @70h (other master: CPU0) + * LM5066I PMBUS @10h + */ + + /* 12V Quarter Brick DC/DC Converter Q54SJ12050 @61h */ + power-brick@61 { + compatible = "delta,dps800"; + reg = <0x61>; + }; + + /* CPU0 VR ISL68137 0.7V, 0.96V PMBUS @64h */ + /* CPU0 VR ISL68137 1.2V CH03 PMBUS @40h */ + /* CPU0 VR ISL68137 0.8V PMBUS @60h */ + /* CPU0 VR 1.0V IR38064 I2C @11h, PMBUS @41h */ + /* CPU0 VR ISL68137 1.2V CH47 PMBUS @41h */ +}; + +&i2c8 { + status = "okay"; + + /* CPU1 VR ISL68137 0.7V, 0.96V PMBUS @65h */ + /* CPU1 VR ISL68137 1.2V CH03 PMBUS @44h */ + /* CPU1 VR ISL68137 0.8V PMBUS @61h */ + /* CPU1 VR 1.0V IR38064 I2C @12h, PMBUS @42h */ + /* CPU0 VR ISL68137 1.2V CH47 PMBUS @45h */ +}; + + +&i2c9 { + status = "disabled"; + + /* Fan board */ +}; + +&i2c10 { + status = "disabled"; +}; + +&i2c11 { + status = "disabled"; + + /* GPU sideband */ +}; + +&i2c12 { + status = "disabled"; +}; + +&i2c13 { + status = "disabled"; + + /* MUX PI3USB102 + * CPU0 debug + * CPU1 debug + */ +}; + +&pinctrl { + aspeed,external-nodes = <&gfx &lhc>; + + pinctrl_gpioh_unbiased: gpioi_unbiased { + pins = "A8", "C7", "B7", "A7", "D7", "B6", "A6", "E7"; + bias-disable; + }; +}; + +&gpio { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpioh_unbiased>; + + line_iso_u146_en { + gpio-hog; + gpios = ; + output-high; + line-name = "iso_u164_en"; + }; + + ncsi_mux_en_n { + gpio-hog; + gpios = ; + output-low; + line-name = "ncsi_mux_en_n"; + }; + + line_bmc_i2c2_sw_rst_n { + gpio-hog; + gpios = ; + output-high; + line-name = "bmc_i2c2_sw_rst_n"; + }; + + line_bmc_i2c5_sw_rst_n { + gpio-hog; + gpios = ; + output-high; + line-name = "bmc_i2c5_sw_rst_n"; + }; +}; + +&vuart { + status = "okay"; +}; + +&gfx { + status = "okay"; +}; + +&pwm_tacho { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default + &pinctrl_pwm2_default &pinctrl_pwm3_default>; + + fan@0 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x00>; + }; + + fan@1 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x01>; + }; + + fan@2 { + reg = <0x02>; + aspeed,fan-tach-ch = /bits/ 8 <0x02>; + }; + + fan@3 { + reg = <0x03>; + aspeed,fan-tach-ch = /bits/ 8 <0x03>; + }; +}; From patchwork Mon Dec 11 05:07:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121330 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2372065qgn; Sun, 10 Dec 2017 21:11:12 -0800 (PST) X-Google-Smtp-Source: AGs4zMap6hKsktTsH0+8xt0TPQFzgqKsPmNTolvDvrV6NNYxCUbyeb61f5GkDuDHYc+IDsQe04fZ X-Received: by 10.98.32.214 with SMTP id m83mr10303154pfj.227.1512969072322; Sun, 10 Dec 2017 21:11:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512969072; cv=none; d=google.com; s=arc-20160816; b=zX3b5rz1B2vQbIJwLYRcHOIuUk3ao0NYDOxnI0x58zOn7AmdEQcrOVzSBXMGA5XHx1 MQHPXWRTXf0NsVJVkyk4V5waa/2+oFoUjSFtolFuRCxe75kUGs7D8FJTOo/BpPJ2uMjQ 3N3GK2pZ+Un+6tKd0j3uM5Td8fGO2qQ064KB69O7Ac5kcQn69cf2PlhbruCs5O+YJHiO KDU6/LSZ9J4LW0i6PQRrPL53tixCji7T4UDeSrkpBkeEjAuFLMwu5QuD2ZrzoCOHC9Zl ZkbiI3psFAEhjupBdlicINls2xCs/HGg0HENvlV4v+kJ9X3sSwOpsjr5r23hvpTI2enj VZGA== 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=MmeXrzlOkSF+o6sRekrOPZA4BeayCEemuTwAXJU7Buk=; b=Kdq1DXT2OZpuc/fLAvaSlf/JFuHQYWDJWZSCSHsRwg4p5r0AnvFTKfFzCHF0Uhmgb0 4pufkCRZf8UhmhTqEE1xQAs56YOrKEnKhikZmT4BLRi12Bxlf275afCTcW8leRRd4pzk 2QiT2JRsN2CruDLLfIGCInFRJVgit1YjBJxQLuSZCYHiRu0B02fIf3yv6mtzQ4iwLChC xCfpm2u4hoq1zj6vW+q8OAnqntbSVUps4ff78YOC6cHWWvvqpY6GzT8KpuJAoW1UgLT0 jmoWeU1SaMK6G4BVbqIyaAeejY0HFB+tBfXFGLzjWecL7AvhcPJsK0tiuxXRm+OWak/+ WbWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ehtByI8L; 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.12; Sun, 10 Dec 2017 21:11:12 -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=ehtByI8L; 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 S1752792AbdLKFLK (ORCPT + 24 others); Mon, 11 Dec 2017 00:11:10 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33598 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752522AbdLKFLF (ORCPT ); Mon, 11 Dec 2017 00:11:05 -0500 Received: by mail-pg0-f66.google.com with SMTP id g7so10167205pgs.0; Sun, 10 Dec 2017 21:11:05 -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=MmeXrzlOkSF+o6sRekrOPZA4BeayCEemuTwAXJU7Buk=; b=ehtByI8LhZ/2qgxS+D33cjXJNIV3AmQVPvAfXXfjlLJ7go7AoMPBQSdgZbUFrS+HB1 HXW+A/JK/mjVqDuKiUrgA6Do8L9EW6VqxjXImp4Vv8tIk1v6hZS92ALiyyjxk6MGyL52 sBEGMHWaNu+CyxGT4jf/xkd7lsJrn4OFtzTHk+pu0M9KeMs633vOvaGhbvQ2F5eWHNxy JWD356eD1H9YkCeL/7EhSRVwDVZit6LT8KK/Tt0tk9MX2zeXu6SFKt0FLRrhv/0uu/GH l5vYVJZD5F7Anrbhx2gGYr9yg/Aw7NXtvyg7F2HDeizcLTnKdj6LyWwhLf3LJYDcQyRW vzBA== 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=MmeXrzlOkSF+o6sRekrOPZA4BeayCEemuTwAXJU7Buk=; b=liEYuvAcsMf8JLr1Z3ITf5Z8Swr2yIbmo21rRyDHbBEyUZ2z6fDFmhYLJCpe/PxdIq Ms8cs40AXWjl/oQOdQHwDNkb+ESZbtlbeExTgW7u4BrnI2i2CgkWz3VOgkLOUlgcFG1Z TPoN/y/02HkhecyjPUGShBuPcPUq7RtfzqE6XEueX59P+QiLNftayQyMXYDTXpTZ7/n+ d7lNFaoAIKWVToP+/QYN6vslRr517TAOmftaK4VI+0B+7Eurg7Lcsq5LSbyNobFhOaqm a85fPK5MgFBOReN8XwWDdo7XlZJ5NlwuReahgigpcaD7BbF4+YfPDEv88NnNzYwQn84k WiNA== X-Gm-Message-State: AJaThX6sGiQ6VUxvpltulKp80JChbwiEPK0VSBzYx7p+Kp232W0VEvc9 kPDut8cIPIDDmN+fZdlz2TY= X-Received: by 10.99.186.70 with SMTP id l6mr36451692pgu.253.1512969064574; Sun, 10 Dec 2017 21:11:04 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id x21sm23573298pfi.174.2017.12.10.21.10.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:11:03 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:40:54 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: Rick Altherr , =?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, Peter Hanson Subject: [PATCH 18/20] ARM: dts: aspeed: Add Qanta Q71L BMC machine Date: Mon, 11 Dec 2017 15:37:02 +1030 Message-Id: <20171211050704.20621-19-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 From: Rick Altherr The Qanta Q71L BMC is an ASPEED ast2400 based BMC that is part of a Qanta x86 server. This adds the device tree description for most upstream components. It is a squashed commit from the OpenBMC kernel tree. Signed-off-by: Peter Hanson Signed-off-by: Andrew Jeffery Signed-off-by: Patrick Venture Signed-off-by: Rick Altherr Signed-off-by: Joel Stanley --- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 458 +++++++++++++++++++++++++++ 2 files changed, 460 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts -- 2.14.1 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 48c55f307aa9..5ab5d9169511 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1106,5 +1106,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-opp-palmetto.dtb \ aspeed-bmc-opp-romulus.dtb \ aspeed-bmc-opp-witherspoon.dtb \ - aspeed-bmc-opp-zaius.dtb + aspeed-bmc-opp-zaius.dtb \ + aspeed-bmc-quanta-q71l.dtb endif diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts new file mode 100644 index 000000000000..2f40bab63149 --- /dev/null +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts @@ -0,0 +1,458 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; + +#include "aspeed-g4.dtsi" + +/ { + model = "Quanta Q71L BMC"; + compatible = "quanta,q71l-bmc", "aspeed,ast2400"; + + chosen { + stdout-path = &uart5; + bootargs = "console=ttyS4,115200 earlyprintk"; + }; + + memory { + reg = <0x40000000 0x8000000>; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + vga_memory: framebuffer@47800000 { + no-map; + reg = <0x47800000 0x00800000>; /* 8MB */ + }; + }; + + leds { + compatible = "gpio-leds"; + + heartbeat { + gpios = <&gpio ASPEED_GPIO(B, 0) GPIO_ACTIVE_LOW>; + }; + + power { + gpios = <&gpio ASPEED_GPIO(B, 2) GPIO_ACTIVE_LOW>; + }; + + identify { + gpios = <&gpio ASPEED_GPIO(B, 3) GPIO_ACTIVE_LOW>; + }; + }; + + iio-hwmon { + compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, + <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>, + <&adc 8>, <&adc 9>, <&adc 10>; + }; + + iio-hwmon-battery { + compatible = "iio-hwmon"; + io-channels = <&adc 11>; + }; + + i2c1mux: i2cmux { + compatible = "i2c-mux-gpio"; + #address-cells = <1>; + #size-cells = <0>; + + /* mux-gpios = <&sgpio 10 GPIO_ACTIVE_HIGH> */ + i2c-parent = <&i2c1>; + }; +}; + +&fmc { + status = "okay"; + flash@0 { + status = "okay"; + label = "bmc"; + m25p,fast-read; +#include "openbmc-flash-layout.dtsi" + }; +}; + +&spi { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; + + flash@0 { + status = "okay"; + m25p,fast-read; + label = "pnor"; + }; +}; + +&pinctrl { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_vgahs_default &pinctrl_vgavs_default + &pinctrl_ddcclk_default &pinctrl_ddcdat_default>; +}; + +&lpc_snoop { + status = "okay"; + snoop-ports = <0x80>; +}; + +&mac0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rmii1_default>; + use-ncsi; +}; + +&mac1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; +}; + +&uart5 { + status = "okay"; +}; + +&i2c0 { + status = "okay"; +}; + +&i2c1 { + status = "okay"; + + /* temp2 inlet */ + tmp75@4c { + compatible = "ti,tmp75"; + reg = <0x4c>; + }; + + /* temp3 */ + tmp75@4e { + compatible = "ti,tmp75"; + reg = <0x4e>; + }; + + /* temp1 */ + tmp75@4f { + compatible = "ti,tmp75"; + reg = <0x4f>; + }; + + /* Baseboard FRU */ + eeprom@54 { + compatible = "atmel,24c64"; + reg = <0x54>; + }; + + /* FP FRU */ + eeprom@57 { + compatible = "atmel,24c64"; + reg = <0x57>; + }; +}; + +&i2c2 { + status = "okay"; + + /* 0: PCIe Slot 2, + * Slot 3, + * Slot 6, + * Slot 7 + */ + i2c-switch@74 { + compatible = "nxp,pca9546"; + reg = <0x74>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; /* may use mux@77 next. */ + + i2c_pcie2: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + }; + + i2c_pcie3: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; + + i2c_pcie6: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + }; + + i2c_pcie7: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + }; + }; + + /* 0: PCIe Slot 1, + * Slot 4, + * Slot 5, + * Slot 8, + * Slot 9, + * Slot 10, + * SSD 1, + * SSD 2 + */ + i2c-switch@77 { + compatible = "nxp,pca9548"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x77>; + i2c-mux-idle-disconnect; /* may use mux@74 next. */ + + i2c_pcie1: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + }; + + i2c_pcie4: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; + + i2c_pcie5: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + }; + + i2c_pcie8: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + }; + + i2c_pcie9: i2c@4 { + #address-cells = <1>; + #size-cells = <0>; + reg = <4>; + }; + + i2c_pcie10: i2c@5 { + #address-cells = <1>; + #size-cells = <0>; + reg = <5>; + }; + + i2c_ssd1: i2c@6 { + #address-cells = <1>; + #size-cells = <0>; + reg = <6>; + }; + + i2c_ssd2: i2c@7 { + #address-cells = <1>; + #size-cells = <0>; + reg = <7>; + }; + }; +}; + +&i2c3 { + status = "okay"; + + /* BIOS FRU */ + eeprom@56 { + compatible = "atmel,24c64"; + reg = <0x56>; + }; +}; + +&i2c4 { + status = "okay"; +}; + +&i2c5 { + status = "okay"; +}; + +&i2c6 { + status = "okay"; +}; + +&i2c7 { + status = "okay"; + + /* 0: PSU4 + * PSU1 + * PSU3 + * PSU2 + */ + i2c-switch@70 { + compatible = "nxp,pca9546"; + reg = <0x70>; + #address-cells = <1>; + #size-cells = <0>; + + i2c_psu4: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + }; + + i2c_psu1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; + + i2c_psu3: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + }; + + i2c_psu2: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + }; + }; + + /* PDB FRU */ + eeprom@52 { + compatible = "atmel,24c64"; + reg = <0x52>; + }; +}; + +&i2c8 { + status = "okay"; + + /* BMC FRU */ + eeprom@50 { + compatible = "atmel,24c64"; + reg = <0x50>; + }; +}; + +&vuart { + status = "okay"; +}; + +&wdt2 { + status = "okay"; +}; + +&pwm_tacho { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_default + &pinctrl_pwm1_default + &pinctrl_pwm2_default + &pinctrl_pwm3_default>; + + fan@0 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x00>; + }; + + fan@1 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x01>; + }; + + fan@2 { + reg = <0x02>; + aspeed,fan-tach-ch = /bits/ 8 <0x02>; + }; + + fan@3 { + reg = <0x03>; + aspeed,fan-tach-ch = /bits/ 8 <0x03>; + }; + + fan@4 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x04>; + }; + + fan@5 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x05>; + }; + + fan@6 { + reg = <0x02>; + aspeed,fan-tach-ch = /bits/ 8 <0x06>; + }; + + fan@7 { + reg = <0x03>; + aspeed,fan-tach-ch = /bits/ 8 <0x07>; + }; +}; + +&i2c1mux { + i2c@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + /* Memory Riser 1 FRU */ + eeprom@50 { + compatible = "atmel,24c02"; + reg = <0x50>; + }; + + /* Memory Riser 2 FRU */ + eeprom@51 { + compatible = "atmel,24c02"; + reg = <0x51>; + }; + + /* Memory Riser 3 FRU */ + eeprom@52 { + compatible = "atmel,24c02"; + reg = <0x52>; + }; + + /* Memory Riser 4 FRU */ + eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + }; + }; + + i2c@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + /* Memory Riser 5 FRU */ + eeprom@50 { + compatible = "atmel,24c02"; + reg = <0x50>; + }; + + /* Memory Riser 6 FRU */ + eeprom@51 { + compatible = "atmel,24c02"; + reg = <0x51>; + }; + + /* Memory Riser 7 FRU */ + eeprom@52 { + compatible = "atmel,24c02"; + reg = <0x52>; + }; + + /* Memory Riser 8 FRU */ + eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + }; + }; +}; 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>; + }; +}; From patchwork Mon Dec 11 05:07:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 121332 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2372287qgn; Sun, 10 Dec 2017 21:11:30 -0800 (PST) X-Google-Smtp-Source: ACJfBou6y0TucnoQomE5GhRfr/qNZZxrYGi0V/bzz+E6ksMrNa5QdtpJg02rrHOR5P12D9D32Tim X-Received: by 10.159.218.12 with SMTP id v12mr5732095plp.224.1512969090632; Sun, 10 Dec 2017 21:11:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512969090; cv=none; d=google.com; s=arc-20160816; b=KyCiWC5tNL09VzundU+7hA/B9KYc6NtwoYio4MYGuOyEsJ0dxBFxvXG+JIIXUFmRPH 1PKTAZJOw9xGAuAzEyKwLgN1cyQFgolyJM4DJ2mwkHG+LimI0lNcTC6oDa3g9Y3JD0Vc 0c92VwBBd/bYW6gl8XSxM9o3tMMOMO8MQ3VqVpI20IcSyIvncuN2jfmaKqO8bwlYsxX4 qtgWTGspJ+KPXkH5xiHYWmjmsob1ZV7NOmLP3G5XBvs0ZrK68caf9TR4imIJY7Jssa6N vh5Ym50mhdcwAZWBiaXIjVelGn+XZ3zzr6IoaHrQ4ad2pWMzewb8F+CWuBUXtadEW2Y8 IyAg== 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=QqfZCCmImRq6CrNgy3iSu+i0yBBD7TSQ+ZkXSnuCpFg=; b=GdpJGEExP5UBasNCEWtg03atC06f92hr+Y0Zkef6sYWIGZy93nuujnYMxy0pkSTUje 17PGFeDlDkzBfi1Eg0XJQHOnS+bh4fsiEaOUWofei0cbiNjrMFsfVRNUEq08JxOIiJcj /uetLbLlxgc1zhKERb9f8NzWswO8G+0k6VwjtMxD+RaVWnYVeQznS8IY0mpsaF1bA/6G FsAFJtcNj/iNNlZOn1GotgGg5J+IqfjdDJ7m9pOMGjBfuir6TWz4v4cCK/hDZ80Zm2PR HA40JcXpgBvIjgf5k4rwYc5dJHG7zpMfuDG5G3681djmzhMkIiGx3LsO0CeSmXjcUlQD vPdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Oqtmk09x; 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 i10si9240672pgs.686.2017.12.10.21.11.30; Sun, 10 Dec 2017 21:11:30 -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=Oqtmk09x; 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 S1752531AbdLKFL3 (ORCPT + 24 others); Mon, 11 Dec 2017 00:11:29 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:46561 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871AbdLKFLZ (ORCPT ); Mon, 11 Dec 2017 00:11:25 -0500 Received: by mail-pg0-f65.google.com with SMTP id b11so10142753pgu.13; Sun, 10 Dec 2017 21:11:24 -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=QqfZCCmImRq6CrNgy3iSu+i0yBBD7TSQ+ZkXSnuCpFg=; b=Oqtmk09xU4JV5vaujDNaatJCcR8qPCv8NbCBvjfxfwHcoi66+62PqVypdNcTICwsoI ULaij14wBD68CfVtbtKCX8qHvANhMpmdBsI1EWffxKme2f5oO7lB+k6K+D7sGVYhWufM lmu1ZgWYwBOvL4uKs7iwGsr5J3rN1Pxuv35ou3CULy/eUGVzawKoRrCFC4z1HQUDt0Um KCu82l19xLDO4BH0bVCvR+5f69R3lZTuhe4bRvm96GuhXiOJ9zS602CcB/XUAOzRGwl2 cHH7lJR3CfWp5OW709bIF13soFT4iBRDSEEDoK90uzLkT1UlVMwjQAITeFlnrLjt3VZQ wsTA== 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=QqfZCCmImRq6CrNgy3iSu+i0yBBD7TSQ+ZkXSnuCpFg=; b=gLvynS6k5FzMZ/BF9UDXfZ2e9TFkEt9rsZR3m0w92BDqsZnnfeZvb7J31B+js7/Acu 0LZsw+KvpIupGKxxfd1enuJybMXCwGeGY+wVBaoNzQT6fOnbcD9EaFlth/40VKJAG+r5 dJEQ+hE2IQuWQBov08o2/NWAZhGlMIi3iFPYrryrV+FDANRe2Gs6FsfRLHycW7bNcHT4 UOhotqnho0tM5a6W9nMPRqmnmDpY28xGrFgiGRT6K+BQDkU5NsBbU4Axi+k0JEsjfTGu F0fWeOHBXMDhkOuTfYQSs+Qpx23N/Nb2aSXjerCkCzsdBqHbccpeadnsUXt0UEtkqkUB PCSw== X-Gm-Message-State: AKGB3mIDpsMxBDnyIhbMder5W9arQVUeFDB2puvoWBOhMLGWQcWD4MGA SGX2tOm/3mYGnT0wkXYi8IA= X-Received: by 10.98.92.194 with SMTP id q185mr10449095pfb.115.1512969084431; Sun, 10 Dec 2017 21:11:24 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id m65sm22946719pfm.41.2017.12.10.21.11.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Dec 2017 21:11:23 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 15:41:14 +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 20/20] ARM: dts: aspeed-plametto: Add flash layout Date: Mon, 11 Dec 2017 15:37:04 +1030 Message-Id: <20171211050704.20621-21-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 The OpenBMC flash layout is used by Palmetto systems. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 1 + 1 file changed, 1 insertion(+) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index a8f0c046e83e..cc18137386f2 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -34,6 +34,7 @@ status = "okay"; m25p,fast-read; label = "bmc"; +#include "openbmc-flash-layout.dtsi" }; };