diff options
| author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2017-10-30 00:17:15 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2017-12-01 00:29:43 +0100 |
| commit | 9fd7a2e063993a9d47f444147520b9e7fcea4c99 (patch) | |
| tree | ba0ed4b6a45e055102a2af33847822e4ee166ae2 | |
| parent | ARM: dts: meson: correct the sort order for the the gpio_intc node (diff) | |
| download | linux-9fd7a2e063993a9d47f444147520b9e7fcea4c99.tar.xz linux-9fd7a2e063993a9d47f444147520b9e7fcea4c99.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/meson.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index b750c837ec39..0d9faf1a51ea 100644 --- 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>; |