From mboxrd@z Thu Jan 1 00:00:00 1970 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 8A885C2D0DB for ; Fri, 24 Jan 2020 09:57:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57EB92075D for ; Fri, 24 Jan 2020 09:57:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859846; bh=Be775YfMZRAshdeiSYxip5rPo/rAYt/NxuZ4l4lI9vU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xdGcbS7jdm1NtYVc3JXRnNM7GGUKbt5WKjsIQn97JxiC0nalA9Bq2RcVmDwlfM7VN 2lJ2QnOn/pSPR8oAhxvMyhhW/9sj8P5ssJqGiDQL57MM7ImeUdnKMkDSqCFw5YWKCM rIRPzqhWBcJNoPQrF4EJasB3ygG8Rf+WZV/iu5Uw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731666AbgAXJ5W (ORCPT ); Fri, 24 Jan 2020 04:57:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:32938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730740AbgAXJ5V (ORCPT ); Fri, 24 Jan 2020 04:57:21 -0500 Received: from localhost (unknown [145.15.244.15]) (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 2831C20709; Fri, 24 Jan 2020 09:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859841; bh=Be775YfMZRAshdeiSYxip5rPo/rAYt/NxuZ4l4lI9vU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=11wG4CsSaZbFH8aD1aqY89BGFniGinaFP1qvBt0QD5UzUIMib+Y1HRV3k84vgzDSk 67oxQZl9sSVTjD3Vjc2rG3lWi4y27IL0Qd5CxNCIKsraI0sQ4sa4D+89hhJucG8kp+ p+Vz1dH6QVm6CQkIlJj7UzPDcyEGXrBUqBPUbSCo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Russell King , Sasha Levin Subject: [PATCH 4.14 206/343] ARM: riscpc: fix lack of keyboard interrupts after irq conversion Date: Fri, 24 Jan 2020 10:30:24 +0100 Message-Id: <20200124092947.146420136@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Russell King [ Upstream commit 63a0666bca9311f35017be454587f3ba903644b8 ] Fix lack of keyboard interrupts for RiscPC due to incorrect conversion. Fixes: e8d36d5dbb6a ("ARM: kill off set_irq_flags usage") Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/mach-rpc/irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rpc/irq.c b/arch/arm/mach-rpc/irq.c index b8a61cb112073..7f0f401786344 100644 --- a/arch/arm/mach-rpc/irq.c +++ b/arch/arm/mach-rpc/irq.c @@ -118,7 +118,7 @@ extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end; void __init rpc_init_irq(void) { - unsigned int irq, clr, set = 0; + unsigned int irq, clr, set; iomd_writeb(0, IOMD_IRQMASKA); iomd_writeb(0, IOMD_IRQMASKB); @@ -130,6 +130,7 @@ void __init rpc_init_irq(void) for (irq = 0; irq < NR_IRQS; irq++) { clr = IRQ_NOREQUEST; + set = 0; if (irq <= 6 || (irq >= 9 && irq <= 15)) clr |= IRQ_NOPROBE; -- 2.20.1