leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: dts: armada-370-xp: Use the node labels

Browse Source 
Use the node label when possible. As a result it flattens the device tree
and it makes more visible the IP blocks specific to each SoC variant.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
This commit is contained in:
Gregory CLEMENT 2016-11-04 17:47:37 +01:00
parent 11f7135bb9
commit f60f913986
2 changed files with 91 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
arch/arm/boot/dts/armada-370.dtsi
View File

@ -134,14 +134,6 @@
wt-override; wt-override;
}; };
i2c0: i2c@11000 {
reg = <0x11000 0x20>;
};
i2c1: i2c@11100 {
reg = <0x11100 0x20>;
};
gpio0: gpio@18100 { gpio0: gpio@18100 {
compatible = "marvell,orion-gpio"; compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>; reg = <0x18100 0x40>;
@ -175,20 +167,6 @@
interrupts = <91>; interrupts = <91>;
}; };
/*
* Default UART pinctrl setting without RTS/CTS, can
* be overwritten on board level if a different
* configuration is used.
*/
uart0: serial@12000 {
pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default";
};
uart1: serial@12100 {
pinctrl-0 = <&uart1_pins>;
pinctrl-names = "default";
};
systemc: system-controller@18200 { systemc: system-controller@18200 {
compatible = "marvell,armada-370-xp-system-controller"; compatible = "marvell,armada-370-xp-system-controller";
@ -219,20 +197,6 @@
reg = <0x18330 0x4>; reg = <0x18330 0x4>;
}; };
interrupt-controller@20a00 {
reg = <0x20a00 0x1d0>, <0x21870 0x58>;
};
timer@20300 {
compatible = "marvell,armada-370-timer";
clocks = <&coreclk 2>;
};
watchdog@20300 {
compatible = "marvell,armada-370-wdt";
clocks = <&coreclk 2>;
};
cpuconf: cpu-config@21000 { cpuconf: cpu-config@21000 {
compatible = "marvell,armada-370-cpu-config"; compatible = "marvell,armada-370-cpu-config";
reg = <0x21000 0x8>; reg = <0x21000 0x8>;
@ -248,14 +212,6 @@
status = "disabled"; status = "disabled";
}; };
usb@50000 {
clocks = <&coreclk 0>;
};
usb@51000 {
clocks = <&coreclk 0>;
};
xor0: xor@60800 { xor0: xor@60800 {
compatible = "marvell,orion-xor"; compatible = "marvell,orion-xor";
reg = <0x60800 0x100 reg = <0x60800 0x100
@ -294,14 +250,6 @@
}; };
}; };
ethernet@70000 {
compatible = "marvell,armada-370-neta";
};
ethernet@74000 {
compatible = "marvell,armada-370-neta";
};
cesa: crypto@90000 { cesa: crypto@90000 {
compatible = "marvell,armada-370-crypto"; compatible = "marvell,armada-370-crypto";
reg = <0x90000 0x10000>; reg = <0x90000 0x10000>;
@ -337,6 +285,59 @@
}; };
}; };
/*
* Default UART pinctrl setting without RTS/CTS, can be overwritten on
* board level if a different configuration is used.
*/
&uart0 {
pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default";
};
&uart1 {
pinctrl-0 = <&uart1_pins>;
pinctrl-names = "default";
};
&i2c0 {
reg = <0x11000 0x20>;
};
&i2c1 {
reg = <0x11100 0x20>;
};
&mpic {
reg = <0x20a00 0x1d0>, <0x21870 0x58>;
};
&timer {
compatible = "marvell,armada-370-timer";
clocks = <&coreclk 2>;
};
&watchdog {
compatible = "marvell,armada-370-wdt";
clocks = <&coreclk 2>;
};
&usb0 {
clocks = <&coreclk 0>;
};
&usb1 {
clocks = <&coreclk 0>;
};
&eth0 {
compatible = "marvell,armada-370-neta";
};
&eth1 {
compatible = "marvell,armada-370-neta";
};
&pinctrl { &pinctrl {
compatible = "marvell,mv88f6710-pinctrl"; compatible = "marvell,mv88f6710-pinctrl";

76
arch/arm/boot/dts/armada-xp.dtsi
View File

@ -84,16 +84,6 @@
wt-override; wt-override;
}; };
i2c0: i2c@11000 {
compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
reg = <0x11000 0x100>;
};
i2c1: i2c@11100 {
compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
reg = <0x11100 0x100>;
};
uart2: serial@12200 { uart2: serial@12200 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
pinctrl-0 = <&uart2_pins>; pinctrl-0 = <&uart2_pins>;
@ -150,26 +140,6 @@
clocks = <&coreclk 1>; clocks = <&coreclk 1>;
}; };
interrupt-controller@20a00 {
reg = <0x20a00 0x2d0>, <0x21070 0x58>;
};
timer@20300 {
compatible = "marvell,armada-xp-timer";
clocks = <&coreclk 2>, <&refclk>;
clock-names = "nbclk", "fixed";
};
watchdog@20300 {
compatible = "marvell,armada-xp-wdt";
clocks = <&coreclk 2>, <&refclk>;
clock-names = "nbclk", "fixed";
};
cpurst@20800 {
reg = <0x20800 0x20>;
};
cpu-config@21000 { cpu-config@21000 {
compatible = "marvell,armada-xp-cpu-config"; compatible = "marvell,armada-xp-cpu-config";
reg = <0x21000 0x8>; reg = <0x21000 0x8>;
@ -183,14 +153,6 @@
status = "disabled"; status = "disabled";
}; };
usb@50000 {
clocks = <&gateclk 18>;
};
usb@51000 {
clocks = <&gateclk 19>;
};
usb2: usb@52000 { usb2: usb@52000 {
compatible = "marvell,orion-ehci"; compatible = "marvell,orion-ehci";
reg = <0x52000 0x500>; reg = <0x52000 0x500>;
@ -308,6 +270,44 @@
}; };
}; };
&i2c0 {
compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
reg = <0x11000 0x100>;
};
&i2c1 {
compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
reg = <0x11100 0x100>;
};
&mpic {
reg = <0x20a00 0x2d0>, <0x21070 0x58>;
};
&timer {
compatible = "marvell,armada-xp-timer";
clocks = <&coreclk 2>, <&refclk>;
clock-names = "nbclk", "fixed";
};
&watchdog {
compatible = "marvell,armada-xp-wdt";
clocks = <&coreclk 2>, <&refclk>;
clock-names = "nbclk", "fixed";
};
&cpurst {
reg = <0x20800 0x20>;
};
&usb0 {
clocks = <&gateclk 18>;
};
&usb1 {
clocks = <&gateclk 19>;
};
&pinctrl { &pinctrl {
ge0_gmii_pins: ge0-gmii-pins { ge0_gmii_pins: ge0-gmii-pins {
marvell,pins = marvell,pins =