From 41f62983d3befe7da218107d08acf307f29cca05 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Wed, 14 Aug 2013 19:08:44 +0000
Subject: [PATCH] ramips: dts file cleanup
cleanup some inconsistencies in the dts files
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 37783
---
target/linux/ramips/dts/MT7620a.dts | 8 ++------
target/linux/ramips/dts/MT7620a_MT7610e.dts | 7 -------
target/linux/ramips/dts/RP-N53.dts | 4 ----
target/linux/ramips/dts/WNCE2001.dts | 2 --
target/linux/ramips/dts/rt3050.dtsi | 22 ++++++++++-----------
target/linux/ramips/dts/rt3883.dtsi | 2 +-
6 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/MT7620a.dts
index 90449d8fa5..417370080d 100644
--- a/target/linux/ramips/dts/MT7620a.dts
+++ b/target/linux/ramips/dts/MT7620a.dts
@@ -6,10 +6,6 @@
compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
model = "Ralink MT7620a + MT7610e evaluation board";
- memory@0 {
- reg = <0x0 0x2000000>;
- };
-
palmbus@10000000 {
sysc@0 {
ralink,pinmux = "spi", "uartlite", "mdio", "wled", "ephy", "rgmii1", "rgmii2";
@@ -63,14 +59,14 @@
status = "okay";
port@4 {
- compatible = "lantiq,mt7620a-gsw-port", "ralink,eth-port";
+ compatible = "ralink,mt7620a-gsw-port", "ralink,eth-port";
reg = <4>;
phy-mode = "rgmii";
phy-handle = <&phy4>;
};
port@5 {
- compatible = "lantiq,mt7620a-gsw-port", "ralink,eth-port";
+ compatible = "ralink,mt7620a-gsw-port", "ralink,eth-port";
reg = <5>;
phy-mode = "rgmii";
phy-handle = <&phy5>;
diff --git a/target/linux/ramips/dts/MT7620a_MT7610e.dts b/target/linux/ramips/dts/MT7620a_MT7610e.dts
index 0d7755b324..03b8043dd1 100644
--- a/target/linux/ramips/dts/MT7620a_MT7610e.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7610e.dts
@@ -6,13 +6,6 @@
compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
model = "Ralink MT7620A evaluation board";
- memory@0 {
- reg = <0x0 0x2000000>;
- };
-
- chosen {
- bootargs = "console=ttyS0,57600";
- };
palmbus@10000000 {
sysc@0 {
diff --git a/target/linux/ramips/dts/RP-N53.dts b/target/linux/ramips/dts/RP-N53.dts
index d48bb08638..c1de105423 100644
--- a/target/linux/ramips/dts/RP-N53.dts
+++ b/target/linux/ramips/dts/RP-N53.dts
@@ -6,10 +6,6 @@
compatible = "asus,rp-n53", "ralink,mt7620a-soc";
model = "Asus RP-N53";
- chosen {
- bootargs = "console=ttyS0,57600";
- };
-
palmbus@10000000 {
sysc@0 {
ralink,pinmux = "spi", "uartlite", "wled", "ephy", "i2c";
diff --git a/target/linux/ramips/dts/WNCE2001.dts b/target/linux/ramips/dts/WNCE2001.dts
index d7ad3aae9d..3e467a7b04 100644
--- a/target/linux/ramips/dts/WNCE2001.dts
+++ b/target/linux/ramips/dts/WNCE2001.dts
@@ -3,8 +3,6 @@
/include/ "rt3050.dtsi"
/ {
- #address-cells = <1>;
- #size-cells = <1>;
compatible = "WNCE2001", "ralink,rt3052-soc";
model = "Netgear WNCE2001";
diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi
index 7399376d72..1130005e78 100644
--- a/target/linux/ramips/dts/rt3050.dtsi
+++ b/target/linux/ramips/dts/rt3050.dtsi
@@ -1,7 +1,7 @@
/ {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "ralink,rt3050-soc", "ralink,rt3052-soc", "ralink,rt3350-soc";
+ compatible = "ralink,rt3050-soc", "ralink,rt3050-soc", "ralink,rt3350-soc";
cpus {
cpu@0 {
@@ -29,12 +29,12 @@
#size-cells = <1>;
sysc@0 {
- compatible = "ralink,rt3052-sysc", "ralink,rt3050-sysc";
+ compatible = "ralink,rt3050-sysc";
reg = <0x0 0x100>;
};
timer@100 {
- compatible = "ralink,rt3052-timer", "ralink,rt2880-timer";
+ compatible = "ralink,rt3050-timer", "ralink,rt2880-timer";
reg = <0x100 0x20>;
interrupt-parent = <&intc>;
@@ -42,7 +42,7 @@
};
watchdog@120 {
- compatible = "ralink,rt3052-wdt", "ralink,rt2880-wdt";
+ compatible = "ralink,rt3050-wdt", "ralink,rt2880-wdt";
reg = <0x120 0x10>;
resets = <&rstctrl 8>;
@@ -53,7 +53,7 @@
};
intc: intc@200 {
- compatible = "ralink,rt3052-intc", "ralink,rt2880-intc";
+ compatible = "ralink,rt3050-intc", "ralink,rt2880-intc";
reg = <0x200 0x100>;
resets = <&rstctrl 19>;
@@ -67,7 +67,7 @@
};
memc@300 {
- compatible = "ralink,rt3052-memc", "ralink,rt3050-memc";
+ compatible = "ralink,rt3050-memc";
reg = <0x300 0x100>;
resets = <&rstctrl 20>;
@@ -78,7 +78,7 @@
};
uart@500 {
- compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a";
+ compatible = "ralink,rt3050-uart", "ralink,rt2880-uart", "ns16550a";
reg = <0x500 0x100>;
resets = <&rstctrl 12>;
@@ -93,7 +93,7 @@
};
gpio0: gpio@600 {
- compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
+ compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio";
reg = <0x600 0x34>;
gpio-controller;
@@ -115,7 +115,7 @@
};
gpio1: gpio@638 {
- compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
+ compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio";
reg = <0x638 0x24>;
gpio-controller;
@@ -131,7 +131,7 @@
};
gpio2: gpio@660 {
- compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
+ compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio";
reg = <0x660 0x24>;
gpio-controller;
@@ -160,7 +160,7 @@
};
uartlite@c00 {
- compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
+ compatible = "ralink,rt3050-uart", "ralink,rt2880-uart", "ns16550a";
reg = <0xc00 0x100>;
resets = <&rstctrl 19>;
diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi
index 4d0d37d49a..d4387a92d0 100644
--- a/target/linux/ramips/dts/rt3883.dtsi
+++ b/target/linux/ramips/dts/rt3883.dtsi
@@ -202,7 +202,7 @@
status = "disabled";
port@0 {
- compatible = "lantiq,rt3883-port", "ralink,eth-port";
+ compatible = "ralink,rt3883-port", "ralink,eth-port";
reg = <0>;
};
--
GitLab