Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Masahiro Yamada and committed by
Arnd Bergmann
14bae133 5c5154e4

+37 -25
+11 -9
arch/arm/boot/dts/uniphier-common32.dtsi
··· 52 52 ranges; 53 53 interrupt-parent = <&intc>; 54 54 55 - extbus: extbus { 56 - compatible = "simple-bus"; 57 - #address-cells = <2>; 58 - #size-cells = <1>; 59 - }; 60 - 61 55 serial0: serial@54006800 { 62 56 compatible = "socionext,uniphier-uart"; 63 57 status = "disabled"; ··· 92 98 clocks = <&uart_clk>; 93 99 }; 94 100 95 - system-bus-controller@58c00000 { 96 - compatible = "socionext,uniphier-system-bus-controller"; 97 - reg = <0x58c00000 0x400>, <0x59800000 0x2000>; 101 + system_bus: system-bus@58c00000 { 102 + compatible = "socionext,uniphier-system-bus"; 103 + status = "disabled"; 104 + reg = <0x58c00000 0x400>; 105 + #address-cells = <2>; 106 + #size-cells = <1>; 107 + }; 108 + 109 + smpctrl@59800000 { 110 + compatible = "socionext,uniphier-smpctrl"; 111 + reg = <0x59801000 0x400>; 98 112 }; 99 113 100 114 timer@60000200 {
+11 -9
arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
··· 94 94 ranges; 95 95 interrupt-parent = <&intc>; 96 96 97 - extbus: extbus { 98 - compatible = "simple-bus"; 99 - #address-cells = <2>; 100 - #size-cells = <1>; 101 - }; 102 - 103 97 timer@20000200 { 104 98 compatible = "arm,cortex-a9-global-timer"; 105 99 reg = <0x20000200 0x20>; ··· 210 216 clock-frequency = <400000>; 211 217 }; 212 218 213 - system-bus-controller@58c00000 { 214 - compatible = "socionext,uniphier-system-bus-controller"; 215 - reg = <0x58c00000 0x400>, <0x59800000 0x2000>; 219 + system_bus: system-bus@58c00000 { 220 + compatible = "socionext,uniphier-system-bus"; 221 + status = "disabled"; 222 + reg = <0x58c00000 0x400>; 223 + #address-cells = <2>; 224 + #size-cells = <1>; 225 + }; 226 + 227 + smpctrl@59800000 { 228 + compatible = "socionext,uniphier-smpctrl"; 229 + reg = <0x59801000 0x400>; 216 230 }; 217 231 218 232 usb0: usb@5a800100 {
+2 -1
arch/arm/boot/dts/uniphier-support-card.dtsi
··· 42 42 * OTHER DEALINGS IN THE SOFTWARE. 43 43 */ 44 44 45 - &extbus { 45 + &system_bus { 46 + status = "okay"; 46 47 ranges = <1 0x00000000 0x42000000 0x02000000>; 47 48 48 49 support_card: support_card {
+13 -6
arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
··· 133 133 #size-cells = <1>; 134 134 ranges = <0 0 0 0xffffffff>; 135 135 136 - extbus: extbus { 137 - compatible = "simple-bus"; 138 - #address-cells = <2>; 139 - #size-cells = <1>; 140 - }; 141 - 142 136 serial0: serial@54006800 { 143 137 compatible = "socionext,uniphier-uart"; 144 138 status = "disabled"; ··· 253 259 interrupts = <0 26 4>; 254 260 clocks = <&i2c_clk>; 255 261 clock-frequency = <400000>; 262 + }; 263 + 264 + system_bus: system-bus@58c00000 { 265 + compatible = "socionext,uniphier-system-bus"; 266 + status = "disabled"; 267 + reg = <0x58c00000 0x400>; 268 + #address-cells = <2>; 269 + #size-cells = <1>; 270 + }; 271 + 272 + smpctrl@59800000 { 273 + compatible = "socionext,uniphier-smpctrl"; 274 + reg = <0x59801000 0x400>; 256 275 }; 257 276 258 277 pinctrl: pinctrl@5f801000 {