From patchwork Tue Jan 28 14:03:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B269EC33CB3 for ; Tue, 28 Jan 2020 14:39:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D7CE20702 for ; Tue, 28 Jan 2020 14:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580222378; bh=F6SWhXdGVj04psLS6o2Ih7BWlGCKQZEirJv0QantYuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iIVAj2wTRfzK2Qhs3gUSkvgQO4Wlt3UFuL+TsOJw9Cha47Q9+pTS1Tkq3mkXbsfMI 9Z5je9YeNRdOcVsfsSzNVG0U1ypFpp0+i/tp5WO0L+UGzuf6NG5lRg4njvifTFp1/9 9jTB+q7FrmUSBIrvJ5CfSZ3s+AGDUUIkVlgra2zs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726143AbgA1OQx (ORCPT ); Tue, 28 Jan 2020 09:16:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:40454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728309AbgA1OQx (ORCPT ); Tue, 28 Jan 2020 09:16:53 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0EC7E24681; Tue, 28 Jan 2020 14:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221012; bh=F6SWhXdGVj04psLS6o2Ih7BWlGCKQZEirJv0QantYuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uYUWOK9OMrMO2qbgVBq0ETNARBo9EkLh8i3DchTlGnQlkbpvlyb4i1JXHcWdcZwwF ViAP4Mh3Nfs6bqdUK9F0hkeAdUf2RJz6XkVZXDOaDfeCTCCYgYQ5ngQmkOL3l9jRmi DX2W1hjHMd6nfiRkBkoJKuKgOimAlcZk8osUCf5o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladimir Zapolskiy , Sasha Levin Subject: [PATCH 4.9 053/271] ARM: dts: lpc32xx: reparent keypad controller to SIC1 Date: Tue, 28 Jan 2020 15:03:22 +0100 Message-Id: <20200128135856.586419147@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vladimir Zapolskiy [ 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 Signed-off-by: Sasha Levin --- arch/arm/boot/dts/lpc32xx.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi index da375813afd04..6bd196457ccc2 100644 --- a/arch/arm/boot/dts/lpc32xx.dtsi +++ b/arch/arm/boot/dts/lpc32xx.dtsi @@ -463,7 +463,8 @@ 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"; };