Linux-Aspeed Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Joel Stanley <joel@jms.id.au>
To: linux-aspeed@lists.ozlabs.org
Subject: [PATCH 04/20] ARM: dts: aspeed: Add LPC and child devices
Date: Mon, 11 Dec 2017 15:36:48 +1030	[thread overview]
Message-ID: <20171211050704.20621-5-joel@jms.id.au> (raw)
In-Reply-To: <20171211050704.20621-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 9ebf90f34709..b6d01523555a 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -226,6 +226,41 @@
 				status = "disabled";
 			};
 
+			lpc: lpc at 1e789000 {
+				compatible = "aspeed,ast2400-lpc", "simple-mfd";
+				reg = <0x1e789000 0x1000>;
+
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges = <0x0 0x1e789000 0x1000>;
+
+				lpc_bmc: lpc-bmc at 0 {
+					compatible = "aspeed,ast2400-lpc-bmc";
+					reg = <0x0 0x80>;
+				};
+
+				lpc_host: lpc-host at 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 at 0 {
+						compatible = "aspeed,ast2400-lpc-ctrl";
+						reg = <0x0 0x80>;
+						status = "disabled";
+					};
+
+					lhc: lhc at 20 {
+						compatible = "aspeed,ast2500-lhc";
+						reg = <0x20 0x24 0x48 0x8>;
+					};
+				};
+			};
+
 			uart2: serial at 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 at 1e787000 {
+				compatible = "aspeed,ast2500-vuart";
+				reg = <0x1e787000 0x40>;
+				reg-shift = <2>;
+				interrupts = <10>;
+				clocks = <&clk_uart>;
+				no-loopback-test;
+				status = "disabled";
+			};
+
 			lpc: lpc at 1e789000 {
 				compatible = "aspeed,ast2500-lpc", "simple-mfd";
 				reg = <0x1e789000 0x1000>;
@@ -289,6 +299,13 @@
 
 					reg-io-width = <4>;
 
+					lpc_ctrl: lpc-ctrl at 0 {
+						compatible = "aspeed,ast2500-lpc-ctrl";
+						reg = <0x0 0x80>;
+						status = "disabled";
+					};
+
+
 					lhc: lhc at 20 {
 						compatible = "aspeed,ast2500-lhc";
 						reg = <0x20 0x24 0x48 0x8>;
@@ -296,16 +313,6 @@
 				};
 			};
 
-			vuart: serial at 1e787000 {
-				compatible = "aspeed,ast2500-vuart";
-				reg = <0x1e787000 0x40>;
-				reg-shift = <2>;
-				interrupts = <10>;
-				clocks = <&clk_uart>;
-				no-loopback-test;
-				status = "disabled";
-			};
-
 			uart2: serial at 1e78d000 {
 				compatible = "ns16550a";
 				reg = <0x1e78d000 0x20>;
-- 
2.14.1


  parent reply	other threads:[~2017-12-11  5:06 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-11  5:06 [PATCH 00/20] ARM: dts: aspeed: updates and new machines Joel Stanley
2017-12-11  5:06 ` [PATCH 01/20] dt-bindings: clock: Add ASPEED constants Joel Stanley
2017-12-11  7:53   ` Arnd Bergmann
2017-12-11  5:06 ` [PATCH 02/20] dt-bindings: gpio: " Joel Stanley
2017-12-11  7:56   ` Arnd Bergmann
2017-12-11 10:43     ` Joel Stanley
2017-12-11  5:06 ` [PATCH 03/20] ARM: dts: aspeed-g4: Correct VUART IRQ number Joel Stanley
2017-12-11  7:58   ` Arnd Bergmann
2017-12-11 10:44     ` Joel Stanley
2017-12-11 11:38       ` Arnd Bergmann
2017-12-11  5:06 ` Joel Stanley [this message]
2017-12-11  5:06 ` [PATCH 05/20] ARM: dts: aspeed: Add proper clock references Joel Stanley
2017-12-11  8:09   ` Arnd Bergmann
2017-12-11 10:44     ` Joel Stanley
2017-12-11  5:06 ` [PATCH 06/20] ARM: dts: aspeed: Add MAC clocks Joel Stanley
2017-12-11  5:06 ` [PATCH 07/20] ARM: dts: aspeed: Add watchdog clocks Joel Stanley
2017-12-11  5:06 ` [PATCH 08/20] ARM: dts: aspeed: Add flash controller clocks Joel Stanley
2017-12-11  5:06 ` [PATCH 09/20] ARM: dts: aspeed: Add clock phandle to GPIO Joel Stanley
2017-12-11  5:06 ` [PATCH 10/20] ARM: dts: aspeed: Add PWM and tachometer node Joel Stanley
2017-12-11  5:06 ` [PATCH 11/20] ARM: dts: aspeed: Add LPC Snoop device Joel Stanley
2017-12-11  5:06 ` [PATCH 12/20] ARM: dts: aspeed: Remove skeleton.dtsi Joel Stanley
2017-12-11  5:06 ` [PATCH 13/20] ARM: dts: aspeed: Update license headers Joel Stanley
2017-12-11  5:06 ` [PATCH 14/20] ARM: dts: Add OpenBMC flash layout Joel Stanley
2017-12-11  5:06 ` [PATCH 15/20] ARM: dts: aspeed: Sort ASPEED entries in makefile Joel Stanley
2017-12-11  5:07 ` [PATCH 16/20] ARM: dts: aspeed: Add Witherspoon BMC machine Joel Stanley
2017-12-11 19:27   ` Brandon Wyman
2017-12-11  5:07 ` [PATCH 17/20] ARM: dts: aspeed: Add Ingrasys Zaius " Joel Stanley
2017-12-11  5:07 ` [PATCH 18/20] ARM: dts: aspeed: Add Qanta Q71L " Joel Stanley
2017-12-11  5:07 ` [PATCH 19/20] ARM: dts: aspeed-romulus: Update Romulus system Joel Stanley
2017-12-11  5:07 ` [PATCH 20/20] ARM: dts: aspeed-plametto: Add flash layout Joel Stanley

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=20171211050704.20621-5-joel@jms.id.au \
    --to=joel@jms.id.au \
    --cc=linux-aspeed@lists.ozlabs.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