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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60827C54EED for ; Mon, 30 Jan 2023 14:07:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237118AbjA3OH6 (ORCPT ); Mon, 30 Jan 2023 09:07:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237122AbjA3OH5 (ORCPT ); Mon, 30 Jan 2023 09:07:57 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 230A3E077 for ; Mon, 30 Jan 2023 06:07:56 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C6087B811C7 for ; Mon, 30 Jan 2023 14:07:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1011FC433EF; Mon, 30 Jan 2023 14:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675087673; bh=4OOrnXhC3gFehwLim97Sm4bqSJRqTDMDLTsw0xaiRxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4ma0H1RmDEbj6U1CWZLyu1ioUuu/g/ia0T++/FdQ4RdlKH1BAC/D7NxnqCfoQ62A +AOS3+wCrdUQNuZVBz5JIjaBnyTeHboyMFtoC7HGUZ/mzklkwrQ0ciseoP5t51X+R9 e0U8mJjyaXm+jTk63egSx0L62fpOrayHxmiaKs6c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nikita Shubin , Arnd Bergmann , Bartosz Golaszewski , Sasha Levin Subject: [PATCH 6.1 286/313] gpio: ep93xx: Fix port F hwirq numbers in handler Date: Mon, 30 Jan 2023 14:52:01 +0100 Message-Id: <20230130134350.046763290@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130134336.532886729@linuxfoundation.org> References: <20230130134336.532886729@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nikita Shubin [ Upstream commit 0f04cdbdb210000a97c773b28b598fa8ac3aafa4 ] Fix wrong translation of irq numbers in port F handler, as ep93xx hwirqs increased by 1, we should simply decrease them by 1 in translation. Fixes: 482c27273f52 ("ARM: ep93xx: renumber interrupts") Signed-off-by: Nikita Shubin Acked-by: Arnd Bergmann Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin --- drivers/gpio/gpio-ep93xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index 2e1779709113..7edcdc575080 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -148,7 +148,7 @@ static void ep93xx_gpio_f_irq_handler(struct irq_desc *desc) */ struct irq_chip *irqchip = irq_desc_get_chip(desc); unsigned int irq = irq_desc_get_irq(desc); - int port_f_idx = ((irq + 1) & 7) ^ 4; /* {19..22,47..50} -> {0..7} */ + int port_f_idx = (irq & 7) ^ 4; /* {20..23,48..51} -> {0..7} */ int gpio_irq = EP93XX_GPIO_F_IRQ_BASE + port_f_idx; chained_irq_enter(irqchip, desc); -- 2.39.0