Skip to content

Commit 9fd7a2e

Browse files
xdarklightkhilman
authored andcommitted
ARM: dts: meson: fix the memory region of the GPIO interrupt controller
commit 200a575 ("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: 7d32bc0 ("ARM: dts: meson8b: enable gpio interrupt controller") Signed-off-by: Martin Blumenstingl <[email protected]> Acked-by: Jerome Brunet <[email protected]> Signed-off-by: Kevin Hilman <[email protected]>
1 parent 208e4ea commit 9fd7a2e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/boot/dts/meson.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184

185185
gpio_intc: interrupt-controller@9880 {
186186
compatible = "amlogic,meson-gpio-intc";
187-
reg = <0xc1109880 0x10>;
187+
reg = <0x9880 0x10>;
188188
interrupt-controller;
189189
#interrupt-cells = <2>;
190190
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;

0 commit comments

Comments
 (0)