]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ARM64: dts: meson-gx: sysctrl is the parent of the clock controller
authorJerome Brunet <jbrunet@baylibre.com>
Thu, 15 Mar 2018 11:55:43 +0000 (12:55 +0100)
committerKevin Hilman <khilman@baylibre.com>
Thu, 19 Apr 2018 17:38:50 +0000 (10:38 -0700)
The parent of the meson-gx clock controller should be the hhi system
controller, not the HIU bus. This way, the HHI register region can be
used safely by multiple drivers

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

index 562c26a0ba333ed2989351f1d854b0a20fcab042..c3b8e0d3fbc92d26c023f4e1768cb014f7e4bdb3 100644 (file)
        clock-names = "isfr", "iahb", "venci";
 };
 
-&hiubus {
-       clkc: clock-controller@0 {
+&sysctrl {
+       clkc: clock-controller {
                compatible = "amlogic,gxbb-clkc";
                #clock-cells = <1>;
-               reg = <0x0 0x0 0x0 0x3db>;
        };
 };
 
index dba365ed4bd5f903e34f4c6fdf1b14d539db0d89..ef0df63e23fbc0d4ca51ebac61972b193821a206 100644 (file)
        clock-names = "isfr", "iahb", "venci";
 };
 
-&hiubus {
-       clkc: clock-controller@0 {
+&sysctrl {
+       clkc: clock-controller {
                compatible = "amlogic,gxl-clkc", "amlogic,gxbb-clkc";
                #clock-cells = <1>;
-               reg = <0x0 0x0 0x0 0x3db>;
        };
 };