ARM: dts: meson: fix the memory region of the GPIO interrupt controller

commit 200a575b68d2 ("ARM: dts: meson: organize devices in their corresponding busses")
organized all peripherals in busses so that the base register offset of
the bus doesn't have to be included in all child-nodes anymore.
The GPIO interrupt controller however specifies the register offset
without subtracting the "cbus" base address. This leads to a problem
where of_iomap inside the irq-meson-gpio driver fails because it
actually tries to map 0x182209880 (cbus base = 0xc1100000 + 0xc1109880
for the GPIO interrupt controller). Fix this by using 0x9880 as register
offset.

Fixes: 7d32bc03bcfb ("ARM: dts: meson8b: enable gpio interrupt controller")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index b750c837ec39056fb70f7dd44dc25ff38e45ef71..0d9faf1a51eac0cca63b54cb272bb1c57e8261d2 100644 (file)
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -184,7 +184,7 @@
 
                        gpio_intc: interrupt-controller@9880 {
                                compatible = "amlogic,meson-gpio-intc";
-                               reg = <0xc1109880 0x10>;
+                               reg = <0x9880 0x10>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
                                amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;