| From 2e8b705298ab443dafeb66c25fa523727587c3df Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 21 Jul 2018 21:05:52 +0200 |
| Subject: ARM: dts: meson8: fix the clock controller register size |
| |
| From: Martin Blumenstingl <martin.blumenstingl@googlemail.com> |
| |
| [ Upstream commit f7f9da89bc4f61e33f7b9f5c75c4efdc1f0455d8 ] |
| |
| 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: 2c323c43a3d619 ("ARM: dts: meson8: add and use the real clock controller") |
| 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> |
| --- |
| arch/arm/boot/dts/meson8.dtsi | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi |
| index d77dcf890cfc8..7162e0ca05b0a 100644 |
| --- a/arch/arm/boot/dts/meson8.dtsi |
| +++ b/arch/arm/boot/dts/meson8.dtsi |
| @@ -194,7 +194,7 @@ |
| #clock-cells = <1>; |
| #reset-cells = <1>; |
| compatible = "amlogic,meson8-clkc"; |
| - reg = <0x8000 0x4>, <0x4000 0x460>; |
| + reg = <0x8000 0x4>, <0x4000 0x400>; |
| }; |
| |
| reset: reset-controller@4404 { |
| -- |
| 2.20.1 |
| |