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

Commit b6db3936 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Kevin Hilman
Browse files

ARM: dts: meson: switch the clock controller to the HHI register area 



The clock controller on Meson8/Meson8m2 and Meson8b is part of a
register region called "HHI". This register area contains more
functionality than just a clock controller:
- the clock controller
- some reset controller bits
- temperature sensor calibration data (on Meson8b and Meson8m2 only)
- HDMI controller

Allow access to this HHI register area as "system controller". Also
migrate the Meson8 and Meson8b clock controllers to this new node.

Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 29f0023d

arch/arm/boot/dts/meson.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ 
			#size-cells = <1>;

			ranges = <0x0 0xc1100000 0x200000>;



			hhi: system-controller@4000 {

				compatible = "amlogic,meson-hhi-sysctrl",

					     "simple-mfd",

					     "syscon";

				reg = <0x4000 0x400>;

			};



			assist: assist@7c00 {

				compatible = "amlogic,meson-mx-assist", "syscon";

				reg = <0x7c00 0x200>;

arch/arm/boot/dts/meson8.dtsi

+8 −7
Original line number Diff line number Diff line
@@ -327,13 +327,6 @@ 
};



&cbus {

	clkc: clock-controller@4000 {

		#clock-cells = <1>;

		#reset-cells = <1>;

		compatible = "amlogic,meson8-clkc";

		reg = <0x8000 0x4>, <0x4000 0x400>;

	};



	reset: reset-controller@4404 {

		compatible = "amlogic,meson8b-reset";

		reg = <0x4404 0x9c>;
@@ -468,6 +461,14 @@ 
	status = "okay";

};



&hhi {

	clkc: clock-controller {

		compatible = "amlogic,meson8-clkc";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

};



&hwrng {

	compatible = "amlogic,meson8-rng", "amlogic,meson-rng";

	clocks = <&clkc CLKID_RNG0>;

arch/arm/boot/dts/meson8b.dtsi

+8 −7
Original line number Diff line number Diff line
@@ -276,13 +276,6 @@ 
};



&cbus {

	clkc: clock-controller@4000 {

		#clock-cells = <1>;

		#reset-cells = <1>;

		compatible = "amlogic,meson8b-clkc";

		reg = <0x8000 0x4>, <0x4000 0x400>;

	};



	reset: reset-controller@4404 {

		compatible = "amlogic,meson8b-reset";

		reg = <0x4404 0x9c>;
@@ -437,6 +430,14 @@ 
	status = "okay";

};



&hhi {

	clkc: clock-controller {

		compatible = "amlogic,meson8-clkc";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

};



&hwrng {

	compatible = "amlogic,meson8b-rng", "amlogic,meson-rng";

	clocks = <&clkc CLKID_RNG0>;