Message ID | 20211122025554.15338-1-matt@traverse.com.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm64: dts: ten64: remove redundant interrupt declaration for gpio-keys | expand |
On Mon, Nov 22, 2021 at 02:55:54AM +0000, Mathew McBride wrote: > gpio-keys already 'inherits' the interrupts from the controller > of the specified GPIO, so having another declaration is redundant. > On >=v5.15 this started causing an oops under gpio_keys_probe as > the IRQ was already claimed. > > Signed-off-by: Mathew McBride <matt@traverse.com.au> > Fixes: 418962eea358 ("arm64: dts: add device tree for Traverse Ten64 (LS1088A)") > Cc: stable@vger.kernel.org Applied, thanks!
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts index 3063851c2fb9..d3f03dcbb8c3 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts @@ -38,7 +38,6 @@ buttons { powerdn { label = "External Power Down"; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; - interrupts = <&gpio1 17 IRQ_TYPE_EDGE_FALLING>; linux,code = <KEY_POWER>; }; @@ -46,7 +45,6 @@ powerdn { admin { label = "ADMIN button"; gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>; - interrupts = <&gpio3 8 IRQ_TYPE_EDGE_RISING>; linux,code = <KEY_WPS_BUTTON>; }; };
gpio-keys already 'inherits' the interrupts from the controller of the specified GPIO, so having another declaration is redundant. On >=v5.15 this started causing an oops under gpio_keys_probe as the IRQ was already claimed. Signed-off-by: Mathew McBride <matt@traverse.com.au> Fixes: 418962eea358 ("arm64: dts: add device tree for Traverse Ten64 (LS1088A)") Cc: stable@vger.kernel.org --- arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 2 -- 1 file changed, 2 deletions(-)