From patchwork Fri Dec 15 06:24:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122046 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp72854qgn; Thu, 14 Dec 2017 22:25:32 -0800 (PST) X-Google-Smtp-Source: ACJfBouy4KO4Unh8woqDZj2cfqB8EQsda3ZsKhIPaV4Ieqlpls7Vhmx/WDcptdT6wjMt2tl2fwlT X-Received: by 10.98.36.199 with SMTP id k68mr12128533pfk.236.1513319132511; Thu, 14 Dec 2017 22:25:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319132; cv=none; d=google.com; s=arc-20160816; b=hcrDLeC3QDkb2txW79q2rzu+Qh4BhQGIxWUIm8NTOej9KC8iOKGNDYcNbZuYCkfqjU MivYsNtjhbO56ujZ6jbnIl+oZN7s9psXR8ejQo/ncVCXtGjPxQNwo3VBQDY4UTeA7uMT G6NebyFJfb/Oh0j6eYKMTL794087PEsh1z357TdLm3lji9R0pW7RlKEktmeQeXtuh7NP n+GdJNMSRTFcoYDsxy/IudJ7vKRuX/8YPXmD/P9Tm/BmX4F56MXvLWg3L9XilvflNp7a VzQpLhya1ttQutHzgG1hG7v6Xy4YGvofn0cHZzLYG1J4cwRAT7VAZFjc8SqN87vpgqmY lYDw== 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=wAlWWJXjvzpgs5oYL5dhCUBuDsZE7iPynnsks7OM5zj3+NEemMA8nfdEagx40fPEz9 0BVSwKrCTP0KlpwfTMZzZxQGDlzGSTgnMQTwzYtVsYtoYdWEM9Ic2ZD63AqpEH25rcZk uGRAW1+qmjkc0lafEHsNsWmUG9M2i2T1gJMTlwK1El4Of+iaIWC/g565phShBBQQcg1h GQfHIUTKJ0kTKys3JtmL4rqO4XeCzBf+zZVAmyNKqWH38tYuzESUvEnpqoWwMeagceyC YsKQ0yp0pJEjKao+ADrVZkDZ5cZDJrAB7dYGFyFr459aISBAvqlSKiMVKImt5bIPLt53 BOfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=RQ7CaA8e; 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 o6si4445439plh.705.2017.12.14.22.25.32; Thu, 14 Dec 2017 22:25:32 -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=RQ7CaA8e; 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 S1753368AbdLOGZ3 (ORCPT + 20 others); Fri, 15 Dec 2017 01:25:29 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:38390 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753123AbdLOGZZ (ORCPT ); Fri, 15 Dec 2017 01:25:25 -0500 Received: by mail-pg0-f67.google.com with SMTP id f12so5170444pgo.5; Thu, 14 Dec 2017 22:25:25 -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=RQ7CaA8eakMdWG9bYeVd7t8mGE5KKPPVif7P5GI5SJnMRnVJw4zHqa5eraRuYyH24C NMFYciqk6kHQfYy4Od8jZ3nFkF04ht0gCphHSqHn3bjOuRYtq9VElD1S+BY3db8cWtFo C6r/P1zkFhEw1EsQQuMYopKFTZ498DDfLj+tp7hDM3zGZdz6DCeeOuOxYBAlgp4mO85D cpCWULIJn7IDBFnkFt2NELs3SV82GOUNGZ5v9cBJFF2PFTz1ZGT87l8soCPztyzS9UF6 JPGjNl+vu9wjapCcnufLVScVdCbfI6IqDE6offWIGPrJl4o80hHZpxaDPOCeIaYir+Vy cnHQ== 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=ouGTU3qGYkLfdvcIGKDY2sZevAEGSPTOipEU/coQFKfQbj6TbDu1AE3Y1JyTepFke0 lZ533WdiKZAbpaeSFL1AHXJivlKNAR/VWBR7R2ihGcNKtQHqYRaJzP9YOweO7zgEhPn2 hX4/AGa8MQ9OXdeknraVW1KwM7AsyrugkIpBFiu4z//wx+3VwN6DZrwAJuDjDzMHgtZW udDWLUlakfq6YjfPLLGJWYCbJJiF9h2evVIgpF0u9bfa+WNMrZoTuoHb17Wdyug78F8h 2G6olZkAIGi48lh/Rb5hAQl/gpoCr2XJSPpLHTxgc3epRHT3V13/a6l/CGShey5c2SH5 SVsg== X-Gm-Message-State: AKGB3mLPYoSXmUBzzk4BScEaWGDh/gLycpoaZIzI1VAJJNsPzjiMiAkE Cu44GEI5J2Ssd3UtwzhZskU= X-Received: by 10.159.206.131 with SMTP id bg3mr4629610plb.303.1513319125151; Thu, 14 Dec 2017 22:25:25 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id p77sm11862998pfd.132.2017.12.14.22.25.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:25:24 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:55:15 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 02/19] dt-bindings: gpio: Add ASPEED constants Date: Fri, 15 Dec 2017 16:54:26 +1030 Message-Id: <20171215062443.23059-3-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fri Dec 15 06:24:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122047 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp72974qgn; Thu, 14 Dec 2017 22:25:44 -0800 (PST) X-Google-Smtp-Source: ACJfBosUGsM+OsVSZXQZvXivyu+uP4a7n/9hmP4pzhrle+1pkogqDugT1FcJjZXIEs0imsu0etlN X-Received: by 10.101.80.140 with SMTP id r12mr10781934pgp.250.1513319144535; Thu, 14 Dec 2017 22:25:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319144; cv=none; d=google.com; s=arc-20160816; b=dAIh1Y3AhQIa2O1zHWZJqjPOcl6sKhJ/o8MvQkqBU0FYlXsl3wJZdxvLPVJpBrQwqs 8mRKOCQMnBgY3nIx5V9rVyVeRTAgiqD13Fq7YIanv80xkqKYJxrRvWVBCqx8wWtTKbdM smjF+H6EpmtgbpcbL0cEGdxYE+ldsI/p7YW6Jz7DCYdDVcseJuz+0Ck9QNhDeYOnpIRH xTPm19CKBMhER4AW/2b958zBAQ70gwHGMCwZFXcUJ3Yr8EdOFZsLvLl9jAhqOzjVg23S Hi7MKtlU/ktXaJ/szNwDDpJY+3yk2sCJU3xVAkIvzzBBWdq852IBOi5Szz53uRyr6gSf 3XIw== 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=CEo12AGTdkWcEt2EgMXU5SaW8BEDcLXaSSV0G0NnFH4=; b=Qj3VG1X0qtAhikX4yrc0BOLdLWRDVC2+k00Rhydv3U8otvs2XRy+8ZleXsr/aTKoIZ F/6YccmQtcIXjV5RvDSJ9qAd4Qh62RSH1i+jIDvL9qcUgnZgd2nbvBgV3TZTcophvPXg yQ+xBaSklwFjRJC7vHnpn6rhhKi9Ovga6av2pB/096UJQf9/uagjkzy1gidbd2wxAxlR UAEjuftrOX3yztm0YOhgzWF9jJVMHGa1iFVA5VZciutryybOPmWHdwqB8KKNvIOhXzLT z2zgodOfPWpdT3Em7F+BmRjgeN5NO3m48OlDi/mcfhf9F1+4V/5Nmay6AP6153SSzLvc 3L1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=CdqhhPvQ; 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 o6si4445439plh.705.2017.12.14.22.25.44; Thu, 14 Dec 2017 22:25:44 -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=CdqhhPvQ; 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 S1753429AbdLOGZl (ORCPT + 20 others); Fri, 15 Dec 2017 01:25:41 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:41319 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751825AbdLOGZf (ORCPT ); Fri, 15 Dec 2017 01:25:35 -0500 Received: by mail-pf0-f196.google.com with SMTP id j28so5484622pfk.8; Thu, 14 Dec 2017 22:25:35 -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=CEo12AGTdkWcEt2EgMXU5SaW8BEDcLXaSSV0G0NnFH4=; b=CdqhhPvQg+iaNwMcJEXWf24GFlKGGKkCZjtRJKBZqALieYXmRn+ntzQkzH3N9yZjCh TVbXBdx0BKuKZ9uF2ozbwAhpGlWGMzTot76Si3Cy229ScMco+KXJHfe7ezV9aXHh/JUO f2KvLhHs7YoqpXAogQCjVckDyaX64vSZxvK4cHluTLGnxAzClGlf7sUQKBgtRndkF0LG oKsX/zH6HZxoskm67Tjmo4F57yNnDsEz83YTr+LYDIjJmFQI7Xbk9UJwfgJCebjU4kOP fVOBgXfvkbwBObKPKfXPpW4sx2Ms1qALDmtr7KRfVYoSTIejxmFv1A/rePqHcPWz/xF7 B9zg== 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=CEo12AGTdkWcEt2EgMXU5SaW8BEDcLXaSSV0G0NnFH4=; b=nEH8DPJSO0x0RFe3Nzy1hpVTZtSFdz+TBDC5Yi5sewVJvsY0SpQIk44C0vMdVZWiLq lHioDy3ax22V5lpVYI3FugtFBjTnKJ73ev6OLoH3hYs3F9Uh+LwvMfeANn34PuHnuPGk zE3xw3BlbmdUf6S9wvumKCIK3aHCYEKW3qW2KBectvJdgWwrg02C8qw8PwXQR8prdFzn YVUECUshP/cbP02PxrH23Q8y/llVBse85eEfMWMfluqMhJ0IvFTMFvcFgp8pz3XD0AHK 04QgB/88JF67YTvgtSTH600+7/zpmirpFyx6rcjAu2CAhw0XxG71dPd57aIkIYpJvSJH 2gyg== X-Gm-Message-State: AKGB3mKUPPQMluuM650S4iPcL7f5w78EFtlcLfrOrJTDmTlpQY+1jKgr KlN+Z3e8X48/qdWBACsaI6A= X-Received: by 10.99.124.9 with SMTP id x9mr10921706pgc.68.1513319135147; Thu, 14 Dec 2017 22:25:35 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id h192sm10498157pfc.139.2017.12.14.22.25.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:25:33 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:55:25 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 03/19] ARM: dts: aspeed: Add LPC and child devices Date: Fri, 15 Dec 2017 16:54:27 +1030 Message-Id: <20171215062443.23059-4-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Cédric Le Goater diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 100d092e6c07..a3bc5da7d42c 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 Fri Dec 15 06:24:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122048 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp73093qgn; Thu, 14 Dec 2017 22:25:56 -0800 (PST) X-Google-Smtp-Source: ACJfBotvwppuDF+m3hwXkR3lWy7TOjND2CqYcozYBucAtU28MUNrr0XGBfp5NcKm0whF2NP2Umdk X-Received: by 10.98.80.85 with SMTP id e82mr12067534pfb.87.1513319156140; Thu, 14 Dec 2017 22:25:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319156; cv=none; d=google.com; s=arc-20160816; b=Mz0W6TFKckeAhvtI4S+6iWyfGH2RX39rP/TXT7AyHgxyPtALRehP2QQcZeWuTHgoXe YSEhfplWkHGo3sC7CDFWWoniuUo5c9Qm2k3kbjPcnzJPiGHZRRD1ctBsehdFO2P9khl2 dKVcbxVeMwhGVWrrNTqpV2Vxs69w6K4nTCl7tdNlBGuBIolB2AZgsL7iJ5x0hKgwi857 wwApBNLyBTzS1ax+pz0M5UqQEn1dqG9a9CCY74lB81RHTfQ/Y0S6bxlWDw0dcvviM5FX agnj8fmFP1lpVUcPqTDZknWdXWrzQ6Xtxr06S7jr9yCiJB5/b1OopEsSv++BTxuHLE2v CwoA== 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=X6swXp+qzAWA84D39K6+COBfJyJnizl2cSAzl8TziB8=; b=kWMdGlh5uec8cxaVTpEiprFvyvfZxz4/9JNb0lkJZlx3zH/hBXf6yI5SkGarLlONL6 Y0tNVvEqdgI4qWDwuZxFFaq+GBL7CAJ7K6bCxWpwdZaqUa61uurjHrqDTbFpZiIGMsRK vBtAf0+zH5Xm53QJrOZLRg3RxRRqChk9GzHU6NsmzSU3+x1mfUybG7vfu/i2ZIIzbiAr S2BB9yeoaQsflQUxNR9nvasNjdhYpedVLMm8AtL3PU0WRtGy7w7Dqugrb0bfrriIXNMT /Scd2izDMlrGhKAyN622kG/qvMmy2mWwpy7LfYGmR2iB7Q5nRhPt8PzAWsumu8QSKmS5 932Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Eo/1Hhk7; 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 o6si4445439plh.705.2017.12.14.22.25.55; Thu, 14 Dec 2017 22:25:56 -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=Eo/1Hhk7; 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 S1753498AbdLOGZv (ORCPT + 20 others); Fri, 15 Dec 2017 01:25:51 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:44933 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751825AbdLOGZq (ORCPT ); Fri, 15 Dec 2017 01:25:46 -0500 Received: by mail-pf0-f196.google.com with SMTP id m26so5480731pfj.11; Thu, 14 Dec 2017 22:25:46 -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=X6swXp+qzAWA84D39K6+COBfJyJnizl2cSAzl8TziB8=; b=Eo/1Hhk7KyBlPsYyOkf3ygj0WrjqHGY6XVIRiYu8H+s27efPPzLzKzpnXwM6j+EXB1 008mOHyI1RvzlelKapiIfd13Z2zTuuQBdCyoogm0fyCRmgbsyIbWEE2FrS0JpM+kzDUR xLXNlGvFj3XrFIlj1HoyJXbbhEyQdTVpWGm0WOqPTLAAoUNRvjdder9fhihNaO0hqjKJ aBnJy2wJwo0HkhobCt0ZBeKWIFlka9BmD0lLW38ug19KLDg8UQaR8Xb/g018kA52kx06 cl82t/VNfXKeZj3zhKnKsKr9H/nV7sY3IYkxwIIvI9jmHcu6ikF0bjTbdS6X+tW1rSJO 3Z2Q== 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=X6swXp+qzAWA84D39K6+COBfJyJnizl2cSAzl8TziB8=; b=b2ReD30eKA4FP+grrSASZkj1j3nPHEtHPnkOcxeyp1JrWzA2Tp5ElFFVJ0DpyDzlvj hyUQ1Iv1aKYiBMNzWfYz95VUqEEEWPzCpGE7eJ2dz+66/c0/1DdpMy2RBW7SWRoEjMok EnDE6QpZHLsObni5Qm968zXjXHA8/om7oRoVpMGLc2DVeaX37f9QHCqgTQcTS6Vna0Uc glm+o9xlxsmuloZEkwlpQyZtxOZxOBeYUSiZcN81dRcpRQOtDeu33Db3jgQW97/vvegG wrhgAKTDA3xDMzcFt3m7NYuKb4AZtGd6UKHGLdgG+VP+i21Sqo2YRE955Dvvs5Px4CDj aPmg== X-Gm-Message-State: AKGB3mI5K0J0A83S04X8nPnl6EXvRvnkxDkOtVjKX6K/uLQhcdOwUuKd 0uXbPmfdTQlfnVFgW7lGfDE= X-Received: by 10.98.86.193 with SMTP id h62mr12257293pfj.109.1513319145301; Thu, 14 Dec 2017 22:25:45 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id b6sm10730406pfe.57.2017.12.14.22.25.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:25:43 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:55:35 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 04/19] ARM: dts: aspeed: Add proper clock references Date: Fri, 15 Dec 2017 16:54:28 +1030 Message-Id: <20171215062443.23059-5-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This device tree will break existing kernels that do not have the clk patches applied (no clocksource, as we don't know the speed of the APB clock. You can boot if you pass a lpj value on the command line, but won't have a uart). Older device trees running with the newer kernel will function as well as pre-4.16 kernels. That is, that some IP blocks (i2c, pwm/tach, adc) will not work as the kernel lacks reset controller and clock enabling. This is being changed as 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. The SCU compatible string is updated as the g4-scu string made it into the tree before we decided on aspeed,astX000- as the format for the strings. The old string will be removed from the bindings in a future patch. Signed-off-by: Joel Stanley --- v2: - Add more detail to the commit message --- arch/arm/boot/dts/aspeed-g4.dtsi | 102 +++++++++++++++----------------------- arch/arm/boot/dts/aspeed-g5.dtsi | 104 +++++++++++++++------------------------ 2 files changed, 82 insertions(+), 124 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index a3bc5da7d42c..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"; }; @@ -220,8 +186,8 @@ compatible = "aspeed,ast2400-vuart"; reg = <0x1e787000 0x40>; reg-shift = <2>; - interrupts = <10>; - clocks = <&clk_uart>; + interrupts = <8>; + 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 Fri Dec 15 06:24:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122049 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp73196qgn; Thu, 14 Dec 2017 22:26:04 -0800 (PST) X-Google-Smtp-Source: ACJfBoslhrc01ihwhbKX3V2KBWD8Jmvp7Z8koBKLaMolSEu4YlGA3lvVa0g5lbp5H26XGV1O8742 X-Received: by 10.99.167.6 with SMTP id d6mr10814633pgf.100.1513319164455; Thu, 14 Dec 2017 22:26:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319164; cv=none; d=google.com; s=arc-20160816; b=XxVNQhSufrzXbW6ytKswDS2ntKqChFkQW6fkRZCNSNn7IL3d/tLzOjLHc9w1JS8+uh BMNuMaj+POe60pzegRoGl0k1f4jvuZVJfLgNKiHW/N5tX1n82jPNzr1O7BWa262girbD IZeJnP0wMWECtpb8fb9WHC/CtKPPMMjxgmAOwpnmiLF0/afvK3BwRt2w7/8HithLT9Mw S8T7nYJHGgOC2b80nZ31fJ3YS2VOCYBdutKi5/OrhJFS8mgj4sAmK6K1ImXHhtMoxOte SbLSMizohild2RVoT9e5HWWANMvRgvtYJNm8VyocEpcQYg5YV2Q/Tyi3MLkuJYNFvdSy tV8Q== 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=fN6yrS2u/VGOTuDDMwV3iUcyKmXp/h6f04NltewaJHM=; b=bt/LE0b5Mg/v1iTnrw4MVoCuSJ8N/PAPgaobhfOQ5TOoHkxRR8q9n2U4UZ4I2/SBFk Bo8Jqf0OGBj2v1SKq2vhrSmW5DOEme2wV4li5ifUiMW0IqRXwpn6FCm3KqmCLG3e+zdt 2LOD9xZrMHaH5bghT9GGH4w8zXbgP2Iw2Ugf6lPUvh52BlHdX2ZdkHhQYgbQ1un7RWyy eCBNWViqhwLOUIMWKNOe9fWuiEumynt8gBx1t8NchtEOnNAw1hWCUrWiEZhS1V3Y7b9O +woGG0cWmPKT+i+RpHQOec5P/p3V9dghjJDtP4B0JYqO1LoAk/zeeRy6xNqVRvuQFou4 SDzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=UY+FjTTA; 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 p8si4547394pfj.378.2017.12.14.22.26.04; Thu, 14 Dec 2017 22:26:04 -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=UY+FjTTA; 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 S1753581AbdLOG0B (ORCPT + 20 others); Fri, 15 Dec 2017 01:26:01 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35207 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbdLOGZ5 (ORCPT ); Fri, 15 Dec 2017 01:25:57 -0500 Received: by mail-pf0-f195.google.com with SMTP id j124so5499698pfc.2; Thu, 14 Dec 2017 22:25:56 -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=fN6yrS2u/VGOTuDDMwV3iUcyKmXp/h6f04NltewaJHM=; b=UY+FjTTAUeb3H3N85taxXNGosFAzX3iF3Isv0ADE7PrLpu57xoqfLWnR3TTwE6I5li 5t3dCH5ruuP4CX9ko/fr+FXNgrnWNCtpu/hipPqehb7HNMdmPEMkWgjt931ABts1oL9f xCtaAYSgrBi6wjzvtFgfy2mGFAFtagCQmALBRiAn00BxyHlR/Id8fu5OK3sz+vnZnDaO Uywd2Y9AFjMwcTA2Eu8RQH9tnp07ePtvZSL/mKU4oRPtSPxIJwbB1TNuRVKpxelWLwqS nTKV/bLIl9QUdNmS/kGjSSh0zFriIAiCMj/ekN1uO4XSaoIFQhXs6l+8K5uec/2gD6nw r0Jg== 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=fN6yrS2u/VGOTuDDMwV3iUcyKmXp/h6f04NltewaJHM=; b=kAYQygpgBAeY8d/myig4qePhNvzEZmY8L7k2GNGPZQCA0dn1Lz67UEBEQqRXgdneLH NFqPyVUgDI6oCXWl73Xf9rJBz95g3jZWtLVaLid6HjarTuvU5XuvP5XwCpB+eVjZ3icb 0ft31sRYCuSCNhlzWtK/HiIu4UCBbu4rzuJgBWkysL7e6YBTk6FSgUNPqgHP3JV+wJdw iS80lNa59wPLe0MPi83L8RIdD3LUwyBR9Zbh++rW7hrnAMkI4c39due1MSd/Aafh8rsM WbZnhudCCgfkwUqVUdpsPnyat2o1wXL7So9c4pYWsKyZtx72pRRpIsSVTwB0WbO9CggY tYiQ== X-Gm-Message-State: AKGB3mIQ30VaOomT4WjV1+bk9IlCsSISYSuiY/NsJ1SDe9TMN08neMp8 zMNrF3wWDGAVAF5NzLX+wK0= X-Received: by 10.84.244.9 with SMTP id g9mr12469492pll.192.1513319155914; Thu, 14 Dec 2017 22:25:55 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id x6sm10074083pgq.57.2017.12.14.22.25.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:25:54 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:55:45 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 05/19] ARM: dts: aspeed: Add MAC clocks Date: Fri, 15 Dec 2017 16:54:29 +1030 Message-Id: <20171215062443.23059-6-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 2 ++ arch/arm/boot/dts/aspeed-g5.dtsi | 2 ++ 2 files changed, 4 insertions(+) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index c87883a7f250..cf407b4db630 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -91,6 +91,7 @@ compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; reg = <0x1e660000 0x180>; interrupts = <2>; + clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>; status = "disabled"; }; @@ -98,6 +99,7 @@ compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; reg = <0x1e680000 0x180>; interrupts = <3>; + clocks = <&syscon ASPEED_CLK_GATE_MAC2CLK>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 90bc09d93ea6..ab26156d6822 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -125,6 +125,7 @@ compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; reg = <0x1e660000 0x180>; interrupts = <2>; + clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>; status = "disabled"; }; @@ -132,6 +133,7 @@ compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; reg = <0x1e680000 0x180>; interrupts = <3>; + clocks = <&syscon ASPEED_CLK_GATE_MAC2CLK>; status = "disabled"; }; From patchwork Fri Dec 15 06:24:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122050 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp73299qgn; Thu, 14 Dec 2017 22:26:13 -0800 (PST) X-Google-Smtp-Source: ACJfBosSAdhau84Xy9MdDOKM4MX7mGvs2osZ7zyLlUbFvv2fCem3n1PUMFrx/Rdfne0AMjxME7Hu X-Received: by 10.101.90.138 with SMTP id c10mr10876649pgt.441.1513319173828; Thu, 14 Dec 2017 22:26:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319173; cv=none; d=google.com; s=arc-20160816; b=DkYZF0yTXRVxSgw3d3nUeQWL9vW0lRhvUk1dQafa+Aq/2knsnjrQS4hxk1fkGvpYBs 4WdOPDtFtmqCgrUcnfDAjt5i3cWDt9LsDWmh0y6NnZsDq2f/7ip9LM0ufERYqij23zeZ IXHCbcc4jxyW8ZCAOkHhGborR6Unvl9SE/GRv71BPxCfRP95CQRnYb9o6e9ms83o+KUg 9FyM6RQWPCNjzBJkkw2VdZ3IKCDxIuSUHoyq29ok+dfAmgENA1vHv4FCoZrcRSHukAN5 MiWudHXpSu1BZJKWAGT2Y4hfNNMBcmTRQzXhX+Mh4y1F8grXLTbu33W6/ZXmWA2QKhl4 geaA== 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=yynpsc3zhCKEE4Z2/zzTjNAjZ8E242dRUvufu4rqhJvk4Kj1itfw+gMA1u6ng/zKdy hOcx9t1R14noQ/zoTdXI2cT34Mt7q6FdhlZ2HDV/WODmx0oxCYHtig66hNN6L4h13kia ov6O53VUIsNxKwxYxvPiOtLWNoo9tRimLBvGhq8BYYfE1BYrrd2OswiJetoRTp0HFAte MXGhxjtXv7XY6CQGewhZgAjxCKB1YOedXOucfwSwMizaOdfzG2IX8y2WuQv/O+E0IVgJ Fi916o9T+Yz6dxZkhiQiP4Ffo5X2EDR6cqLSUJKTCx6Zl+gGkgsdj7byqLBON/zV3hkP HLFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=MevMGSQf; 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 p8si4547394pfj.378.2017.12.14.22.26.13; Thu, 14 Dec 2017 22:26:13 -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=MevMGSQf; 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 S1753672AbdLOG0K (ORCPT + 20 others); Fri, 15 Dec 2017 01:26:10 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36900 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753593AbdLOG0G (ORCPT ); Fri, 15 Dec 2017 01:26:06 -0500 Received: by mail-pg0-f66.google.com with SMTP id y6so5170878pgp.4; Thu, 14 Dec 2017 22:26:06 -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=MevMGSQfkZOQC9N9QFaZW/pDcAYiRr1CDuVL6i8HJrMuLz9qyhfD683xoW0qmRzbAR Z59DqOYKRUrjFt7FFyhIKiAk3Bh58Pp2gYH4zD/MxfaopSB6hXR9otMQiyPxQPyIF+xa 87C7g4LA5vK9CwF5L3bI6uvhkcN6Y44L4fJBY6qhML9KRgm1Peny9uiWUKrIFoQ0GqXD uCGFMB5uw9DEuVwYadpMctckjmJla6T7LIetlIjGNa7Tz8uj016UGvLLbgOFiRv3EACh i6bfF6/QXZSEZTUZbc6vQNZXUyj4ftHMaadHETKD+ORDkUKxHnsnfD/MtC7cxLd3oWhB uzeA== 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=a/u5nqv2BiJTQM7IQ69nPSSr2b4WYryUvwLA9tGYeOjQmodeBoZ+tVnOX5oHLfft+7 dkpgZla1V1ndSfkVP6W+Zfso+7gxrOledKKFkKK9oUeY7g/WB7kKQNdqJG2lM/kzyJY/ wdnmn7Khpb5BVtEMmhvEyV3KFwl89wROYpvTq/XLVLrjeLrnKa+UX0+ehGH84OCKtWfZ hawzwrIVyGZXSSdAJFhGbvcCxTNVNjZWL/a/Q15HHszlvjQzUKPz0WFs1IfZl2ZXNeAk bXS0nyENfpEiOy6l0CU8Dcolcb8cCTFXW3Yg3TXkUW/iMdDZYJbhUJGoA4cSU3eTTA6H Nw5g== X-Gm-Message-State: AKGB3mJm7u2JIbOa5uS8CiUIyjrgB0HsRInWDycdrKWTyKMwCdB9jtVp bblifTttAR/Lmd1eKYGHoYF4azS9VK4= X-Received: by 10.84.248.132 with SMTP id q4mr12507017pll.121.1513319165757; Thu, 14 Dec 2017 22:26:05 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id h69sm11075076pfk.166.2017.12.14.22.25.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:26:04 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:55:56 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 06/19] ARM: dts: aspeed: Add watchdog clocks Date: Fri, 15 Dec 2017 16:54:30 +1030 Message-Id: <20171215062443.23059-7-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fri Dec 15 06:24:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122051 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp73433qgn; Thu, 14 Dec 2017 22:26:24 -0800 (PST) X-Google-Smtp-Source: ACJfBosUtIsYKrzcbqrGOdvD8F6DH/THXi96p1b2kMSzeNeYlmxT+rQMzn05W7bAljHb9pMJSc1T X-Received: by 10.99.114.30 with SMTP id n30mr11239728pgc.271.1513319184420; Thu, 14 Dec 2017 22:26:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319184; cv=none; d=google.com; s=arc-20160816; b=nj5Dh128rVhSXpidO2sVzILA5/Sl0r7+xYr6uHkUFNoW1wP2jS9L9gJ0CQa6E01o0H RLZaRweKKO9dHvralo/ikSQRwc8zSNzT3ZA1KNENPJBqKao+4rVq6D2eCagz5lr9qjPB J3hp4gYix8h51K5mEhkDC44aPrfA0FLPclSmk/LIlnR9T6qhPt+pPtg5JIKBwa7gTdkx xWMi/7WvCn37llxvAN6sOHwxk9UvmN8Mvi7RoITXrqRu6DIsKSOlAK3ZoBxHRw9jlsge Zmd38f2eb+LSnPm54jP67bL1fvDvv8u21LCOtlNAHVXvngUrrIqwTCYAgJ/bv23Pall5 Uf4Q== 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=S4aNnxS5K8FYdkWd1ZSfDGirH68Ef2oskxf+m42ysL9FjLMZWnM8XLl1Yeg0T1oTyD XwLCvpryfKAanv+nkJdRdWrSd61f2DYNvNv8Oj87X+aaEodwvlS60GZZ6ZACLZkrutIZ i8hKJMW/BFJtv7MGH1Lg7RJMzrYXro+hxMG98bGS1fd5f/b//s9Cc0H89UE1X39alfOK QWVLCxt+z3G01xKLpBMQVEmIZtKKwzolRSk81B8ppQNNC7BfN/jnwiALiBj/jTQ/rGoN XT7k618LRxTlYxsXJBg2jUX67p99ESwZoU11jWC09ZIn2U31y0Mtn5iX/twV7J4EXRBU pR+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=uwWryJ30; 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 p8si4547394pfj.378.2017.12.14.22.26.24; Thu, 14 Dec 2017 22:26:24 -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=uwWryJ30; 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 S1753779AbdLOG0V (ORCPT + 20 others); Fri, 15 Dec 2017 01:26:21 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:46817 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753596AbdLOG0Q (ORCPT ); Fri, 15 Dec 2017 01:26:16 -0500 Received: by mail-pf0-f196.google.com with SMTP id c204so5475510pfc.13; Thu, 14 Dec 2017 22:26:16 -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=uwWryJ308LdaEtJNoSORH9s6A1AEzi2FYPrjPX36v8I6HvXV7T83ZALjOJMFcXrOu8 GEbs5CxHtiBnwRnRusSPwGYZPOarFgqQpkKQtqbcZwMBpBtXWGKwB7BcvH1nnPTBVlzx rMnyeUbQebbp5c9vcyF8P9qqK3cOcPzr6RcmvKguP93BDKWnR/dNfz1bJHIzOMm96Qd0 q9rH6UdOQ1Kkf4XvodKjLmL1Dw1Eto0Owj8bLxOc+K7MF5grCcX22tRYbgONKKqXnx4N h9QZ563XKm4K44UrJUTzGn3MeYVhPw0nQkeSWvg97X/XkC6K9w7CZR/Bag+yjpELF77t XY7A== 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=aEwlgCYbkAABYPfXw0Whme9ZydSIProKfZ6Z0OH0/c/2vcMFYgLPLfLAx1rw5UMP42 Qd3ZK3FYRkn6w0LUqVI6m8B4sEQE2vo5GBHmEXu3IMnMZMave0uLIEh04WWYd0n0ERbe iWcwtquO6i8NMtt+LwPItSBC4aUQZFzRT1iLdJAjIvkgluJGeELC8cMluvjCAK503uVe L6XYzwKd44ATP9wwzB7yYa2yx0DY+tpwgb3IgVE91cP+k9o1kH3ZSS/6BluptKzQdlzH 7H88Xz0g4uUoSCwFLXZvpvETtbX2Y4hJ9emIDxXpC7TLcLzSRO5HbgfH4NnG7qK5OQFL qCdA== X-Gm-Message-State: AKGB3mLTyuI7Hd2+s0wgkJWzwGEv69blO5jx/tN79F5ZQsnZg3dHAdUk pnNWiLchnTIg+2AziKaKmWw= X-Received: by 10.99.178.14 with SMTP id x14mr10863697pge.423.1513319175786; Thu, 14 Dec 2017 22:26:15 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id p13sm9702642pgn.32.2017.12.14.22.26.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:26:14 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:56:06 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 07/19] ARM: dts: aspeed: Add flash controller clocks Date: Fri, 15 Dec 2017 16:54:31 +1030 Message-Id: <20171215062443.23059-8-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Cédric Le Goater 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 Fri Dec 15 06:24:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122052 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp73538qgn; Thu, 14 Dec 2017 22:26:34 -0800 (PST) X-Google-Smtp-Source: ACJfBovTHD/DC2WIPlej6ekqhlLpbs5Ni4RZWypr2CH/pVURfGXQCLnQSeifpMHqTyljyeeRfs3R X-Received: by 10.101.98.194 with SMTP id m2mr9012687pgv.173.1513319194496; Thu, 14 Dec 2017 22:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319194; cv=none; d=google.com; s=arc-20160816; b=J9A1UMo5aLYEPBLwK2rNq3WiLpS1GBpjWbbh9uy80ypz7D6KoPbbLc5+fvLKGLpAz7 JCQo4LojBjtPo3vQ8ru68Q6WS9KwaGjTxV0n6RNuVDNbFMirY75IMVCG6ZQ7/6/mPQhl us4H08shO083tt4akHMZo2AistpsoHjDcmn8FFZ+Ue0QyVeyyWVnzgQjYF0rPSoBc9LY f2X8Ka3jeYDLkQ5g1HnaOWbMk4FZZDY9pOPjA2MRImG7xCU4kj8/NDG67/G9rkdjBfvF rCbWHlTNLihsNa6apA1jfP4AnonJrE0lQOHqr+0c3SLHN/830Qh5YUCq4tNCZcZzOXvt 7LAg== 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=gB6m0gxo6h2ZbHCZVynq8BmxW1hzr5J+r6Pnr9Y7SG1RD9EShXdtO0x5gCcc/f5VEw 4TYidKm6/UWY06DNQYMLVWR7du3JA1d9UkhzLPLFymWKDh5k7fEg99F0WEIl/JCrEE3r h2NLXq6ySCHoSNLha0umlbvg/Xd5DyXQE2/vcgB+VLYHBEmwPdhATvReYrjEE4cJZEw6 b7Slq4hzRliXklfeHVEZHJJ5llB7yazy8XD0PPQEyoVsNv+lLf3RUWJsc0iNrF2XZcSv SubqxjhPw4lt8TWd9Y/mALw+0py8og9iRQVkq604zE5pbIwM+OAlh2cyqVJOy8bofh9I eG+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=KwWDAe6h; 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 p8si4547394pfj.378.2017.12.14.22.26.34; Thu, 14 Dec 2017 22:26:34 -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=KwWDAe6h; 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 S1753892AbdLOG0a (ORCPT + 20 others); Fri, 15 Dec 2017 01:26:30 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:39383 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753173AbdLOG00 (ORCPT ); Fri, 15 Dec 2017 01:26:26 -0500 Received: by mail-pg0-f66.google.com with SMTP id w7so5170331pgv.6; Thu, 14 Dec 2017 22:26:26 -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=KwWDAe6hGbdqMAIMG2E5oVHhs1Jtg3Q1otgtvhuVTm6CmvigAimGxc1afxoo2EVTHm E0XV+x9VOcWRinGWrr5xdzkXwywO63MjuL1nWKZ7VHgOjtMckoHpWdO/tWVcnFGvYXsJ ENi4O2SzjME2xDCg2bo+IfYRlLHsyaQDu+UXq5oqrDSiOg2UtcgJ0y13YOKmWvmAsjoX BJzR5MAbL5phAqEZbRAyTeFhKUa/9wXp3sLux5VcNnf+ELxXw/vu15KXkcz643I5flOy goILwXP+Bhqu4cosfkiN4YJeIwP+0w47XeT530JmjN2WMX4qAlodWtrbmfqWvpwIxaxm /Lvw== 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=fGdmH9Hlx7c5nT1wJd+yyeZYjRr07K6S9kI74FPCdvLTO+3i1kuHrfbDVMB8Aw/RXk m+a7hNtkIX2JWFYVftJ8b283F/12s8Y5GS81+sQbGb8vMOjzZLKDg/Z0SwLzjYFB1Jv5 u8zsD2ywYfFgR6+Mia9XuSgiUFpDg98SrG+Co0+FL6CrnIo1+DL4t2rykNd+P5JOjy5H lzhfZYj5X8h/APF9UHu0C9OjGLsA9fgjOWHnX6s78alvOOrrIvwOW3nqDpluBY0XqKld qiPnT6KZoJ/helxT14W0ubRUTR+mauNV6fLple844eZcOUzKfCPz9UFpmEHDx+YeNgyd pjnQ== X-Gm-Message-State: AKGB3mJJ1nXLn4OIST2HZp3zlJqidmibRtZNWnSvjfdNrTm8xQpQYva0 NU7e3+zPe5BLlNckfxrSH8k= X-Received: by 10.98.66.196 with SMTP id h65mr12318405pfd.172.1513319185752; Thu, 14 Dec 2017 22:26:25 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id c10sm9003296pgu.61.2017.12.14.22.26.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:26:24 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:56:16 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 08/19] ARM: dts: aspeed: Add clock phandle to GPIO Date: Fri, 15 Dec 2017 16:54:32 +1030 Message-Id: <20171215062443.23059-9-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fri Dec 15 06:24:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122054 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp73789qgn; Thu, 14 Dec 2017 22:26:56 -0800 (PST) X-Google-Smtp-Source: ACJfBosjRCdVNsPpREoBfj60kObAampILxHkaMw31wn5soRuuc7+Ctdfbzs8P435I/cg1owRRtpm X-Received: by 10.99.167.6 with SMTP id d6mr10816479pgf.100.1513319216873; Thu, 14 Dec 2017 22:26:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319216; cv=none; d=google.com; s=arc-20160816; b=s+X0TqiRn6oVXnS6mbkZuR2ywhcJwjO2xJsK8s7sz/40qI61+XP0ra1tnF8cv5lUHm 0YBnukOrH3u0Fni3MHFh8hYgnwcT7E0xgKXuF3A0ffrTh/e+jCm2+9Pee/s/KXwGBsrj 8P95Qi2WVbYjBpIbZpGA3jE17AmSHJ/dwRg9RolGaGbJxWChhOIV7P4tcXR23AgKNk/e 4WhLjjppmotjukJHi/TPMHjqo9QQ+iI8N0PAoaMyxaR0Z30XEmFZHR5uYPw6ePV4uUc6 AB1Byee2b2QFOxvCYudh1USQdAfDJnFlmwJmJRMYbMFmpN7SDitOT/Pj/p6N5SrAvqR8 cF3A== 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=SvzNZKrOOVZhAWbwr7bdpsKbGSjNkVUEpIl7WpSEZsohU5xjunBA6V386EaNs4N5Us CTg3LMmttfL0+fAZpyAhYoSmMPpjJgJVTQVvvOvWzuRvEDKjlaDfzEkVZLQNhrlZRjwv XWG+tQTZDtJNn2E/l8SYo5KX0MHdPpmCL41ZIQN+wkNx28c+Yq+vVksber/VFVDyR8Xs MX5nNXub5GdOtmJTKm04Efl59RQYpvURAFdhXnXlrJt/gmO7JCpvCituFHUPlnEsjZg9 zhlNfNlvD+m9YBLh61YeyEtQY4/FTbuYuSI9kBjz6iPv/j9pG8yEoUEtddmPpfkwJ312 GMBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=oyfqt/KQ; 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 p8si4547394pfj.378.2017.12.14.22.26.56; Thu, 14 Dec 2017 22:26:56 -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=oyfqt/KQ; 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 S1754199AbdLOG0w (ORCPT + 20 others); Fri, 15 Dec 2017 01:26:52 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34432 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753045AbdLOG0q (ORCPT ); Fri, 15 Dec 2017 01:26:46 -0500 Received: by mail-pf0-f194.google.com with SMTP id a90so5504967pfk.1; Thu, 14 Dec 2017 22:26:46 -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=oyfqt/KQ0HA0ykNrs9+PP8nC5dK/iG989zf9oczhzRfmuGATd1AIxypzBKMwtCyc3c c+JFXbdBGJeFCQLeM//FrYTclgUp7kFPyy42jHNQW0mAEfccFEz7wfzOqN24ri22iyCI 8iMeBlOOgBoiZZpTrvXahVv4q4cnYP+TX8m+KogCfSj1uTWUrB1q7AgsuxXbyOtpcikz mYrswsmbonLwGnMzpdDrFO7PnHnMTkPrBXDkQnmsBcRx6wc236+263tq9mFPIBZ1gaYt c6LwLk3bTVMuDnNfwIQ7G4L1WmVXmdDuhlEJnsEpbwFSP5UAFUk5zBGqi356zZHvbtTQ dPsw== 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=mDpe9eUfRpajzvq9zFBr7EsDzq/Sy8oclN+p+5EXtsUjResRfLM1GZzs3ECNGEFVpf ehAUHMLz2OXuOh9dFPlbdV/OxKATMRJuXjwjh0PvWiRBZPvhhRIP45W0cc4U0b8I5OyR V+QyAvda9/cZHe+SshyMuVgVpmkR94eqUM6+SxztnYgNqH02MTPkYWtFU+HPBYrnk2uz L8l7HykBLb8QAxEhJVmrReWWNWjpM5lzzZy3n7CKBJrPQNqwQ5tzKMDAqU+4jcnU4Jqw TsSmvFy+k31mJfq8M/094Xn10CH06oqcCG+rp6oyH9eceXLSc74mXhLbtJGE6PLvRHWL 717g== X-Gm-Message-State: AKGB3mK6anVoVv1r5tqVYtYC3pF1Hcr14jvOTjkVitJHXhHJ0bbPtxH0 A9gnMx6UQeZZFwmR+6EOKPg= X-Received: by 10.159.205.136 with SMTP id v8mr12127505plo.187.1513319205794; Thu, 14 Dec 2017 22:26:45 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id x3sm9266780pgr.7.2017.12.14.22.26.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:26:44 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:56:36 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 10/19] ARM: dts: aspeed: Add LPC Snoop device Date: Fri, 15 Dec 2017 16:54:34 +1030 Message-Id: <20171215062443.23059-11-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fri Dec 15 06:24:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122055 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp73875qgn; Thu, 14 Dec 2017 22:27:04 -0800 (PST) X-Google-Smtp-Source: ACJfBos+65pg572pXqAMuTf2MaKo4vDEQ1s8a3ydb0cr+LD+53O3MQxtcByCNFPJx8z2fiyg/lZy X-Received: by 10.84.248.145 with SMTP id q17mr11885291pll.416.1513319224591; Thu, 14 Dec 2017 22:27:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319224; cv=none; d=google.com; s=arc-20160816; b=NFb0qepoHwhW0VqobqCysg1KybDy6xPqG62ifT17jW9GcHENo/aQVtPfOmGk5m/1/A nXfKhIZ2bV8liYsNib0CMhqiqt7XOeLYoVxxlIol9cYar/zxV0U5S1CzCScM512fVJNw zFw4noe3iWfiC5eByfPSL6ur6DFFSebbjUTiL3DbAnkrj0NkyZm2E5ZoFrYcoPmvCM1p 6DLdsgyDltH2lRyc9xeEKa1UxKeYC1rteD0a1QLsZ6K9W7MqacdhHmQJ2500Atxn7OFQ xxZyaVlhpXoMCfhjzxVWTmgf391flBmiiQOgRg4HrpJuLcmD47BDBp/QhGprx+U3MzBc 0flQ== 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=N2mjKxgZoAoj9sUpLR2hwLYOAj78ZjvS+X5/uWPTIh0=; b=qUNsyyELvigyNSzQYUPhsRyMzM77nvpE6vTptHpZgroB9LlKj/GchWoNPPysMDVEMf LWMlV9doKoDxIDg2TfEBUr2TP4q1trSLcSUpCBKt5o26peNSTwKfq6gfn7pKTHRAPsE2 XM1TiC8JiJV0gVJar87rWghc8JWlXPWsWsfW377ghEpsndFT7yyKSiO7DXaikmt1yay6 gEqJLmHGXZY1bUJjBvF38WLW8AYGKHPGcpJEXSkhyjjkirqjwW+JlIGOr4epTvqa7AMb 4G66TzKZelOG1q9EyY28kZAUA3vSMuVpWbGBx6WEd5PfOkqLWICL6nep/meg9vA/MsmN QHyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=eCOfBo6q; 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 y20si4538269pfa.158.2017.12.14.22.27.04; Thu, 14 Dec 2017 22:27:04 -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=eCOfBo6q; 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 S1754268AbdLOG1B (ORCPT + 20 others); Fri, 15 Dec 2017 01:27:01 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:41447 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751651AbdLOG04 (ORCPT ); Fri, 15 Dec 2017 01:26:56 -0500 Received: by mail-pf0-f195.google.com with SMTP id j28so5486521pfk.8; Thu, 14 Dec 2017 22:26:56 -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=N2mjKxgZoAoj9sUpLR2hwLYOAj78ZjvS+X5/uWPTIh0=; b=eCOfBo6qBSvRa99OFVcf+IEc2RhQxkM4LAM3uBwfM/UftU6EtaKjHIHA8XjuqyND4H ur2PW8HIOp1PBduep3S14CUzx0O60Xedzn70hpUVKoarmZ6dAQdSrBgLtZgbEuC9pRNZ IzrxK1DJxzMy/qiKOdSR22a6ckLGLw4YWjQ3ld2IPGO513S0s8ag2VPOfpY89BJUUFF3 42MrQjoMUmRz9sU5ZesqVqEo7c1bpgAEA8qt7DvQvphWN1sr7ncdcV2+oiQ0B+2+u5W4 MoBpyiKsLylRe97+wSSxRXu8m5jCYVe33oxeSD9HSEsV6XpHeCRdStSCOczViqfPbHYs vaww== 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=N2mjKxgZoAoj9sUpLR2hwLYOAj78ZjvS+X5/uWPTIh0=; b=diJZyVViJifnkEPgzocDvO58ZzFVwoRyT5skm6cenEB7MSCxl9ezutWjF5IpAw0vgg kmrJNQHGNkiOCAPtoRB+syKf4CWeETXKPkaoQLdoCn32WxIpAjprqa3B6XUdrnxMifks kSbX1VgbfktlfosLB56uhtrkcYU+v4f0Sm8vXnJXSinH+QBbI02RfM0wAq+XSiyI9Gsf eJ78ERHCH3qNSm0KepFJau7AE1W4V1kYt1ZiWTgJPOVTxFMXIVmRbn0+IX4QsuBjdicH I1vmLproOWDAZzyeyyPaH4TjV9mqQowzp8Huvhs0TG3QWRlQmJLgEucgar6qw3E0UQbh MNtg== X-Gm-Message-State: AKGB3mKCRNlxh5w/2VB4hy+8YjCyuweDX0uVkrffGuX/miK++4SalwnE pbzV9MEqvXsDaEvNN6Aj9W4= X-Received: by 10.159.207.131 with SMTP id z3mr12343320plo.259.1513319215707; Thu, 14 Dec 2017 22:26:55 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id c8sm10771573pfm.92.2017.12.14.22.26.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:26:54 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:56:46 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 11/19] ARM: dts: aspeed: Remove skeleton.dtsi Date: Fri, 15 Dec 2017 16:54:35 +1030 Message-Id: <20171215062443.23059-12-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We don't require it for any of the ASPEED systems. 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 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index b3580f37f507..2d7ac577d6b5 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include "skeleton.dtsi" #include #include diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 50766f0629f8..030a760696fd 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include "skeleton.dtsi" #include #include From patchwork Fri Dec 15 06:24:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122056 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp73999qgn; Thu, 14 Dec 2017 22:27:14 -0800 (PST) X-Google-Smtp-Source: ACJfBovIl9P4sTzqMtJ3LZSn6KgVh0dmXoC2e03XxkAC7KBf5TvulF+Bl+hziw3CXHLpcIa/J7r1 X-Received: by 10.99.111.193 with SMTP id k184mr9032372pgc.99.1513319234309; Thu, 14 Dec 2017 22:27:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319234; cv=none; d=google.com; s=arc-20160816; b=PuxtF1FGluZWnK1s3WE4fdrRdT5O9MUaXjkY5gJvry1ZcCX0OB8uqwExv/VbMtggwS qJ42JzAUDYwRT9gmAKKKmqfBZXlAnyaSxJwmczGzuM/WRbPABgOX02QzeOxOXfEnsLYP b3Of0yHQH9TA9Rp/8WyJce8RvzteUaHAvp+6Ta/BbLleCOcBIbFanAUQOabfCXd+1Byg c6wvKhhjLhJg+TcySj7aKHU1vi7EvD4xTTca5O/Ri7t1asJLyx3kpkCx1XAPniGhjrN9 FfJ/7PBJ411gfZO95SxMuOXbWQqmWx016WwgXI91q8kfXuLLvABwW1dHcnsQxZ7+Jyog KxFQ== 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=Uc3jU1/1H8tKPdnc5cYVF2yOUITDELO3A+E7xJ+nKKE=; b=ROI0hJ7mPonRYv35KK3+Ai6Fe8N+NGQ7YuwNkcpkvfqFhjV6WMreunxiiIq4QItTDA ABULLxSSBvWaFI9hEeo66SV0pxesCNb/YX0n0s+bNPewLkWt5D3vC+Nhfi0V/7uGRfqn OG0fOvg5eUDxMHmaXAIKPbi6g4M0Sdy1cNPV14Q7JGl4i8hXsMEz5idO1T7R2SJf1Qg/ xg3V/7zvfc3fCYDgWoCqVn4lhoZzObcygHmJZfovxonp3R/GEtjvpyZusn+1lZ4Mv95P 2rfWhKSvx4Dk8WQbjLQMgacF+lEaOC4FU/aC6KhXrb14oIQRmWXhiRxEC7y6mcOpZpDz HAkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=dWEhpfz1; 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 y20si4538269pfa.158.2017.12.14.22.27.13; Thu, 14 Dec 2017 22:27:14 -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=dWEhpfz1; 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 S1754352AbdLOG1M (ORCPT + 20 others); Fri, 15 Dec 2017 01:27:12 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:46957 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753491AbdLOG1G (ORCPT ); Fri, 15 Dec 2017 01:27:06 -0500 Received: by mail-pg0-f65.google.com with SMTP id b11so5159982pgu.13; Thu, 14 Dec 2017 22:27:06 -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=Uc3jU1/1H8tKPdnc5cYVF2yOUITDELO3A+E7xJ+nKKE=; b=dWEhpfz1/giNPfzR38nQiwmWTSUMmPYfr6kqS8YWi87Qrln3zMQx7z/uVIvEQ2spaJ wyt33YlMGeMmzFELyHYcNEvMRyGxD5PUjlbQ5dwg+nCXrz45g8lt3xiDkaaqgRS1h2sf uzJ1SYif9gwpjoeOo2vihYasLifgjjWB48QWqGjOqLh6gLFIko0Eg+AlrJmVFLs/gmYn 1FA+QjUT/HwR3X/iKVgc7jRBiUFDoE9xoAyJ5U/xdMci6gHPsjuhxknWXfplADbbtz3R hiQPYTpE1PgsQzGJ0j744YLh0hGPThT0kDwKiCTAsRr1r7MZFNB5gOU8R2a204TsxPjY I9tA== 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=Uc3jU1/1H8tKPdnc5cYVF2yOUITDELO3A+E7xJ+nKKE=; b=kT6GJsIwcZZh97LnQaRzcCzVaD9k8oIkzI3H9tRIywRw/p9pDuTLr5cmUdDAno6e3R G/p6Rr9NR2F3n6Oq7TxJ9EpRGwep2HqFcEbehwTDoMFZS2sPStS5/TnH1IClpVFWhC/L LaxT6oAgkDDdy0ajPG4kcVKibwuZqBvKPMp5dCSYYhpxHPnFCQ7KvJ9HWjaID4koTxYK WSCPl39k93RQ5uLqnD7FFJeacaluvNDijJEllxzeTvtOXTwzjSAMdstx/fFlJjPwlDXK 0yFRqcC5zGLDjxzQrl9RDrLNygQkwv8jkgBM5wVPU4aZUktWq+lMWhybo2yug5XulXzD qAfg== X-Gm-Message-State: AKGB3mLse92k5sgbgwKbGbEIDGk/KkgLMZqCqiSFdfHqzPrZxSXkRx6y uZ/0SAJ76m9ApM+xvzrEwsD0SIYj+xs= X-Received: by 10.99.124.23 with SMTP id x23mr10914860pgc.189.1513319226115; Thu, 14 Dec 2017 22:27:06 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id h192sm10505087pfc.139.2017.12.14.22.26.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:27:05 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:56:56 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 12/19] ARM: dts: aspeed: Update license headers Date: Fri, 15 Dec 2017 16:54:36 +1030 Message-Id: <20171215062443.23059-13-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") these files had the GPL-2.0 licence added automatically. Update them to be GPL 2.0+ in line with other IBM kernel contributions. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 +- arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- arch/arm/boot/dts/aspeed-g5.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.14.1 Reviewed-by: Cédric Le Goater diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts index 602bc10fdaf4..3e6f38e5d5d0 100644 --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0+ /dts-v1/; #include "aspeed-g5.dtsi" diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index c786bc2f2919..a8f0c046e83e 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0+ /dts-v1/; #include "aspeed-g4.dtsi" diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index 8067793129ea..a7a9386f964d 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" diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 2d7ac577d6b5..9c175832babc 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0+ #include #include diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 030a760696fd..360329eab7c3 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0+ #include #include From patchwork Fri Dec 15 06:24:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122057 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp74151qgn; Thu, 14 Dec 2017 22:27:24 -0800 (PST) X-Google-Smtp-Source: ACJfBot8N2Cy4QB+iVWv1HLGxpPgxXOmeXbUGAVATekb4x71n66FlQUYyBErsSFXKX33fKlYjF38 X-Received: by 10.84.168.98 with SMTP id e89mr11983082plb.417.1513319244532; Thu, 14 Dec 2017 22:27:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319244; cv=none; d=google.com; s=arc-20160816; b=rE9Rap5hHYPukAnbmSaYubCw0nnznpTKEBE8fmlPThmbwDz3kRWQbjKNLtVvIaARfP GskY4HeVK1wyqkhPl8/kAhv6tttaPCczy9gEN2DI2pFgFUBCjgKjDQND1kV+dfjlc3lH H7qEhE8aIZiWInSP3Zrvc2rvhJN9wgIuEmfXYDphR8Rku/cMZpvNA9cPxNKQVdIIix81 LIMv3I/69UnJueZ33pBQT1xqNa6TbQMLd0xsaHhmlmPF8glN2CqazpzO8Qni+jF0wVSX uPz9je4lXlnmn4S2gKm5FTtZCv9PMhrEEPwX3h2TL0PKnaiVnO3gEus7XAgessu4brJL rRNA== 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=WCmLRCm+mtemRtVaezU3EaPmfAqyA8hViSEO/sjQPNS2t2m7l+7f64thwfAzccmYN/ ja2sdhfwP0BGkeKKT33qZCsrTAtnzRBOW7tXJVUQ7nij+mUrLv7LNJyaszd+oJkNJbAe hnqRu9bc91idauhqYZpkjZw/p90XD28ojGRstsF6i+275SqbGJweUzo7Hn2RvoAeuJ8h 8IwOvhNpPKkoSz+UR/4tLUvNJvgigeS0ksBNgdT+52DMWVgdUmqOqvRH/hyWPpI0na3M G2/qTEmqDf/87sDGqbUtsWVvWoTtJzL24XPJq1pafK1Zjrkk+tBo1MdfKg4/MAIDa7/n oMxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=pcazoiPL; 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 z5si4059166pgp.129.2017.12.14.22.27.24; Thu, 14 Dec 2017 22:27:24 -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=pcazoiPL; 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 S1754446AbdLOG1V (ORCPT + 20 others); Fri, 15 Dec 2017 01:27:21 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:44900 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753317AbdLOG1Q (ORCPT ); Fri, 15 Dec 2017 01:27:16 -0500 Received: by mail-pg0-f66.google.com with SMTP id j9so5162741pgc.11; Thu, 14 Dec 2017 22:27:16 -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=pcazoiPLeHi/lSIl9ItVYiKLrlg/JkWe/j8ij+OdOjhADlBPeD+SdK/az8GLsxSwej 38qAK0CcopKjknbgL5KQVA0fpwdzJtRFVvkgS0dQrYoTxjx/vngP1djp7+HWyCCqWe3y i8TTUNWS0AOUQuPT5WFYQKrjG+hhh4nymnkfos68J6bH/kgV4AsqJ737lGuxP+mEWv+g 6E2UGECgBBA2FgghohE9keJ+ZBg23ecVYaH5FygFFWBC14hAsiRw0SRK58yQd6xybDgw +RSlXxuwGaCp9G5Si+b7J+Zli5Ps28bxXw4nK36m3wyvFZ9mKxOSjhPTpn62H4uq2EG6 Nb9w== 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=GsD+6TzoxBsWbyT3eMqcXrJHeBIHYcy8QGh42koz2jA0h6/mk26kZUMYSwIC7A5YET V2dFduI62x/ZIu4FlylOc13xNQmjCIt1WwH76eFuoOSb94kchKUjqZ2HJNTs4D8JWG4p jNKLVkFlBPEs/f+7EQiO3C18Y2RCCcLLMcT9IfTiQfu4XYKcf45xQc2UwWGI/FlmP3Kx enY1FMq0j/8Om/pyNTD1+4v83TiTm8xWpA1r2QTZiNlaHN1fcrMK5LZ5hbpM6mWt15gr +2U4/32n1WrxhWgw18JlDB3McQ1h1JV3Sl19gyonWoOG1TUlBKCFvn56bZWRUO8uo6Dn mPpQ== X-Gm-Message-State: AKGB3mJR2fjqwLagyGIyvC0dBnZ3crsLLzPMtZlvrR0JgtIr61+/WabJ pMdLyj+gHfSiDVhrmHhmEAI= X-Received: by 10.84.215.198 with SMTP id g6mr5153393plj.151.1513319236014; Thu, 14 Dec 2017 22:27:16 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id m11sm9773234pfh.35.2017.12.14.22.27.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:27:14 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:57:06 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 13/19] ARM: dts: Add OpenBMC flash layout Date: Fri, 15 Dec 2017 16:54:37 +1030 Message-Id: <20171215062443.23059-14-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fri Dec 15 06:24:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122059 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp74370qgn; Thu, 14 Dec 2017 22:27:45 -0800 (PST) X-Google-Smtp-Source: ACJfBouX5iMcXfHFoMvUi7+2CEjHYXO2iYuFINqQFOLOQqr4NkZ9I+VLHk8kPE8LIzAFZazShOCH X-Received: by 10.98.17.72 with SMTP id z69mr12101847pfi.86.1513319265899; Thu, 14 Dec 2017 22:27:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319265; cv=none; d=google.com; s=arc-20160816; b=hLix3Tn4hUX0LhWq6KFAtIH6fcSgoRWVaW2r6e3a9bmqw9VPZ/uU45yNszMpbo1rTb OHRAy4fFKCPy+aRJMDQu22nNynYwF8ONlcN05q5VCbVUJIYaM6idR3Onpby7yls/4Acr fMrEfOjW7zJZ1f8pPwckZjubjNdXBb410md2r9CJqxywkLH73cDr7xEa/alDPQtcFsAH ZZSYZodyRkH4v+TVxPVI0D19hcMjHvR7TyD18SF3nqcC79oMURn+JSzMtZ/eCFa6Gs6w o7hIjVIuPFZGtoVwybGRll1KAkMn75Qqx116rWo2fjBlQH9w/c8AjS8EGrSaubutRguM 1ZLg== 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=ymLpVVGO4DBWH0ddd/oiyRgQcxTlcnVXzKdqFp32Nrc=; b=f55rZoQgD0TgXI/8/mm+9xfrP/ro0O+GmnAhpMZIHY8Iz0kJdXASbNPYcIF8inEjM7 IpFopX09wW/OKidkLrbbYkrCmmXFojMhMT/FvNb2DGVRwnCH0+rYXwDMVCIn8X6UPydo 4yIStGfEwC3HFSas0kqMEF59KQbUnT62+e1U25goZ+ob1fsnFf8JmV/qnBGWF34rioZd jaX8eYROCXuS5juSyRoLShwjaVaVprxhVgQOYKjQVAM7mN86HqDZMrw8qQKqVTdnboe/ kDg33Sg35684OGHDKDGTUHixeAVN8uRXxNzPmPTv0ciD685GOvmRbhveF+3bXDwJoO0g fDWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=MC/AQNiv; 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 e90si4607571pfj.4.2017.12.14.22.27.45; Thu, 14 Dec 2017 22:27:45 -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=MC/AQNiv; 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 S1754565AbdLOG1m (ORCPT + 20 others); Fri, 15 Dec 2017 01:27:42 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:42038 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753478AbdLOG1h (ORCPT ); Fri, 15 Dec 2017 01:27:37 -0500 Received: by mail-pf0-f194.google.com with SMTP id d23so5486817pfe.9; Thu, 14 Dec 2017 22:27:37 -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=ymLpVVGO4DBWH0ddd/oiyRgQcxTlcnVXzKdqFp32Nrc=; b=MC/AQNivsH+pHmoRfgFPHaviAt8U+Act2ljMAtpwr/oh0ghzhYVgyAkrrHWZbYDT7m rXxgogGKFksqq58pGmCu2R53Y7YiYiRLzYHw3uOJw7TwYDvG19w9HabaKIVYhuNIdP8U fJvvzKHVp9kCBsPSFdRiC8Je5Hmq8KH7BYuRCr/fCX2IfGrzdCKGUtjBFLye+Y42oPP6 NaFR/sMv8E4mwNt+yrJJB6AIwDXgDfJYfP8QLlyIhwlq4Zy/0+zaEwGJ61vpSJiC4RR1 ysl/SubHYXZkJ2nJ9Op7dKevFC0HYuZZVB6uyXqi6alhv4y8RZZZtgvHjGJqCaEA09Av vJXg== 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=ymLpVVGO4DBWH0ddd/oiyRgQcxTlcnVXzKdqFp32Nrc=; b=kI4ip2CPOrOUCQYmYLq5juiULIojrm9PvXnSSCPjiqjnuhK9oMljgHDfrAGpNdncft OItsnT76bTcWpK7q6CpOrGRc8W+rvJuB0s+HhF6QPVMC+Hkw0TPwOpj0m721tOurbupQ d7rbXBWCPBJTm8o9LR0K6P5Nx0SxmNHlXIUD4TyMdPRD3RTcQJ8PDcENPnkIrjsQsNKI k5AFAOoz0BlZGdCrdxjvDNts2AddjOgvfh6cnNs/bDr5C2DiZJeTrvlrCxxCsWMNs2zT tHR3XgGp2evO2OPR2JaQysonSnDkh1z9oOxs9a0UiRYimggzuCETuaFsh2fPJTDzWkVh 2gIA== X-Gm-Message-State: AKGB3mLxpFsB28deO3tNHD15XUXheUTWFfGovOQHQayg1Fe47n1A2q5w 7tlZxO6LC/FAH7pcbf43ii0= X-Received: by 10.101.65.129 with SMTP id a1mr10951682pgq.203.1513319257058; Thu, 14 Dec 2017 22:27:37 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id v64sm10446757pfi.187.2017.12.14.22.27.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:27:35 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:57:26 +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 v2 15/19] ARM: dts: aspeed: Add Witherspoon BMC machine Date: Fri, 15 Dec 2017 16:54:39 +1030 Message-Id: <20171215062443.23059-16-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> 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 Reviewed-by: Brandon Wyman Signed-off-by: Joel Stanley -- v2: Add Brandon's reviewed-by tag --- 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 Fri Dec 15 06:24:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122060 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp74496qgn; Thu, 14 Dec 2017 22:27:56 -0800 (PST) X-Google-Smtp-Source: ACJfBovSbbjyzrDyiLa4ZgY2mf8NGom6XSJ45/P/GmpCGy8z8anLjzswpsTNjYHgISqVCt1nx5iG X-Received: by 10.99.97.76 with SMTP id v73mr10639443pgb.378.1513319276180; Thu, 14 Dec 2017 22:27:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319276; cv=none; d=google.com; s=arc-20160816; b=vqxJUdnKdqn6p6bAGuWR4nc0Lydj05Bz8SKSnsSr/kZl6gpgYN+cXQ1TTFpGtKfIX7 PMLVFChO0GCVA1940OCYvkFwmcEXaolK9kOnzhCUQR5WuKWde7wPfZ5u7s197BCyYWQX 4DTdgBj+pOvDubQzTr9HtYv8lzSkUPdDyOPXKbntcBfGKT//3vyire84rrRPSHv3INV7 WKiZMoH1Bx3RUKimFyVuf7vYXk1qv4cbQEEBB9qjjzY1UXsB3SeQGziXG6RB1wFPtXf1 n0rCtRolTRjVQshb6rnv8O1UHmlveQXxPY20WzgPvlFhvJI5XYupZz1cvjNWmtRteYOY oajg== 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=XzhpncdzC6cbIR+H0hV7BU4VnFoKknMiV/QfU0kdFovcFjYJjt6krutgD45TaTLa9y cdVVGVlwa4Y7gyQgYVj0FOcLpfFj1CpwFfQp3yob+xb4fN8fK4s9BaT8IKoao1gXbya1 rQbry9DodhPt9y3lyOhvycEHX+AFIl2rqFXpy3vry10BjL6wKnhORg1KPvCajNbLNoLf UCdPhx7TCvG80xqSqoLZWjRbYsWcYy3EWozcd0Qg0nucAhmafrtUxP3IQOAmy1w1qxyG Jh98KR3es3kQWdYUC8QSPwh2fi49q0qMZH/dSTzXkD0B9wEIB3eJ7YMKeeXCFhqhdtMo m28Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=JZ/3INCK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si3804902pgv.360.2017.12.14.22.27.55; Thu, 14 Dec 2017 22:27:56 -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=JZ/3INCK; 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 S1754596AbdLOG1w (ORCPT + 20 others); Fri, 15 Dec 2017 01:27:52 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:44953 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753549AbdLOG1s (ORCPT ); Fri, 15 Dec 2017 01:27:48 -0500 Received: by mail-pg0-f65.google.com with SMTP id j9so5163446pgc.11; Thu, 14 Dec 2017 22:27:48 -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=JZ/3INCKC4cBSiGVKt74ND+3YRhZFzZJ4/fTLERsBWlfN3YzapNMdp0a9tDpcZ6qe+ 41y/st5ZwOjY84800V6EFgOflTLNp399vNEH08XUG+dLc4OQ9dTjbggdhSSYJ1uHxYVR DzkepreZU75gnQaqGncNDONbrBPrkas3p5IhulvztlfISfRsBMU0CIJII1jC4yB8KfqH mWhlJhB9L07wz3CqV3nMqssx4iNmEkVHpZbY/1dHcrthlpUiWDJWgsGwrz0H5io6ALyz jOWPFUdU9+Z5zcinaOu7r9ya06y5qMR+wGMWs3o6jNodIe/SPDFDiz37OU2F5k1CVFxO u4wQ== 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=FFfyZN1lvSvw5GElOukZwAJ46IThyf0NYprFhygqTRHV9lbB3h0UnhSJ6Pmj8Zm8Vz 0AFYQbKMNQotzZ0SAYDs2QhUTfJZsXjrkf2ktklVAHbt+CP9oeZoLfi3BTV685AlBcYh YopdXQorMmf1fxGQOOELSqwL8rvBhxCoZb8uxJw2Lp5vzoZv3hytLR73Vnp77/8NOGiK xSs9+4kD32bHXxQFbOWGJclYnbsZpuADtnxO34PpdGUeucEO7etyAO5NZp1Q9kFni4+Z W9OlGO7eTINELSWiistvpiWTT20xEuzS0d6olCuiZ+CHUAL0cUxI2OD14VqAOLPwYaAI wUkw== X-Gm-Message-State: AKGB3mLS3hrrUKSSlgRP9sUx8Ejeq4ZO2HHe22zE8sCRncclO/xw4IzF uz//IRtF6dz8yV1a6v/qQ1Q= X-Received: by 10.99.111.206 with SMTP id k197mr10671269pgc.182.1513319267982; Thu, 14 Dec 2017 22:27:47 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id t14sm8304184pgr.37.2017.12.14.22.27.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:27:46 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:57:37 +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 v2 16/19] ARM: dts: aspeed: Add Ingrasys Zaius BMC machine Date: Fri, 15 Dec 2017 16:54:40 +1030 Message-Id: <20171215062443.23059-17-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> 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 Fri Dec 15 06:24:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122061 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp74652qgn; Thu, 14 Dec 2017 22:28:08 -0800 (PST) X-Google-Smtp-Source: ACJfBosW1EKbrHMP2vDHn1qGIYwNnyAMlSjNZIzrbFGKUtxSKBFHl0gQ8oD401ew89o9Rmth1FnK X-Received: by 10.84.195.3 with SMTP id i3mr12332671pld.282.1513319288827; Thu, 14 Dec 2017 22:28:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319288; cv=none; d=google.com; s=arc-20160816; b=eF4ED2oBXBtrt6otE+AV8oo5aS2PWeWpuKz1hqPaZ4jYngC5MJgE8+LFRxJ5uYz9JW 42gpg0UxkupMoZq0Bc4zUHmJFJbGgmEFyKxOzTbCBDikCrz3B5lapR3ttzpdLGLlNeHi d6qJhq8+SzA0N4XTqKFR7yMXszUXOHrzImhZKwI813hBW2zvvvhvIK6NEPyeNQ7MwOF1 4F32S3noAgTlwRQ9mN+rwxSSDYko8Dkc/4i3FMleH5erQ81KkZfMrTUZeIWggeBiQATY WLCBZAR46iqKABFv9EYY8iskoG+Yn/TfRintO6K3CrOLaOSkB1ECP9JN98seUPDd4Ls0 T9Sg== 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=pqexkkVPU9O6rAcLqXh4/SBPp7LrcuOyTVabepwCIWSCuA2hy4XDVnwV5veTR9weO/ f/WtU8YLJd7RFpBhLMlx6ju0LonWRzFtngoWAY5jD2Kq0TOJFXKhaLkQ6vSKgKwcdS1a CBnHxWEqgjav2NxH/Nol7jnTmX25FEgS3vHn8J3MGFZrzJUXMKnFdcvuRFVPHgorfkfZ D7hY11txc9vZ6K3XKtyeKmecQVNLXIH+5x2vcoglZsXPVSaLxk51cO3zK0ztPmhera0B ffFoI0ituFC165PbYnEb6IMmajok14DjARI07P1gQYZ6ZMcaBBL3/kZO75u/3UXt+XKw uI7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Hs7btoVD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si3804902pgv.360.2017.12.14.22.28.08; Thu, 14 Dec 2017 22:28:08 -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=Hs7btoVD; 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 S1754613AbdLOG2E (ORCPT + 20 others); Fri, 15 Dec 2017 01:28:04 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:37064 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752740AbdLOG17 (ORCPT ); Fri, 15 Dec 2017 01:27:59 -0500 Received: by mail-pg0-f66.google.com with SMTP id y6so5173276pgp.4; Thu, 14 Dec 2017 22:27:59 -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=Hs7btoVDSAVmMljeeZ9kAy7Vkc1b5goPArhW90FwJbH2z5Dxc+4CQcmTReazdTfO9+ beCDeJkox28xGebLN0UDhNwM9RxEBJJALxKvH5YCX6yUMDYtrjiVSJHzX/KWFQmdem+Z DOEuQ2FPVVqf4ZDf50zKTTnaIPjsBOeM0LYaL1jhZZB018s2BDVAhbGJW3zSmDYPI6Sj zLizVcMTFAZhAOj28rL4ti1GFv5+wlQEF3FwcyljavvsaH6IWrprlBC8oeIjmGd1mb4l JGU2NpAgwJ3GrXaxVVRdGDa3WQPB035gbym3XGMkvrK6TSbtfY+UaSTjSc645+RgcpZG 5Z2w== 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=o9dn7+QEc/FXc7I9ZgJ32bV95QaqIxp+DZZ3PbJlZxkV86XVG7o2NsLAs54BxxUd6R 2OvEQTMVvKPiUDR40NQcOUkI1QJMyMDfvTpyJbhPLQbykYMAT6PXLJ9VtaGy2o1MKLH0 p1jpc8fekNTD4jtisoIw8BS+vMqP1hrmRmvCvU+A0tRMmDHMAevps0XALrLwZUHhYbAo ZLAGFYJF/55acPvyJD37eQdbpH5xwB0o3ZCop8on4nIivniejFPER+o0CkdUNX8XIaz6 BJgRnVQQerUjU11vijD8kENARFKBkWi4PyNAtVBFVtlqbu0iSNx9pt0zckie4FlY+oJJ o0jw== X-Gm-Message-State: AKGB3mIWfll+Pczv9en7Ep3BYN9uH+B08s4OFmi2d8AYYdzs5qHmCdzX B2vBl3ER8Xa39o6A2ULZ3WM= X-Received: by 10.98.80.208 with SMTP id g77mr12296933pfj.201.1513319278587; Thu, 14 Dec 2017 22:27:58 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id g127sm8824385pgc.29.2017.12.14.22.27.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:27:57 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:57:48 +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 v2 17/19] ARM: dts: aspeed: Add Qanta Q71L BMC machine Date: Fri, 15 Dec 2017 16:54:41 +1030 Message-Id: <20171215062443.23059-18-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fri Dec 15 06:24:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122062 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp74736qgn; Thu, 14 Dec 2017 22:28:19 -0800 (PST) X-Google-Smtp-Source: ACJfBotdhMMjuO378tj3tEQO4vea/nz37ShjjB7E7d8g702IVqHdpTGn/bPirm1t/rsLwEhRl+LF X-Received: by 10.98.215.19 with SMTP id b19mr12120786pfh.94.1513319299020; Thu, 14 Dec 2017 22:28:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319299; cv=none; d=google.com; s=arc-20160816; b=hMr3WI+mnu+PANhnyk5PjAPrZ/yabMtUp084M4AHj6OtZMEdrbdetdmxi4avtX+uSD 4XJQWTuQSw+7zd/U+6eQh6kHqaHzWgWVU68cUgAnfxeM6Jld1O6DPkmdpglgtG0kwO2w iUlZsvKJJERR/mhsTR7WUCZ4B9n+S40PaHzu4c9hHo7Zyj3UJ2r5kPAOhMvw4OZdcvr4 C1W47IlCSc1JqcmbMJ6+Hv1lvlSti5otSIfpx8vFX9kbD8KHHslOmQkWJG2uNYUxRHym SzKbOkdrEjTDM7l5auM+JTbPzeRmKPidTQ4wYJ/ASzBlEyxOVKJylj5uVLcr/AqZC+PQ Pkkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=87LC8pRqpTStqzSkaeOrk2+xZJuKHQCoAl5xDWLEUBo=; b=dX50n2U8dCW1rBk1vDrsBKI7yJ5Vd3JWV5sxynsW2Wna5Ay3Xmndi1Jre4AeEUa0Vh KTPVjbKZKMT9Dd+o4WqwVlF0YyZOVvwALoJFhPAmGYBNiFkSAEECyIwG11Xira4QPzqC 4yQKYhSUd63PCSLtlA3EgAQ7qzp0MMUEVL2Jq5CCKEQsk/W9dj/kdow813FOBh6G5HgC gvxv8fBGFJ/xUFsR7TZWJ1OWKK0VRBPgII9F98dFSIIrpkQQ8nCPkGFOz6dpA0v7bfvJ 75EkUw00H0MyBk9eaEi5XwAib8vpfgn+h1yJKirfGnWLe3NByB0pkq/nKlSDLV6FTDRe 3Miw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=j7v8d8VU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si3804902pgv.360.2017.12.14.22.28.18; Thu, 14 Dec 2017 22:28:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=j7v8d8VU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754662AbdLOG2O (ORCPT + 20 others); Fri, 15 Dec 2017 01:28:14 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:38648 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753700AbdLOG2J (ORCPT ); Fri, 15 Dec 2017 01:28:09 -0500 Received: by mail-pg0-f66.google.com with SMTP id f12so5173976pgo.5; Thu, 14 Dec 2017 22:28:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=87LC8pRqpTStqzSkaeOrk2+xZJuKHQCoAl5xDWLEUBo=; b=j7v8d8VU872KcVNokAuD0KfAoHcsjUdWwKVYd3YtJoEy63Ki/Zwe4rfJhPCbVYEaCd ZQA1LxfhYndVlVHqGjIvur2Jhu6Ccyt7VimWdZ+eEnBjwnMf5So+MmLvGi1otahS/r15 rubsdhEa5/D3nXUMHH0apKB5Y2dc2e6F4shbw4/8o6u+HVZNkYLrzjG2fDe4lDKQEjqT lNgyjy0SVpjnCr0rG9qcrYzvl8FyZW2oeC1ByHkh/KcVqx+uDgCyr7vCjGmNLHh0HpEE KUZFzZNKGBlPg7v0ctYJu425qBYPhPryzRwjbl451r9OusZnj0KO6DTpmV1YCiC7iKMK LWpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=87LC8pRqpTStqzSkaeOrk2+xZJuKHQCoAl5xDWLEUBo=; b=Kkl68qx3Rr3h992zlPSKV0ng2/gBKfrpPg5ZbY+NPAAXHEVueadlGD5D5ra+mQivwj /5cJDQdn+bdqOx+OiC0atMFbRHgWasCdIOT8xIwPW1CJIPyEjdV+GDFK3FiQRdz4006e pITxCvkp6aOAhXF4XtwFp9th3+Lz2bphmrgGVcD5g9bxAbvSTNJOSSl7JX6MJIQPvd5t jHCdprc8vb+3m33BFqacgO79ibEO6k7prVZhKwcPPlGn1twlKiluCSXbj2atXgcxMGgV lDGZUjwLddqjW5yefVdAlJX19w94w1NoHpQsxrPmuxTy2DLzFvl/CcRbxeaN9dtyDUwD j9nA== X-Gm-Message-State: AKGB3mJe99zdkkHFJLlA6JuBxXPajE+m+fyzOEM5I/d1XI+iK6opRuHt chpPCssOmOk5+ZJswpeoXqA= X-Received: by 10.101.89.78 with SMTP id g14mr10807361pgu.29.1513319288678; Thu, 14 Dec 2017 22:28:08 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id o88sm10601850pfj.175.2017.12.14.22.28.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:28:07 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:57:59 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 18/19] ARM: dts: aspeed-romulus: Update Romulus system Date: Fri, 15 Dec 2017 16:54:42 +1030 Message-Id: <20171215062443.23059-19-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - Fix incorrect RAM size - Remove alias; these are now specified in the dtsi - Add newly upstreamed devices - Include OpenBMC flash layout Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 153 ++++++++++++++++++++++++++- 1 file changed, 148 insertions(+), 5 deletions(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index a7a9386f964d..bfdf643584df 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts @@ -7,17 +7,13 @@ model = "Romulus BMC"; compatible = "ibm,romulus-bmc", "aspeed,ast2500"; - aliases { - serial4 = &uart5; - }; - chosen { stdout-path = &uart5; bootargs = "console=ttyS4,115200 earlyprintk"; }; memory { - reg = <0x80000000 0x40000000>; + reg = <0x80000000 0x20000000>; }; reserved-memory { @@ -29,6 +25,73 @@ no-map; reg = <0xbf000000 0x01000000>; /* 16M */ }; + + flash_memory: region@98000000 { + no-map; + reg = <0x98000000 0x04000000>; /* 64M */ + }; + }; + + leds { + compatible = "gpio-leds"; + + fault { + gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>; + }; + + identify { + gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_HIGH>; + }; + + power { + gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>; + }; + }; + + fsi: gpio-fsi { + compatible = "fsi-master-gpio", "fsi-master"; + #address-cells = <2>; + #size-cells = <0>; + + clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; + data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>; + mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; + trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>; + }; + + gpio-keys { + compatible = "gpio-keys"; + + checkstop { + label = "checkstop"; + gpios = <&gpio ASPEED_GPIO(J, 2) GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&fmc { + status = "okay"; + + flash@0 { + status = "okay"; + label = "pnor"; + m25p,fast-read; +#include "openbmc-flash-layout.dtsi" + }; +}; + +&spi1 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; + + flash@0 { + status = "okay"; + label = "pnor"; + m25p,fast-read; }; }; @@ -38,6 +101,7 @@ status = "okay"; m25p,fast-read; label = "bmc"; +#include "openbmc-flash-layout.dtsi" }; }; @@ -53,6 +117,12 @@ }; }; +&lpc_ctrl { + status = "okay"; + memory-region = <&flash_memory>; + flash = <&spi1>; +}; + &uart1 { /* Rear RS-232 connector */ status = "okay"; @@ -81,6 +151,10 @@ pinctrl-0 = <&pinctrl_rmii1_default>; }; +&i2c1 { + status = "okay"; +}; + &i2c2 { status = "okay"; }; @@ -133,8 +207,77 @@ &i2c12 { status = "okay"; + + max31785@52 { + compatible = "maxim,max31785"; + reg = <0x52>; + }; +}; + +&gpio { + nic_func_mode0 { + gpio-hog; + gpios = ; + output-low; + line-name = "nic_func_mode0"; + }; + nic_func_mode1 { + gpio-hog; + gpios = ; + output-low; + line-name = "nic_func_mode1"; + }; }; &vuart { status = "okay"; }; + +&gfx { + status = "okay"; +}; + +&pinctrl { + aspeed,external-nodes = <&gfx &lhc>; +}; + +&pwm_tacho { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default>; + + fan@0 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x08>; + }; + + fan@1 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x09>; + }; + + fan@2 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x0a>; + }; + + fan@3 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x0b>; + }; + + fan@4 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x0c>; + }; + + fan@5 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x0d>; + }; + + fan@6 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x0e>; + }; +}; From patchwork Fri Dec 15 06:24:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 122063 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp74843qgn; Thu, 14 Dec 2017 22:28:28 -0800 (PST) X-Google-Smtp-Source: ACJfBovCqvsAIhRHc1yIxjPnlHZwZtcHO2PU7TBTtntK7jMz9r+IlTTFvg0MLnjQMFbAt4rhmPZx X-Received: by 10.98.68.84 with SMTP id r81mr12314229pfa.48.1513319308553; Thu, 14 Dec 2017 22:28:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513319308; cv=none; d=google.com; s=arc-20160816; b=IGAGEtMs6cZELiDJXvzZkwVuqymUNkl0aP6/DBiM5/+9mw8Fp5RuhU1HD8xubqL46p 9GqPgUbTdf57pBWGo8aH+WAYobHLsFaKbGdJ8CCXiSPMUET2hV8QDzhOUbYHhg1gxHx2 INbUs8lZ49kGazyUf6Q/Kw4PEVvjw6yGuLqZKb1oxzRHEdfAmLeH1GwBnGfJL56vCHZ5 0MdzQXfW1z7369V3409/JFUyLGj2T/9+7kZhd0yrDwwl/7l7ibMrKs6kriuQfhsRnOS9 9hVJdfBMtFnbYpXKEJKUfYBunBFR4VV/7QSDKCoDeuUGTgCNMWsqgi6updCHKccWF3tK ws1A== 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=jElleyLOht3/kIHo8pk61nroJnQ5oGHE7dhoOETIAkRqyCve7j30g7JMk7lJgznftv R74ERk+x5ykrgJ+KSqiNVqzw0rBT7SNtCBfLN7ZHAuHrZJJodQO7VXPJCe39Jh2hp5oH gZg+Dyao+ls/Z5xAMt8+j2EafcQIrEVtesWaBdrRGUQ5PBAtV5bchUS4mKUtrH8Jo4ae lUH6ilpFwx1K4iJ7Ud1BrOx1eoyUI/uGeIROG5pZzblz4flVcvVYkgtlTvQR4MfKYomo mYQDxAvNwpWXFB2JZvl9pUKynxJgdzmTqDvL55oZYFFoM3tDD/D8pP9Qimzy3oP9Q7kw MT8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=C9fNuItd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si3804902pgv.360.2017.12.14.22.28.28; Thu, 14 Dec 2017 22:28: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=C9fNuItd; 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 S1754684AbdLOG2Z (ORCPT + 20 others); Fri, 15 Dec 2017 01:28:25 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:42759 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753563AbdLOG2T (ORCPT ); Fri, 15 Dec 2017 01:28:19 -0500 Received: by mail-pg0-f65.google.com with SMTP id e14so5165873pgr.9; Thu, 14 Dec 2017 22:28:19 -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=C9fNuItdO0Mx8k5WG94kQ78WEmm//wnvYNsg+Myp9oOlfr3Fx/FPuV7NLQmUFX93br nHPBFIx5D+Inpytfysn3Y3rfBkDt/aCh+G30TWQgfCgSwKTckOSNCCIdM2N8VDjIF7rQ RnFB43HmKFxFSLFoOa/h3WLVWS9JcZR/IfoyF5Izx1UxsCTRs0GQDayeMnmf2nMt+Uad 46w4SH+N8t5WEElrj2pf3KaIfmCjdcXIeY8QoarNi6Ep+blS4VSg8EpYp5UbAg602KH2 FmfejKQne4ePFg9LZZTthkwM+6KljhpH9fNPIRqvDrrF4y+OuTbqh6CtkrtlOgnePmcz RLSg== 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=W2O8NjVmO+22NrnHESnSMLiiCOiOxxfLRW8o4+qgtnzmHyIH6VYNU2SagRl5wR4QPj zSVXVBE8QHnrThYSpPw9ZQzDohlBuAnpOFhQx+GkB8agPlVcD42a5pngUgMIKc9tve8a qq8R7Vz/MHllDmVj1Jm+dQg6j7sPDRLWTGnP5gn9MeAogZ1R/ZFPrBF2XsMP7lLBpZC4 5TnqCCFM1b8gBUjW93K4UZAIDk7mzhRCAq362SEm3jiB+3WsrXB2O0CFgZDxHA/Ej6nR UdhKFPBW9sMdD7e6gDXNHyLgp2G1+J5qQ2KvruSthBiUGKX2tA5384uuzZW9WGzdKedy zVww== X-Gm-Message-State: AKGB3mJ+fOZNq53q/GPpNF/VtOFHxmZUjqYv6PpkLKfvNedbc6/DF6Y1 cMBUNgFeaSATCxUqssAL5UJMVtr8cWs= X-Received: by 10.101.80.76 with SMTP id k12mr11079558pgo.32.1513319299145; Thu, 14 Dec 2017 22:28:19 -0800 (PST) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id d68sm11205519pfl.38.2017.12.14.22.28.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 22:28:17 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Fri, 15 Dec 2017 16:58:09 +1030 From: Joel Stanley To: Rob Herring , Mark Rutland , Arnd Bergmann , Andrew Jeffery , Patrick Venture , Xo Wang , Lei YU Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Benjamin Herrenschmidt , Jeremy Kerr , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 19/19] ARM: dts: aspeed-plametto: Add flash layout Date: Fri, 15 Dec 2017 16:54:43 +1030 Message-Id: <20171215062443.23059-20-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171215062443.23059-1-joel@jms.id.au> References: <20171215062443.23059-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Cédric Le Goater 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" }; };