From fa9e7ca4661d8d5a521ede511a496ae029748595 Mon Sep 17 00:00:00 2001
From: Sungbo Eo <mans0n@gorani.run>
Date: Fri, 8 May 2020 21:00:48 +0900
Subject: ramips: simplify palmbus/{i2c,spi} in device DTS files

As the node is already defined and labeled in SoC DTSI file, we can refer to it
outside of root node and reduce redundancy.

While at it, remove unused pcf8563 label.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---
 .../linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts  | 81 +++++++++++-----------
 1 file changed, 40 insertions(+), 41 deletions(-)

(limited to 'target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts')

diff --git a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts
index 05cf4a380a..53a5c54ec6 100644
--- a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts
+++ b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts
@@ -16,47 +16,6 @@
 		led-upgrade = &led_power;
 	};
 
-	palmbus@10000000 {
-		spi@b00 {
-			status = "okay";
-			m25p80@0 {
-				compatible = "jedec,spi-nor";
-				reg = <0 0>;
-				spi-max-frequency = <10000000>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "u-boot";
-						reg = <0x0 0x30000>;
-						read-only;
-					};
-
-					partition@30000 {
-						label = "u-boot-env";
-						reg = <0x30000 0x10000>;
-						read-only;
-					};
-
-					factory: partition@40000 {
-						label = "factory";
-						reg = <0x40000 0x10000>;
-						read-only;
-					};
-
-					partition@50000 {
-						compatible = "denx,uimage";
-						label = "firmware";
-						reg = <0x50000 0x7b0000>;
-					};
-				};
-			};
-		};
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -100,6 +59,46 @@
 	};
 };
 
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0 0>;
+		spi-max-frequency = <10000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition@40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition@50000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
+		};
+	};
+};
+
 &state_default {
 	gpio {
 		groups = "i2c", "jtag", "rgmii", "mdio", "uartf";
-- 
cgit v1.2.3