ARM: dts: lpc32xx: reparent keypad controller to SIC1
authorVladimir Zapolskiy <vz@mleia.com>
Sat, 26 Jan 2019 14:29:21 +0000 (16:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jan 2020 09:24:13 +0000 (10:24 +0100)
[ Upstream commit 489261c45f0ebbc1c2813f337bbdf858267f5033 ]

After switching to a new interrupt controller scheme by separating SIC1
and SIC2 from MIC interrupt controller just one SoC keypad controller
was not taken into account, fix it now:

  WARNING: CPU: 0 PID: 1 at kernel/irq/irqdomain.c:524 irq_domain_associate+0x50/0x1b0
  error: hwirq 0x36 is too large for interrupt-controller@40008000
  ...
  lpc32xx_keys 40050000.key: failed to get platform irq
  lpc32xx_keys: probe of 40050000.key failed with error -22

Fixes: 9b8ad3fb81ae ("ARM: dts: lpc32xx: reparent SIC1 and SIC2 interrupts from MIC")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/lpc32xx.dtsi

index da375813afd045095ac6272fbf3071e6e7f39858..6bd196457ccc2153de08f90661c9371ec4330896 100644 (file)
                                compatible = "nxp,lpc3220-key";
                                reg = <0x40050000 0x1000>;
                                clocks = <&clk LPC32XX_CLK_KEY>;
-                               interrupts = <54 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupt-parent = <&sic1>;
+                               interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };