]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: dts: uniphier: add system-bus-controller nodes
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 27 Oct 2015 03:21:05 +0000 (12:21 +0900)
committerOlof Johansson <olof@lixom.net>
Sat, 31 Oct 2015 01:58:06 +0000 (01:58 +0000)
The System Bus Controller block has two register regions,
but having only the second one in a separate node was not nice.

Replace it with a new node with two register regions in it.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
arch/arm/boot/dts/uniphier-ph1-pro5.dtsi
arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
arch/arm/boot/dts/uniphier-proxstream2.dtsi

index ae13469a387c5c343fc9a083154f953ded62437b..af493819548dca9f5fed87d104a403aa5d713a46 100644 (file)
                        clock-frequency = <100000>;
                };
 
-               system-bus-controller-misc@59800000 {
-                       compatible = "socionext,uniphier-system-bus-controller-misc",
-                                    "syscon";
-                       reg = <0x59800000 0x2000>;
+               system-bus-controller@58c00000 {
+                       compatible = "socionext,uniphier-system-bus-controller";
+                       reg = <0x58c00000 0x400>, <0x59800000 0x2000>;
                };
 
                usb0: usb@5a800100 {
index 85377b23483fdfc5df590a98f48756c01fc50b9a..254642fe0e71300f112a6b57eb379f7f1ff42722 100644 (file)
                        clock-frequency = <400000>;
                };
 
-               system-bus-controller-misc@59800000 {
-                       compatible = "socionext,uniphier-system-bus-controller-misc",
-                                    "syscon";
-                       reg = <0x59800000 0x2000>;
+               system-bus-controller@58c00000 {
+                       compatible = "socionext,uniphier-system-bus-controller";
+                       reg = <0x58c00000 0x400>, <0x59800000 0x2000>;
                };
 
                usb2: usb@5a800100 {
index 96da01ed74b64fa7238af92056bb839095d1ad1e..11eb76239feb7b549931e3940107a23d3d0d10e3 100644 (file)
                        clock-frequency = <400000>;
                };
 
-               system-bus-controller-misc@59800000 {
-                       compatible = "socionext,uniphier-system-bus-controller-misc",
-                                    "syscon";
-                       reg = <0x59800000 0x2000>;
+               system-bus-controller@58c00000 {
+                       compatible = "socionext,uniphier-system-bus-controller";
+                       reg = <0x58c00000 0x400>, <0x59800000 0x2000>;
                };
 
                pinctrl: pinctrl@5f801000 {
index 945b37f45988bbdb77dfb34acc8527d056374cfa..691a17d765c2591a7f34edcf479373daeaa6224c 100644 (file)
                        clock-frequency = <400000>;
                };
 
-               system-bus-controller-misc@59800000 {
-                       compatible = "socionext,uniphier-system-bus-controller-misc",
-                                    "syscon";
-                       reg = <0x59800000 0x2000>;
+               system-bus-controller@58c00000 {
+                       compatible = "socionext,uniphier-system-bus-controller";
+                       reg = <0x58c00000 0x400>, <0x59800000 0x2000>;
                };
 
                usb0: usb@5a800100 {
index c98428caed47948a42cbe2587ca2afef0d10961d..e88559b66be75399634ec1f855813cd0a06ea78d 100644 (file)
                        clock-frequency = <100000>;
                };
 
-               system-bus-controller-misc@59800000 {
-                       compatible = "socionext,uniphier-system-bus-controller-misc",
-                                    "syscon";
-                       reg = <0x59800000 0x2000>;
+               system-bus-controller@58c00000 {
+                       compatible = "socionext,uniphier-system-bus-controller";
+                       reg = <0x58c00000 0x400>, <0x59800000 0x2000>;
                };
 
                usb0: usb@5a800100 {
index ad5fb390e003dfd0a9a836825cee4bae3e93348f..259f1a909e2401db2bd09e86476781e54583ec92 100644 (file)
                        clock-frequency = <400000>;
                };
 
-               system-bus-controller-misc@59800000 {
-                       compatible = "socionext,uniphier-system-bus-controller-misc",
-                                    "syscon";
-                       reg = <0x59800000 0x2000>;
+               system-bus-controller@58c00000 {
+                       compatible = "socionext,uniphier-system-bus-controller";
+                       reg = <0x58c00000 0x400>, <0x59800000 0x2000>;
                };
 
                pinctrl: pinctrl@5f801000 {