diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-02-26 16:18:30 +0900 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-18 17:37:52 +0100 |
| commit | 14bae133b8712206d49d57574dc6a25d18b40dcf (patch) | |
| tree | 1e144a05d81ad7f6b02b2a4fd198e43fec6a3bb0 /arch/arm/boot/dts/uniphier-common32.dtsi | |
| parent | 5c5154e42905561ae51b300a884563f1a91eeb66 (diff) | |
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/uniphier-common32.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/uniphier-common32.dtsi | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/uniphier-common32.dtsi b/arch/arm/boot/dts/uniphier-common32.dtsi index ea9301aaa461..f847e6878011 100644 --- a/arch/arm/boot/dts/uniphier-common32.dtsi +++ b/arch/arm/boot/dts/uniphier-common32.dtsi @@ -52,12 +52,6 @@ ranges; interrupt-parent = <&intc>; - extbus: extbus { - compatible = "simple-bus"; - #address-cells = <2>; - #size-cells = <1>; - }; - serial0: serial@54006800 { compatible = "socionext,uniphier-uart"; status = "disabled"; @@ -98,9 +92,17 @@ clocks = <&uart_clk>; }; - system-bus-controller@58c00000 { - compatible = "socionext,uniphier-system-bus-controller"; - reg = <0x58c00000 0x400>, <0x59800000 0x2000>; + 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>; }; timer@60000200 { |