Unverified Commit 2d3de197 authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

ARM: dts: arm: Update ICST clock nodes 'reg' and node names 



Add a 'reg' entry for ICST clock nodes on the Arm Ltd platforms. The 'reg'
entry is the VCO register address. With this, the node name can be updated
to use a generic node name, 'clock-controller', and a unit-address.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20211024232239.211822-1-linus.walleij@linaro.org

'
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 25b892b5

arch/arm/boot/dts/arm-realview-eb.dtsi

+10 −5
Original line number Diff line number Diff line
@@ -269,36 +269,41 @@ 
				label = "versatile:7";

				default-state = "off";

			};

			oscclk0: osc0@0c {

			oscclk0: clock-controller@c {

				compatible = "arm,syscon-icst307";

				reg = <0x0c 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x0C>;

				clocks = <&xtal24mhz>;

			};

			oscclk1: osc1@10 {

			oscclk1: clock-controller@10 {

				compatible = "arm,syscon-icst307";

				reg = <0x10 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x10>;

				clocks = <&xtal24mhz>;

			};

			oscclk2: osc2@14 {

			oscclk2: clock-controller@14 {

				compatible = "arm,syscon-icst307";

				reg = <0x14 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x14>;

				clocks = <&xtal24mhz>;

			};

			oscclk3: osc3@18 {

			oscclk3: clock-controller@18 {

				compatible = "arm,syscon-icst307";

				reg = <0x18 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x18>;

				clocks = <&xtal24mhz>;

			};

			oscclk4: osc4@1c {

			oscclk4: clock-controller@1c {

				compatible = "arm,syscon-icst307";

				reg = <0x1c 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x1c>;

arch/arm/boot/dts/arm-realview-pb1176.dts

+10 −5
Original line number Diff line number Diff line
@@ -287,36 +287,41 @@ 
				label = "versatile:7";

				default-state = "off";

			};

			oscclk0: osc0@0c {

			oscclk0: clock-controller@c {

				compatible = "arm,syscon-icst307";

				reg = <0x0c 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x0C>;

				clocks = <&xtal24mhz>;

			};

			oscclk1: osc1@10 {

			oscclk1: clock-controller@10 {

				compatible = "arm,syscon-icst307";

				reg = <0x10 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x10>;

				clocks = <&xtal24mhz>;

			};

			oscclk2: osc2@14 {

			oscclk2: clock-controller@14 {

				compatible = "arm,syscon-icst307";

				reg = <0x14 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x14>;

				clocks = <&xtal24mhz>;

			};

			oscclk3: osc3@18 {

			oscclk3: clock-controller@18 {

				compatible = "arm,syscon-icst307";

				reg = <0x18 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x18>;

				clocks = <&xtal24mhz>;

			};

			oscclk4: osc4@1c {

			oscclk4: clock-controller@1c {

				compatible = "arm,syscon-icst307";

				reg = <0x1c 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x1c>;

arch/arm/boot/dts/arm-realview-pb11mp.dts

+14 −7
Original line number Diff line number Diff line
@@ -378,50 +378,57 @@ 
				default-state = "off";

			};



			oscclk0: osc0@0c {

			oscclk0: clock-controller@c {

				compatible = "arm,syscon-icst307";

				reg = <0x0c 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x0C>;

				clocks = <&xtal24mhz>;

			};

			oscclk1: osc1@10 {

			oscclk1: clock-controller@10 {

				compatible = "arm,syscon-icst307";

				reg = <0x10 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x10>;

				clocks = <&xtal24mhz>;

			};

			oscclk2: osc2@14 {

			oscclk2: clock-controller@14 {

				compatible = "arm,syscon-icst307";

				reg = <0x14 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x14>;

				clocks = <&xtal24mhz>;

			};

			oscclk3: osc3@18 {

			oscclk3: clock-controller@18 {

				compatible = "arm,syscon-icst307";

				reg = <0x18 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x18>;

				clocks = <&xtal24mhz>;

			};

			oscclk4: osc4@1c {

			oscclk4: clock-controller@1c {

				compatible = "arm,syscon-icst307";

				reg = <0x1c 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x1c>;

				clocks = <&xtal24mhz>;

			};

			oscclk5: osc5@d4 {

			oscclk5: clock-controller@d4 {

				compatible = "arm,syscon-icst307";

				reg = <0xd4 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0xd4>;

				clocks = <&xtal24mhz>;

			};

			oscclk6: osc6@d8 {

			oscclk6: clock-controller@d8 {

				compatible = "arm,syscon-icst307";

				reg = <0xd8 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0xd8>;

arch/arm/boot/dts/arm-realview-pbx.dtsi

+10 −5
Original line number Diff line number Diff line
@@ -291,36 +291,41 @@ 
				label = "versatile:7";

				default-state = "off";

			};

			oscclk0: osc0@0c {

			oscclk0: clock-controller@c {

				compatible = "arm,syscon-icst307";

				reg = <0x0c 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x0C>;

				clocks = <&xtal24mhz>;

			};

			oscclk1: osc1@10 {

			oscclk1: clock-controller@10 {

				compatible = "arm,syscon-icst307";

				reg = <0x10 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x10>;

				clocks = <&xtal24mhz>;

			};

			oscclk2: osc2@14 {

			oscclk2: clock-controller@14 {

				compatible = "arm,syscon-icst307";

				reg = <0x14 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x14>;

				clocks = <&xtal24mhz>;

			};

			oscclk3: osc3@18 {

			oscclk3: clock-controller@18 {

				compatible = "arm,syscon-icst307";

				reg = <0x18 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x18>;

				clocks = <&xtal24mhz>;

			};

			oscclk4: osc4@1c {

			oscclk4: clock-controller@1c {

				compatible = "arm,syscon-icst307";

				reg = <0x1c 0x04>;

				#clock-cells = <0>;

				lock-offset = <0x20>;

				vco-offset = <0x1c>;

arch/arm/boot/dts/integratorap-im-pd1.dts

+7 −2
Original line number Diff line number Diff line
@@ -28,9 +28,13 @@ 
	syscon@0 {

		compatible = "arm,im-pd1-syscon", "syscon";

		reg = <0x00000000 0x1000>;

		ranges;

		#address-cells = <1>;

		#size-cells = <1>;



		vco1: vco1-clock {

		vco1: clock-controller@0 {

			compatible = "arm,impd1-vco1";

			reg = <0x00 0x04>;

			#clock-cells = <0>;

			lock-offset = <0x08>;

			vco-offset = <0x00>;
@@ -38,8 +42,9 @@ 
			clock-output-names = "IM-PD1-VCO1";

		};



		vco2: vco2-clock {

		vco2: clock-controller@4 {

			compatible = "arm,impd1-vco2";

			reg = <0x04 0x04>;

			#clock-cells = <0>;

			lock-offset = <0x08>;

			vco-offset = <0x04>;