devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: Antony Pavlov
	<antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	Alban Bedel <albeu-GANU6spQydw@public.gmane.org>,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [RFC v3 06/14] MIPS: dts: qca: ar9132: use short references for uart and spi nodes
Date: Sat, 23 Jan 2016 23:17:23 +0300	[thread overview]
Message-ID: <1453580251-2341-7-git-send-email-antonynpavlov@gmail.com> (raw)
In-Reply-To: <1453580251-2341-1-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
 arch/mips/boot/dts/qca/ar9132.dtsi               |  4 +-
 arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 70 +++++++++++-------------
 2 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index cd1602f..a14f6f2 100644
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -61,7 +61,7 @@
 				#qca,ddr-wb-channel-cells = <1>;
 			};
 
-			uart@18020000 {
+			uart: uart@18020000 {
 				compatible = "ns8250";
 				reg = <0x18020000 0x20>;
 				interrupts = <3>;
@@ -134,7 +134,7 @@
 			};
 		};
 
-		spi@1f000000 {
+		spi: spi@1f000000 {
 			compatible = "qca,ar9132-spi", "qca,ar7100-spi";
 			reg = <0x1f000000 0x10>;
 
diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index 9618105..f22c22c 100644
--- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -14,43 +14,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	ahb {
-		apb {
-			uart@18020000 {
-				status = "okay";
-			};
-		};
-
-		spi@1f000000 {
-			status = "okay";
-			num-cs = <1>;
-
-			flash@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "s25sl064a";
-				reg = <0>;
-				spi-max-frequency = <25000000>;
-
-				partition@0 {
-					label = "u-boot";
-					reg = <0x000000 0x020000>;
-				};
-
-				partition@1 {
-					label = "firmware";
-					reg = <0x020000 0x7D0000>;
-				};
-
-				partition@2 {
-					label = "art";
-					reg = <0x7F0000 0x010000>;
-					read-only;
-				};
-			};
-		};
-	};
-
 	gpio-keys {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -100,3 +63,36 @@
 &extosc {
 	clock-frequency = <40000000>;
 };
+
+&uart {
+	status = "okay";
+};
+
+&spi {
+	status = "okay";
+	num-cs = <1>;
+
+	flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "s25sl064a";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partition@0 {
+			label = "u-boot";
+			reg = <0x000000 0x020000>;
+		};
+
+		partition@1 {
+			label = "firmware";
+			reg = <0x020000 0x7D0000>;
+		};
+
+		partition@2 {
+			label = "art";
+			reg = <0x7F0000 0x010000>;
+			read-only;
+		};
+	};
+};
-- 
2.6.2

--
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:[~2016-01-23 20:17 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1453580251-2341-1-git-send-email-antonynpavlov@gmail.com>
2016-01-23 20:17 ` [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver Antony Pavlov
2016-01-25 22:21   ` Alban
2016-01-31 20:41     ` Antony Pavlov
     [not found]       ` <20160131234155.eee918745880878963c044aa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-01 11:03         ` Alban
2016-01-30  0:27   ` Stephen Boyd
2016-02-01  0:23     ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 04/14] MIPS: dts: qca: ar9132: make extosc-related description shorter Antony Pavlov
     [not found] ` <1453580251-2341-1-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-23 20:17   ` [RFC v3 03/14] MIPS: dts: qca: ar9132: use dt-bindings/clock/ath79-clk.h macros Antony Pavlov
2016-01-23 20:17   ` [RFC v3 05/14] MIPS: dts: qca: ar9132_tl_wr1043nd_v1.dts: drop unused alias node Antony Pavlov
     [not found]     ` <1453580251-2341-6-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-25 22:25       ` Alban
2016-01-23 20:17   ` Antony Pavlov [this message]
2016-01-25 22:31     ` [RFC v3 06/14] MIPS: dts: qca: ar9132: use short references for uart and spi nodes Alban
2016-02-01 18:41       ` Antony Pavlov
2016-01-23 20:17   ` [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree Antony Pavlov
     [not found]     ` <1453580251-2341-9-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-25 22:46       ` Alban
2016-01-31 20:59         ` Antony Pavlov
2016-03-14 18:53         ` Antony Pavlov
2016-01-23 20:17   ` [RFC v3 09/14] MIPS: ath79: add initial support for TP-LINK MR3020 Antony Pavlov
2016-01-23 20:17   ` [RFC v3 10/14] devicetree: add Dragino vendor id Antony Pavlov
     [not found]     ` <1453580251-2341-11-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-26 21:16       ` Rob Herring
2016-01-23 20:17   ` [RFC v3 11/14] MIPS: ath79: add initial support for Dragino MS14 (Dragino 2) Antony Pavlov
2016-01-23 20:17   ` [RFC v3 12/14] devicetree: add Onion Corporation vendor id Antony Pavlov
     [not found]     ` <1453580251-2341-13-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-26 21:15       ` Rob Herring
2016-01-27  8:42         ` Antony Pavlov
2016-01-23 20:17   ` [RFC v3 13/14] MIPS: ath79: add initial support for Onion Omega Antony Pavlov

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=1453580251-2341-7-git-send-email-antonynpavlov@gmail.com \
    --to=antonynpavlov-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=albeu-GANU6spQydw@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-mips-6z/3iImG2C8G8FEW9MqTrA@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;
as well as URLs for NNTP newsgroup(s).