Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: uniphier: rework UniPhier System Bus nodes

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2016-02-26 16:18:30 +09:00 committed by Arnd Bergmann
parent 5c5154e429
commit 14bae133b8
4 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/boot/dts/uniphier-common32.dtsi
View File

@ -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 {

20
arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
View File

@ -94,12 +94,6 @@
ranges;
interrupt-parent = <&intc>;
extbus: extbus {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
};
timer@20000200 {
compatible = "arm,cortex-a9-global-timer";
reg = <0x20000200 0x20>;
@ -216,9 +210,17 @@
clock-frequency = <400000>;
};
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>;
};
usb0: usb@5a800100 {

3
arch/arm/boot/dts/uniphier-support-card.dtsi
View File

@ -42,7 +42,8 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
&extbus {
&system_bus {
status = "okay";
ranges = <1 0x00000000 0x42000000 0x02000000>;
support_card: support_card {

19
arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
View File

@ -133,12 +133,6 @@
#size-cells = <1>;
ranges = <0 0 0 0xffffffff>;
extbus: extbus {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
};
serial0: serial@54006800 {
compatible = "socionext,uniphier-uart";
status = "disabled";
@ -261,6 +255,19 @@
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 {
compatible = "socionext,ph1-ld20-pinctrl", "syscon";
reg = <0x5f801000 0xe00>;