Commit 14bae133 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Arnd Bergmann

ARM: dts: uniphier: rework UniPhier System Bus nodes

During the review process of the UniPhier System Bus driver
(drivers/bus/uniphier.c), the current binding of the System Bus
Controller turned out to be no good.  In order to make the driver
really usable, we have to switch over to the new binding defined by
Documentation/devicetree/bindings/bus/uniphier-system-bus.txt.
The old binding will be still supported for a while to keep the
backward compatibility.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 5c5154e4
...@@ -52,12 +52,6 @@ soc: soc { ...@@ -52,12 +52,6 @@ soc: soc {
ranges; ranges;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
extbus: extbus {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
};
serial0: serial@54006800 { serial0: serial@54006800 {
compatible = "socionext,uniphier-uart"; compatible = "socionext,uniphier-uart";
status = "disabled"; status = "disabled";
...@@ -98,9 +92,17 @@ serial3: serial@54006b00 { ...@@ -98,9 +92,17 @@ serial3: serial@54006b00 {
clocks = <&uart_clk>; clocks = <&uart_clk>;
}; };
system-bus-controller@58c00000 { system_bus: system-bus@58c00000 {
compatible = "socionext,uniphier-system-bus-controller"; compatible = "socionext,uniphier-system-bus";
reg = <0x58c00000 0x400>, <0x59800000 0x2000>; status = "disabled";
reg = <0x58c00000 0x400>;
#address-cells = <2>;
#size-cells = <1>;
};
smpctrl@59800000 {
compatible = "socionext,uniphier-smpctrl";
reg = <0x59801000 0x400>;
}; };
timer@60000200 { timer@60000200 {
......
...@@ -94,12 +94,6 @@ soc { ...@@ -94,12 +94,6 @@ soc {
ranges; ranges;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
extbus: extbus {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
};
timer@20000200 { timer@20000200 {
compatible = "arm,cortex-a9-global-timer"; compatible = "arm,cortex-a9-global-timer";
reg = <0x20000200 0x20>; reg = <0x20000200 0x20>;
...@@ -216,9 +210,17 @@ i2c4: i2c@58600000 { ...@@ -216,9 +210,17 @@ i2c4: i2c@58600000 {
clock-frequency = <400000>; clock-frequency = <400000>;
}; };
system-bus-controller@58c00000 { system_bus: system-bus@58c00000 {
compatible = "socionext,uniphier-system-bus-controller"; compatible = "socionext,uniphier-system-bus";
reg = <0x58c00000 0x400>, <0x59800000 0x2000>; status = "disabled";
reg = <0x58c00000 0x400>;
#address-cells = <2>;
#size-cells = <1>;
};
smpctrl@59800000 {
compatible = "socionext,uniphier-smpctrl";
reg = <0x59801000 0x400>;
}; };
usb0: usb@5a800100 { usb0: usb@5a800100 {
......
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
&extbus { &system_bus {
status = "okay";
ranges = <1 0x00000000 0x42000000 0x02000000>; ranges = <1 0x00000000 0x42000000 0x02000000>;
support_card: support_card { support_card: support_card {
......
...@@ -133,12 +133,6 @@ soc { ...@@ -133,12 +133,6 @@ soc {
#size-cells = <1>; #size-cells = <1>;
ranges = <0 0 0 0xffffffff>; ranges = <0 0 0 0xffffffff>;
extbus: extbus {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
};
serial0: serial@54006800 { serial0: serial@54006800 {
compatible = "socionext,uniphier-uart"; compatible = "socionext,uniphier-uart";
status = "disabled"; status = "disabled";
...@@ -261,6 +255,19 @@ i2c6: i2c@58786000 { ...@@ -261,6 +255,19 @@ i2c6: i2c@58786000 {
clock-frequency = <400000>; clock-frequency = <400000>;
}; };
system_bus: system-bus@58c00000 {
compatible = "socionext,uniphier-system-bus";
status = "disabled";
reg = <0x58c00000 0x400>;
#address-cells = <2>;
#size-cells = <1>;
};
smpctrl@59800000 {
compatible = "socionext,uniphier-smpctrl";
reg = <0x59801000 0x400>;
};
pinctrl: pinctrl@5f801000 { pinctrl: pinctrl@5f801000 {
compatible = "socionext,ph1-ld20-pinctrl", "syscon"; compatible = "socionext,ph1-ld20-pinctrl", "syscon";
reg = <0x5f801000 0xe00>; reg = <0x5f801000 0xe00>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment