devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joel Stanley <joel@jms.id.au>
To: Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Arnd Bergmann <arnd@arndb.de>, Andrew Jeffery <andrew@aj.id.au>,
	Patrick Venture <venture@google.com>, Xo Wang <xow@google.com>,
	Lei YU <mine260309@gmail.com>
Cc: "Cédric Le Goater" <clg@kaod.org>,
	"Benjamin Herrenschmidt" <benh@kernel.crashing.org>,
	"Jeremy Kerr" <jk@ozlabs.org>,
	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	[thread overview]
Message-ID: <20171215062443.23059-4-joel@jms.id.au> (raw)
In-Reply-To: <20171215062443.23059-1-joel@jms.id.au>

From: Andrew Jeffery <andrew@aj.id.au>

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 <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 arch/arm/boot/dts/aspeed-g4.dtsi | 35 +++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/aspeed-g5.dtsi | 27 +++++++++++++++++----------
 2 files changed, 52 insertions(+), 10 deletions(-)

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>;
-- 
2.14.1

  parent reply	other threads:[~2017-12-15  6:24 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-15  6:24 [PATCH v2 00/19] ARM: dts: aspeed: updates and new machines Joel Stanley
2017-12-15  6:24 ` [PATCH v2 02/19] dt-bindings: gpio: Add ASPEED constants Joel Stanley
     [not found]   ` <20171215062443.23059-3-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
2017-12-16 18:17     ` Rob Herring
2017-12-15  6:24 ` Joel Stanley [this message]
2017-12-18  9:25   ` [PATCH v2 03/19] ARM: dts: aspeed: Add LPC and child devices Cédric Le Goater
2017-12-20  3:21     ` Joel Stanley
2017-12-15  6:24 ` [PATCH v2 04/19] ARM: dts: aspeed: Add proper clock references Joel Stanley
2017-12-15  6:24 ` [PATCH v2 05/19] ARM: dts: aspeed: Add MAC clocks Joel Stanley
     [not found] ` <20171215062443.23059-1-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
2017-12-15  6:24   ` [PATCH v2 01/19] dt-bindings: clock: Add ASPEED constants Joel Stanley
     [not found]     ` <20171215062443.23059-2-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
2017-12-16 18:09       ` Rob Herring
2017-12-15  6:24   ` [PATCH v2 06/19] ARM: dts: aspeed: Add watchdog clocks Joel Stanley
2017-12-18  9:02     ` Cédric Le Goater
2017-12-15  6:24   ` [PATCH v2 09/19] ARM: dts: aspeed: Add PWM and tachometer node Joel Stanley
2017-12-15  6:24   ` [PATCH v2 14/19] ARM: dts: aspeed: Sort ASPEED entries in makefile Joel Stanley
2017-12-18  9:06     ` Cédric Le Goater
2017-12-15  6:24 ` [PATCH v2 07/19] ARM: dts: aspeed: Add flash controller clocks Joel Stanley
2017-12-18  9:03   ` Cédric Le Goater
2017-12-15  6:24 ` [PATCH v2 08/19] ARM: dts: aspeed: Add clock phandle to GPIO Joel Stanley
2017-12-15  6:24 ` [PATCH v2 10/19] ARM: dts: aspeed: Add LPC Snoop device Joel Stanley
     [not found]   ` <20171215062443.23059-11-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
2017-12-18  9:16     ` Cédric Le Goater
     [not found]       ` <c5ef27de-34c1-f5e9-e4ae-e2709b004677-Bxea+6Xhats@public.gmane.org>
2017-12-20  3:21         ` Joel Stanley
2017-12-15  6:24 ` [PATCH v2 11/19] ARM: dts: aspeed: Remove skeleton.dtsi Joel Stanley
2017-12-18  9:08   ` Cédric Le Goater
2017-12-15  6:24 ` [PATCH v2 12/19] ARM: dts: aspeed: Update license headers Joel Stanley
2017-12-18  9:05   ` Cédric Le Goater
2017-12-15  6:24 ` [PATCH v2 13/19] ARM: dts: Add OpenBMC flash layout Joel Stanley
2017-12-18  9:04   ` Cédric Le Goater
2017-12-15  6:24 ` [PATCH v2 15/19] ARM: dts: aspeed: Add Witherspoon BMC machine Joel Stanley
2017-12-15  6:24 ` [PATCH v2 16/19] ARM: dts: aspeed: Add Ingrasys Zaius " Joel Stanley
2017-12-15  6:24 ` [PATCH v2 17/19] ARM: dts: aspeed: Add Qanta Q71L " Joel Stanley
2017-12-15  6:24 ` [PATCH v2 18/19] ARM: dts: aspeed-romulus: Update Romulus system Joel Stanley
2017-12-18  9:32   ` Cédric Le Goater
     [not found]     ` <b8e80861-88c4-da87-a201-ca2eefaa5a94-Bxea+6Xhats@public.gmane.org>
2017-12-20  3:22       ` Joel Stanley
2017-12-15  6:24 ` [PATCH v2 19/19] ARM: dts: aspeed-plametto: Add flash layout Joel Stanley
2017-12-18  9:09   ` Cédric Le Goater

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171215062443.23059-4-joel@jms.id.au \
    --to=joel@jms.id.au \
    --cc=andrew@aj.id.au \
    --cc=arnd@arndb.de \
    --cc=benh@kernel.crashing.org \
    --cc=clg@kaod.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jk@ozlabs.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-aspeed@lists.ozlabs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mine260309@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=venture@google.com \
    --cc=xow@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).