Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b38b0e3 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Olof Johansson
Browse files

ARM: dts: uniphier: add system-bus-controller nodes 



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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 980bbff0

arch/arm/boot/dts/uniphier-ph1-ld4.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -200,10 +200,9 @@ 
			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 {

arch/arm/boot/dts/uniphier-ph1-pro4.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -232,10 +232,9 @@ 
			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 {

arch/arm/boot/dts/uniphier-ph1-pro5.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -241,10 +241,9 @@ 
			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 {

arch/arm/boot/dts/uniphier-ph1-sld3.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -216,10 +216,9 @@ 
			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 {

arch/arm/boot/dts/uniphier-ph1-sld8.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -200,10 +200,9 @@ 
			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 {