Devicetree
 help / color / mirror / Atom feed
From: Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
To: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
	Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>,
	Andrew Jeffery <andrew-zrmu5oMJ5Fs@public.gmane.org>,
	Patrick Venture <venture-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
	Xo Wang <xow-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
	Lei YU <mine260309-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: "Cédric Le Goater" <clg-Bxea+6Xhats@public.gmane.org>,
	"Benjamin Herrenschmidt"
	<benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>,
	"Jeremy Kerr" <jk-mnsaURCQ41sdnm+yROfE0A@public.gmane.org>,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Subject: [PATCH v3 03/20] ARM: dts: aspeed: Add LPC and child devices
Date: Wed, 20 Dec 2017 13:53:11 +1030	[thread overview]
Message-ID: <20171220032328.30584-4-joel@jms.id.au> (raw)
In-Reply-To: <20171220032328.30584-1-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>

From: Andrew Jeffery <andrew-zrmu5oMJ5Fs@public.gmane.org>

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-zrmu5oMJ5Fs@public.gmane.org>
Reviewed-by: Cédric Le Goater <clg-Bxea+6Xhats@public.gmane.org>
Signed-off-by: Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
---
v3:
 - Fix ast2400 compatible string
---
 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 45d815a86d42..9422f9cb1e11 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -225,6 +225,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,ast2400-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 5c4ecdba3a6b..069f13df19d1 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -265,6 +265,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>;
@@ -288,6 +298,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>;
@@ -295,16 +312,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.15.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2017-12-20  3:23 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-20  3:23 [PATCH v3 00/19] ARM: dts: aspeed: updates and new machines Joel Stanley
     [not found] ` <20171220032328.30584-1-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
2017-12-20  3:23   ` [PATCH v3 01/20] dt-bindings: clock: Add ASPEED constants Joel Stanley
2017-12-20  3:23   ` Joel Stanley [this message]
2017-12-20  3:23   ` [PATCH v3 04/20] ARM: dts: aspeed: Add proper clock references Joel Stanley
2017-12-20  3:23   ` [PATCH v3 19/20] ARM: dts: aspeed-plametto: Add flash layout and fix memory node Joel Stanley
2017-12-20  3:23   ` [PATCH v3 20/20] ARM: dts: aspeed-evb: Add unit name to " Joel Stanley
2017-12-20  3:37   ` [PATCH v3 00/19] ARM: dts: aspeed: updates and new machines Joel Stanley
     [not found]     ` <CACPK8Xdf3__yuMEvD0NiZXihU-8F1R15aEwwJueHLZ6Jfs82oQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-12-20  8:24       ` Arnd Bergmann
2017-12-20  3:23 ` [PATCH v3 02/20] dt-bindings: gpio: Add ASPEED constants Joel Stanley
     [not found]   ` <20171220032328.30584-3-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
2017-12-20 21:46     ` Rob Herring
2017-12-20  3:23 ` [PATCH v3 05/20] ARM: dts: aspeed: Add MAC clocks Joel Stanley
2017-12-20  3:23 ` [PATCH v3 06/20] ARM: dts: aspeed: Add watchdog clocks Joel Stanley
2017-12-20  3:23 ` [PATCH v3 07/20] ARM: dts: aspeed: Add flash controller clocks Joel Stanley
2017-12-20  3:23 ` [PATCH v3 08/20] ARM: dts: aspeed: Add clock phandle to GPIO Joel Stanley
2017-12-20  3:23 ` [PATCH v3 09/20] ARM: dts: aspeed: Add PWM and tachometer node Joel Stanley
2017-12-20  3:23 ` [PATCH v3 10/20] ARM: dts: aspeed: Add LPC Snoop device Joel Stanley
2017-12-20  3:23 ` [PATCH v3 11/20] ARM: dts: aspeed: Remove skeleton.dtsi Joel Stanley
2017-12-20  3:23 ` [PATCH v3 12/20] ARM: dts: aspeed: Update license headers Joel Stanley
2017-12-20  3:23 ` [PATCH v3 13/20] ARM: dts: Add OpenBMC flash layout Joel Stanley
2017-12-20  3:23 ` [PATCH v3 14/20] ARM: dts: aspeed: Sort ASPEED entries in makefile Joel Stanley
2017-12-20  3:23 ` [PATCH v3 15/20] ARM: dts: aspeed: Add Witherspoon BMC machine Joel Stanley
2017-12-20  3:23 ` [PATCH v3 16/20] ARM: dts: aspeed: Add Ingrasys Zaius " Joel Stanley
2017-12-20  3:23 ` [PATCH v3 17/20] ARM: dts: aspeed: Add Qanta Q71L " Joel Stanley
2017-12-20  3:23 ` [PATCH v3 18/20] ARM: dts: aspeed-romulus: Update Romulus system Joel Stanley
2017-12-20  6:44   ` 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=20171220032328.30584-4-joel@jms.id.au \
    --to=joel-u3u1mxzcp9khxe+lvdladg@public.gmane.org \
    --cc=andrew-zrmu5oMJ5Fs@public.gmane.org \
    --cc=arnd-r2nGTMty4D4@public.gmane.org \
    --cc=benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org \
    --cc=clg-Bxea+6Xhats@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=jk-mnsaURCQ41sdnm+yROfE0A@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
    --cc=mine260309-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=venture-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
    --cc=xow-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
    /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