mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-31 16:38:12 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
Martin Blumenstingl 2019-01-18 23:52:21 +01:00 committed by Kevin Hilman
parent 29f0023d01
commit b6db3936f2
3 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/boot/dts/meson.dtsi
View file

@ -72,6 +72,13 @@ cbus: cbus@c1100000 {
#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>;

15
arch/arm/boot/dts/meson8.dtsi
View file

@ -327,13 +327,6 @@ mux {
};
&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 @@ &gpio_intc {
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>;

15
arch/arm/boot/dts/meson8b.dtsi
View file

@ -276,13 +276,6 @@ mux {
};
&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 @@ &gpio_intc {
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>;