]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ARM: dts: meson8b: fix the clock controller register size
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Sat, 21 Jul 2018 19:05:53 +0000 (21:05 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 26 Nov 2019 12:16:30 +0000 (13:16 +0100)
BugLink: https://bugs.launchpad.net/bugs/1853915
[ Upstream commit f31094fe8c16fbd2ca47921acf93b744b045aace ]

The clock controller registers are not 0x460 wide because the reset
controller starts at CBUS 0x4404. This currently overlaps with the
clock controller (which is at CBUS 0x4000).

There is no public documentation available on the actual size of the
clock controller's register area (also called "HHI"). However, in
Amlogic's GPL kernel sources the last "HHI" register is
HHI_HDMI_PHY_CNTL2 at CBUS + 0x43a8. 0x400 was chosen because that size
doesn't seem unlikely.

Fixes: 4a69fcd3a10803 ("ARM: meson: Add DTS for Odroid-C1 and Tronfy MXQ boards")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
arch/arm/boot/dts/meson8b.dtsi

index d75e0ceda8bbec15119068e40ce15bd7e0212972..72d4ed4a365aa9881a49dcc0edc7f34f5a96d3b1 100644 (file)
                #clock-cells = <1>;
                #reset-cells = <1>;
                compatible = "amlogic,meson8b-clkc";
-               reg = <0x8000 0x4>, <0x4000 0x460>;
+               reg = <0x8000 0x4>, <0x4000 0x400>;
        };
 
        reset: reset-controller@4404 {