projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ramips: clean up useless dts partition labels
[openwrt/openwrt.git]
/
target
/
linux
/
ramips
/
dts
/
rt2880.dtsi
diff --git
a/target/linux/ramips/dts/rt2880.dtsi
b/target/linux/ramips/dts/rt2880.dtsi
index c163657eda95031f115764fecf83af895b2e221c..998b49a2770fb0097b8e819ef73526d46a12055a 100644
(file)
--- a/
target/linux/ramips/dts/rt2880.dtsi
+++ b/
target/linux/ramips/dts/rt2880.dtsi
@@
-1,8
+1,14
@@
+/dts-v1/;
+
/ {
#address-cells = <1>;
#size-cells = <1>;
compatible = "ralink,rt2880-soc";
/ {
#address-cells = <1>;
#size-cells = <1>;
compatible = "ralink,rt2880-soc";
+ aliases {
+ serial0 = &uartlite;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@
-17,10
+23,6
@@
bootargs = "console=ttyS0,57600";
};
bootargs = "console=ttyS0,57600";
};
- aliases {
- serial0 = &uartlite;
- };
-
cpuintc: cpuintc {
#address-cells = <0>;
#interrupt-cells = <1>;
cpuintc: cpuintc {
#address-cells = <0>;
#interrupt-cells = <1>;
@@
-36,15
+38,19
@@
#address-cells = <1>;
#size-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
- sysc: sysc@0 {
- compatible = "ralink,rt2880-sysc";
- reg = <0x000 0x100>;
+ sysc: syscon@0 {
+ compatible = "ralink,rt2880-sysc", "syscon";
+ reg = <0x0 0x100>;
+ #clock-cells = <1>;
+ #reset-cells = <1>;
};
timer: timer@100 {
compatible = "ralink,rt2880-timer";
reg = <0x100 0x20>;
};
timer: timer@100 {
compatible = "ralink,rt2880-timer";
reg = <0x100 0x20>;
+ clocks = <&sysc 3>;
+
interrupt-parent = <&intc>;
interrupts = <1>;
interrupt-parent = <&intc>;
interrupts = <1>;
@@
-54,6
+60,8
@@
watchdog: watchdog@120 {
compatible = "ralink,rt2880-wdt";
reg = <0x120 0x10>;
watchdog: watchdog@120 {
compatible = "ralink,rt2880-wdt";
reg = <0x120 0x10>;
+
+ clocks = <&sysc 4>;
};
intc: intc@200 {
};
intc: intc@200 {
@@
-79,8
+87,8
@@
gpio-controller;
#gpio-cells = <2>;
gpio-controller;
#gpio-cells = <2>;
+ ngpios = <24>;
ralink,gpio-base = <0>;
ralink,gpio-base = <0>;
- ralink,nr-gpio = <24>;
ralink,register-map = [ 00 04 08 0c
20 24 28 2c
30 34 ];
ralink,register-map = [ 00 04 08 0c
20 24 28 2c
30 34 ];
@@
-93,8
+101,8
@@
gpio-controller;
#gpio-cells = <2>;
gpio-controller;
#gpio-cells = <2>;
+ ngpios = <16>;
ralink,gpio-base = <24>;
ralink,gpio-base = <24>;
- ralink,nr-gpio = <16>;
ralink,register-map = [ 00 04 08 0c
10 14 18 1c
20 24 ];
ralink,register-map = [ 00 04 08 0c
10 14 18 1c
20 24 ];
@@
-109,8
+117,8
@@
gpio-controller;
#gpio-cells = <2>;
gpio-controller;
#gpio-cells = <2>;
+ ngpios = <32>;
ralink,gpio-base = <40>;
ralink,gpio-base = <40>;
- ralink,nr-gpio = <32>;
ralink,register-map = [ 00 04 08 0c
10 14 18 1c
20 24 ];
ralink,register-map = [ 00 04 08 0c
10 14 18 1c
20 24 ];
@@
-122,7
+130,9
@@
compatible = "ralink,rt2880-i2c";
reg = <0x900 0x100>;
compatible = "ralink,rt2880-i2c";
reg = <0x900 0x100>;
- resets = <&rstctrl 9>;
+ clocks = <&sysc 6>;
+
+ resets = <&sysc 9>;
reset-names = "i2c";
#address-cells = <1>;
reset-names = "i2c";
#address-cells = <1>;
@@
-138,6
+148,8
@@
compatible = "ralink,rt2880-uart", "ns16550a";
reg = <0xc00 0x100>;
compatible = "ralink,rt2880-uart", "ns16550a";
reg = <0xc00 0x100>;
+ clocks = <&sysc 7>;
+
interrupt-parent = <&intc>;
interrupts = <8>;
interrupt-parent = <&intc>;
interrupts = <8>;
@@
-153,43
+165,33
@@
state_default: pinctrl0 {
sdram {
state_default: pinctrl0 {
sdram {
-
ralink,group
= "sdram";
-
ralink,
function = "sdram";
+
groups
= "sdram";
+ function = "sdram";
};
};
};
};
- i2c_pins: i2c {
- i2c {
-
ralink,group
= "i2c";
-
ralink,
function = "i2c";
+ i2c_pins: i2c
_pins
{
+ i2c
_pins
{
+
groups
= "i2c";
+ function = "i2c";
};
};
};
};
- spi_pins: spi {
- spi {
-
ralink,group
= "spi";
-
ralink,
function = "spi";
+ spi_pins: spi
_pins
{
+ spi
_pins
{
+
groups
= "spi";
+ function = "spi";
};
};
uartlite_pins: uartlite {
uart {
};
};
uartlite_pins: uartlite {
uart {
-
ralink,group
= "uartlite";
-
ralink,
function = "uartlite";
+
groups
= "uartlite";
+ function = "uartlite";
};
};
};
};
};
};
- rstctrl: rstctrl {
- compatible = "ralink,rt2880-reset";
- #reset-cells = <1>;
- };
-
- clkctrl: clkctrl {
- compatible = "ralink,rt2880-clock";
- #clock-cells = <1>;
- };
-
pci: pci@440000 {
compatible = "ralink,rt288x-pci";
reg = <0x00440000 0x20000>;
pci: pci@440000 {
compatible = "ralink,rt288x-pci";
reg = <0x00440000 0x20000>;
@@
-205,7
+207,9
@@
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
- resets = <&rstctrl 18>;
+ clocks = <&sysc 8>;
+
+ resets = <&sysc 18>;
reset-names = "fe";
interrupt-parent = <&cpuintc>;
reset-names = "fe";
interrupt-parent = <&cpuintc>;
@@
-230,6
+234,8
@@
compatible = "ralink,rt2880-wmac";
reg = <0x480000 0x40000>;
compatible = "ralink,rt2880-wmac";
reg = <0x480000 0x40000>;
+ clocks = <&sysc 9>;
+
interrupt-parent = <&cpuintc>;
interrupts = <6>;
interrupt-parent = <&cpuintc>;
interrupts = <6>;