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

Commit 467f54b2 authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Jason Cooper
Browse files

ARM: dts: mvebu: introduce internal-regs node 



Introduce a 'internal-regs' subnode, under which all devices are
moved. This is not really needed for now, but will be for the
mvebu-mbus driver. This generates a lot of code movement since it's
indenting by one more tab all the devices.  So it was a good
opportunity to fix all the bad indentation.

Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 82a68267

arch/arm/boot/dts/armada-370-db.dts

+68 −66
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
	};



	soc {

		internal-regs {

			serial@12000 {

				clock-frequency = <200000000>;

				status = "okay";
@@ -113,3 +114,4 @@ 
			};

		};

	};

};

arch/arm/boot/dts/armada-370-mirabox.dts

+89 −87
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
	};



	soc {

		internal-regs {

			serial@12000 {

				clock-frequency = <200000000>;

				status = "okay";
@@ -136,3 +137,4 @@ 
			};

		};

	};

};

arch/arm/boot/dts/armada-370-rd.dts

+49 −47
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
	};



	soc {

		internal-regs {

			serial@12000 {

				clock-frequency = <200000000>;

				status = "okay";
@@ -72,7 +73,6 @@ 
			usb@51000 {

				status = "okay";

			};

	};



			gpio-keys {

				compatible = "gpio-keys";
@@ -85,3 +85,5 @@ 
				};

			};

		};

	};

 };

arch/arm/boot/dts/armada-370-xp.dtsi

+152 −149
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
		};

	};





	soc {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -36,6 +35,12 @@ 
		interrupt-parent = <&mpic>;

		ranges = <0 0xd0000000 0x100000>;



		internal-regs {

			compatible = "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			mpic: interrupt-controller@20000 {

				compatible = "marvell,mpic";

				#interrupt-cells = <1>;
@@ -45,8 +50,7 @@ 


			coherency-fabric@20200 {

				compatible = "marvell,coherency-fabric";

				reg = <0x20200 0xb0>,

				      <0x21810 0x1c>;

				reg = <0x20200 0xb0>, <0x21810 0x1c>;

			};



			serial@12000 {
@@ -68,8 +72,7 @@ 


			timer@20300 {

				compatible = "marvell,armada-370-xp-timer";

			       reg = <0x20300 0x30>,

			       <0x21040 0x30>;

				reg = <0x20300 0x30>, <0x21040 0x30>;

				interrupts = <37>, <38>, <39>, <40>, <5>, <6>;

				clocks = <&coreclk 2>;

			};
@@ -224,4 +227,4 @@ 
			};

		};

	};

 };

arch/arm/boot/dts/armada-370.dtsi

+164 −164
Original line number Diff line number Diff line
@@ -28,12 +28,7 @@ 
	};



	soc {



		mpic: interrupt-controller@20000 {

			reg = <0x20a00 0x1d0>,

			      <0x21870 0x58>;

		};



		internal-regs {

			system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";

				reg = <0x18200 0x100>;
@@ -46,6 +41,10 @@ 
				wt-override;

			};



			mpic: interrupt-controller@20000 {

				reg = <0x20a00 0x1d0>, <0x21870 0x58>;

			};



			pinctrl {

				compatible = "marvell,mv88f6710-pinctrl";

				reg = <0x18000 0x38>;
@@ -221,3 +220,4 @@ 
			};

		};

	};

};