From patchwork Thu Jan 28 12:21:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 1432775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maquefel.me header.i=@maquefel.me header.a=rsa-sha256 header.s=mail header.b=pZ6knQj5; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DRKPK6rprz9sVm for ; Thu, 28 Jan 2021 23:23:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231680AbhA1MWk (ORCPT ); Thu, 28 Jan 2021 07:22:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231588AbhA1MWW (ORCPT ); Thu, 28 Jan 2021 07:22:22 -0500 Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [IPv6:2a02:6b8:0:801:2::102]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57BFCC061574; Thu, 28 Jan 2021 04:21:40 -0800 (PST) Received: from sas2-b72cee5f614a.qloud-c.yandex.net (sas2-b72cee5f614a.qloud-c.yandex.net [IPv6:2a02:6b8:c08:6c80:0:640:b72c:ee5f]) by forward102j.mail.yandex.net (Yandex) with ESMTP id B4B30F212F4; Thu, 28 Jan 2021 15:21:36 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas2-b72cee5f614a.qloud-c.yandex.net (mxback/Yandex) with ESMTP id qvcgAJgqcY-LaHiuJla; Thu, 28 Jan 2021 15:21:36 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836496; bh=hIu/Pi1a2rxhSeJ9mcdKquJRCpaeUeChEOMSBEzmYZc=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=pZ6knQj5vvpWeN8ELP78WQ/RFmEkPuz3UPFtzG226GgahkXQZrXvgaRlZQKuBOtpQ ACBe8yANLFcBpx8EqEGIvrwexyIzcb7SqFE/t8sZaxN2OOmN1zzCGFb2cioKwbphVP VaLQ0es2pCGtJLJPmC4emVXXbD71kdq22fHipo4c= Authentication-Results: sas2-b72cee5f614a.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-LZn8doPV; Thu, 28 Jan 2021 15:21:36 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/7] gpio: gpio-ep93xx: fix BUG_ON port F usage Date: Thu, 28 Jan 2021 15:21:17 +0300 Message-Id: <20210128122123.25341-2-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The port F is index 2 not 5. ------------[ cut here ]------------ kernel BUG at drivers/gpio/gpio-ep93xx.c:64! Internal error: Oops - BUG: 0 [#1] ARM Modules linked in: CPU: 0 PID: 403 Comm: gpio-event-mon Not tainted 5.9.10-00011-ge93e9618628b-dirty #19 Hardware name: Technologic Systems TS-72xx SBC PC is at ep93xx_gpio_update_int_params+0x1c/0x80 LR is at ep93xx_gpio_update_int_params+0x14/0x80 pc : [] lr : [] psr: 20000093 sp : c158de00 ip : 00000000 fp : 00000001 r10: c44154d4 r9 : 00000000 r8 : c4415020 r7 : c04ef884 r6 : c051c842 r5 : c4415020 r4 : 00000005 r3 : 00000000 r2 : 00000000 r1 : c04eb768 r0 : 00000008 Flags: nzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment none Control: 0000717f Table: 01684000 DAC: 00000051 Process gpio-event-mon (pid: 403, stack limit = 0x(ptrval)) Stack: (0xc158de00 to 0xc158e000) de00: 00000005 00000002 c051c842 c0238dc0 c0238c98 c0238c98 c04ef874 00000000 de20: 00000003 c04fcfcc 60000013 c04ef910 c04ef8d4 c00456f0 c04ef874 c15f1e00 de40: 00000000 00000000 00000001 c0045d40 c15f1e00 c4400160 c0044ca8 c04ef8a8 de60: 60000013 00000000 c15f1e00 c04ef874 c04ef884 00000001 c0235d70 c158b800 de80: be825f0f c0045ec8 00000003 c158b800 c440aa00 be825bc8 00000003 00000001 dea0: 00000000 c0236f00 c44ed3a0 c158b800 c45c2015 00000000 00000001 00000003 dec0: 6f697067 6576652d 6d2d746e 00006e6f 00000000 00000000 00000000 00000000 dee0: be825df4 c00abb0c c440c500 c00aabd4 c440c500 c528b840 c45c2010 c04e1228 df00: 00000ff0 c4478d28 c030b404 be825bc8 c1550e20 00000003 c1550e20 c00c3388 df20: c4478d28 c00c3d48 be825f0f c00abd00 c45c2000 c45c2000 c1550e20 c00bfea8 df40: 00000003 c00b0714 00000000 c4450000 00000004 00000100 00000001 c04e1228 df60: c158dfb0 ffffff9c 000231f8 00000003 00000142 c00b085c 00000000 c04e1228 df80: 00000000 be825f0f 00000003 00000003 00000036 c00083c4 c158c000 00000000 dfa0: be825f0f c00081e0 be825f0f 00000003 00000003 c030b404 be825bc8 00000000 dfc0: be825f0f 00000003 00000003 00000036 00000001 00000000 00022070 be825f0f dfe0: b6f2e4e0 be825bac 00010acc b6f2e4ec 60000010 00000003 00000000 00000000 [] (ep93xx_gpio_update_int_params) from [] (ep93xx_gpio_irq_type+0x128/0x1c0) [] (ep93xx_gpio_irq_type) from [] (__irq_set_trigger+0x6c/0x128) [] (__irq_set_trigger) from [] (__setup_irq+0x594/0x678) [] (__setup_irq) from [] (request_threaded_irq+0xa4/0x128) [] (request_threaded_irq) from [] (gpio_ioctl+0x300/0x4d8) [] (gpio_ioctl) from [] (vfs_ioctl+0x24/0x3c) [] (vfs_ioctl) from [] (sys_ioctl+0xbc/0x768) [] (sys_ioctl) from [] (ret_fast_syscall+0x0/0x50) Exception stack(0xc158dfa8 to 0xc158dff0) dfa0: be825f0f 00000003 00000003 c030b404 be825bc8 00000000 dfc0: be825f0f 00000003 00000003 00000036 00000001 00000000 00022070 be825f0f dfe0: b6f2e4e0 be825bac 00010acc b6f2e4ec Code: e59f0060 ebfff3e1 e3540002 9a000000 (e7f001f2) ---[ end trace 3f6544e133e9f5ae ]--- Fixes: fd935fc421e74 ("gpio: ep93xx: Do not pingpong irq numbers") Signed-off-by: Nikita Shubin --- v2->v3: Reworded commit message. --- drivers/gpio/gpio-ep93xx.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index 226da8df6f10..0d5a9a90cf48 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -39,6 +39,12 @@ struct ep93xx_gpio { struct gpio_chip gc[8]; }; +/* + * F Port index in GPIOCHIP'S array is 5 + * but we use index 2 for stored values and offsets + */ +#define EP93XX_GPIO_F_PORT_INDEX 5 + /************************************************************************* * Interrupt handling for EP93xx on-chip GPIOs *************************************************************************/ @@ -85,6 +91,9 @@ static int ep93xx_gpio_port(struct gpio_chip *gc) return 0; } + if (port == EP93XX_GPIO_F_PORT_INDEX) + port = 2; + return port; } From patchwork Thu Jan 28 12:21:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 1432778 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maquefel.me header.i=@maquefel.me header.a=rsa-sha256 header.s=mail header.b=CU/tknFt; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DRKPw50tbz9sVR for ; Thu, 28 Jan 2021 23:23:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231697AbhA1MW7 (ORCPT ); Thu, 28 Jan 2021 07:22:59 -0500 Received: from forward100o.mail.yandex.net ([37.140.190.180]:53942 "EHLO forward100o.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231608AbhA1MW0 (ORCPT ); Thu, 28 Jan 2021 07:22:26 -0500 Received: from sas1-f8c01700c95b.qloud-c.yandex.net (sas1-f8c01700c95b.qloud-c.yandex.net [IPv6:2a02:6b8:c14:39a5:0:640:f8c0:1700]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 09F6E4AC2169; Thu, 28 Jan 2021 15:21:38 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas1-f8c01700c95b.qloud-c.yandex.net (mxback/Yandex) with ESMTP id LV4tNqI7gB-LbGuAVfI; Thu, 28 Jan 2021 15:21:37 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836497; bh=PoqI9G6G4WSAJWj2ze6FYg4Qf5LrU3S/pSYhCIP5qYM=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=CU/tknFtLeyvAIkAyNM6kFBVG8nlMviWQCKkpYWNefZtRg7hCcxoDBIhuwaJSn4zp hdqk9cwUxSksL9u97hZ86VgizQcd8EK0RsukMSb7HvxuPBg5pe7Nu6lM0P+CiUyD8B X97VJT2+7E/U7TfHXouxK3J4gCzUKw1Bvfu3nc5M= Authentication-Results: sas1-f8c01700c95b.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-Lan86iH7; Thu, 28 Jan 2021 15:21:37 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/7] gpio: gpio-ep93xx: Fix single irqchip with multi gpiochips Date: Thu, 28 Jan 2021 15:21:18 +0300 Message-Id: <20210128122123.25341-3-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Fixes the following warnings which results in interrupts disabled on port B/F: gpio gpiochip1: (B): detected irqchip that is shared with multiple gpiochips: please fix the driver. gpio gpiochip5: (F): detected irqchip that is shared with multiple gpiochips: please fix the driver. - added separate irqchip for each interrupt capable gpiochip - provided unique names for each irqchip - reworked ep93xx_gpio_port to make it usable before chip_add_data in ep93xx_init_irq_chips Fixes: d2b091961510 ("gpio: ep93xx: Pass irqchip when adding gpiochip") Signed-off-by: Nikita Shubin --- v2->v3 - Added a coma - changed to fixes commit d2b091961510 --- drivers/gpio/gpio-ep93xx.c | 45 ++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index 0d5a9a90cf48..b990d37da143 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -34,9 +34,12 @@ */ #define EP93XX_GPIO_F_IRQ_BASE 80 +#define EP93XX_GPIO_IRQ_CHIPS_NUM 3 + struct ep93xx_gpio { void __iomem *base; struct gpio_chip gc[8]; + struct irq_chip ic[EP93XX_GPIO_IRQ_CHIPS_NUM]; }; /* @@ -55,6 +58,11 @@ static unsigned char gpio_int_type2[3]; static unsigned char gpio_int_debounce[3]; /* Port ordering is: A B F */ +static const char * const irq_chip_names[] = { + "gpio-irq-a", + "gpio-irq-b", + "gpio-irq-f", +}; static const u8 int_type1_register_offset[3] = { 0x90, 0xac, 0x4c }; static const u8 int_type2_register_offset[3] = { 0x94, 0xb0, 0x50 }; static const u8 eoi_register_offset[3] = { 0x98, 0xb4, 0x54 }; @@ -77,9 +85,8 @@ static void ep93xx_gpio_update_int_params(struct ep93xx_gpio *epg, unsigned port epg->base + int_en_register_offset[port]); } -static int ep93xx_gpio_port(struct gpio_chip *gc) +static int ep93xx_gpio_port(struct ep93xx_gpio *epg, struct gpio_chip *gc) { - struct ep93xx_gpio *epg = gpiochip_get_data(gc); int port = 0; while (port < ARRAY_SIZE(epg->gc) && gc != &epg->gc[port]) @@ -101,7 +108,7 @@ static void ep93xx_gpio_int_debounce(struct gpio_chip *gc, unsigned int offset, bool enable) { struct ep93xx_gpio *epg = gpiochip_get_data(gc); - int port = ep93xx_gpio_port(gc); + int port = ep93xx_gpio_port(epg, gc); int port_mask = BIT(offset); if (enable) @@ -163,7 +170,7 @@ static void ep93xx_gpio_irq_ack(struct irq_data *d) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct ep93xx_gpio *epg = gpiochip_get_data(gc); - int port = ep93xx_gpio_port(gc); + int port = ep93xx_gpio_port(epg, gc); int port_mask = BIT(d->irq & 7); if (irqd_get_trigger_type(d) == IRQ_TYPE_EDGE_BOTH) { @@ -178,7 +185,7 @@ static void ep93xx_gpio_irq_mask_ack(struct irq_data *d) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct ep93xx_gpio *epg = gpiochip_get_data(gc); - int port = ep93xx_gpio_port(gc); + int port = ep93xx_gpio_port(epg, gc); int port_mask = BIT(d->irq & 7); if (irqd_get_trigger_type(d) == IRQ_TYPE_EDGE_BOTH) @@ -194,7 +201,7 @@ static void ep93xx_gpio_irq_mask(struct irq_data *d) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct ep93xx_gpio *epg = gpiochip_get_data(gc); - int port = ep93xx_gpio_port(gc); + int port = ep93xx_gpio_port(epg, gc); gpio_int_unmasked[port] &= ~BIT(d->irq & 7); ep93xx_gpio_update_int_params(epg, port); @@ -204,7 +211,7 @@ static void ep93xx_gpio_irq_unmask(struct irq_data *d) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct ep93xx_gpio *epg = gpiochip_get_data(gc); - int port = ep93xx_gpio_port(gc); + int port = ep93xx_gpio_port(epg, gc); gpio_int_unmasked[port] |= BIT(d->irq & 7); ep93xx_gpio_update_int_params(epg, port); @@ -219,7 +226,7 @@ static int ep93xx_gpio_irq_type(struct irq_data *d, unsigned int type) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct ep93xx_gpio *epg = gpiochip_get_data(gc); - int port = ep93xx_gpio_port(gc); + int port = ep93xx_gpio_port(epg, gc); int offset = d->irq & 7; int port_mask = BIT(offset); irq_flow_handler_t handler; @@ -335,6 +342,22 @@ static int ep93xx_gpio_f_to_irq(struct gpio_chip *gc, unsigned offset) return EP93XX_GPIO_F_IRQ_BASE + offset; } +static void ep93xx_init_irq_chips(struct ep93xx_gpio *epg) +{ + int i; + + for (i = 0; i < EP93XX_GPIO_IRQ_CHIPS_NUM; i++) { + struct irq_chip *ic = &epg->ic[i]; + + ic->name = irq_chip_names[i]; + ic->irq_ack = ep93xx_gpio_irq_ack; + ic->irq_mask_ack = ep93xx_gpio_irq_mask_ack; + ic->irq_mask = ep93xx_gpio_irq_mask; + ic->irq_unmask = ep93xx_gpio_irq_unmask; + ic->irq_set_type = ep93xx_gpio_irq_type; + } +} + static int ep93xx_gpio_add_bank(struct gpio_chip *gc, struct platform_device *pdev, struct ep93xx_gpio *epg, @@ -345,6 +368,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, struct device *dev = &pdev->dev; struct gpio_irq_chip *girq; int err; + int port; err = bgpio_init(gc, dev, 1, data, NULL, NULL, dir, NULL, 0); if (err) @@ -356,7 +380,8 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, girq = &gc->irq; if (bank->has_irq || bank->has_hierarchical_irq) { gc->set_config = ep93xx_gpio_set_config; - girq->chip = &ep93xx_gpio_irq_chip; + port = ep93xx_gpio_port(epg, gc); + girq->chip = &epg->ic[port]; } if (bank->has_irq) { @@ -423,6 +448,8 @@ static int ep93xx_gpio_probe(struct platform_device *pdev) if (IS_ERR(epg->base)) return PTR_ERR(epg->base); + ep93xx_init_irq_chips(epg); + for (i = 0; i < ARRAY_SIZE(ep93xx_gpio_banks); i++) { struct gpio_chip *gc = &epg->gc[i]; struct ep93xx_gpio_bank *bank = &ep93xx_gpio_banks[i]; From patchwork Thu Jan 28 12:21:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 1432774 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maquefel.me header.i=@maquefel.me header.a=rsa-sha256 header.s=mail header.b=hHBK4/I8; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DRKPH0Mjzz9sS8 for ; Thu, 28 Jan 2021 23:22:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231640AbhA1MW0 (ORCPT ); Thu, 28 Jan 2021 07:22:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231592AbhA1MWW (ORCPT ); Thu, 28 Jan 2021 07:22:22 -0500 X-Greylist: delayed 87819 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 28 Jan 2021 04:21:41 PST Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68407C061756; Thu, 28 Jan 2021 04:21:41 -0800 (PST) Received: from sas1-f3a441df9f84.qloud-c.yandex.net (sas1-f3a441df9f84.qloud-c.yandex.net [IPv6:2a02:6b8:c14:2726:0:640:f3a4:41df]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 1168759806F8; Thu, 28 Jan 2021 15:21:39 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas1-f3a441df9f84.qloud-c.yandex.net (mxback/Yandex) with ESMTP id 0v2XXUOuty-LcGOcLdd; Thu, 28 Jan 2021 15:21:38 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836498; bh=JSyHC+PpP1PhO9j9TTM4tfNyC7KWz39+4w9IvoNJtak=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=hHBK4/I8UmIosf4FY4eh1TEsvUBTmCX/rtMCvnSvpi6U4Z8VnvaTEwBIdnI0aYCXK o02WMzGTdjdG/suLdKMAj/5+NreY5n1yOT13s8mkSuN7w+DKmaTudsafaarGkPCtnR AMBzmgko9G1ygN7aMoAo0MO+sgvdjWvqo5Up6TR0= Authentication-Results: sas1-f3a441df9f84.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-Lcn8Me1l; Thu, 28 Jan 2021 15:21:38 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/7] gpio: gpio-ep93xx: Fix wrong irq numbers in port F Date: Thu, 28 Jan 2021 15:21:19 +0300 Message-Id: <20210128122123.25341-4-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Port F irq's should be statically mapped to EP93XX_GPIO_F_IRQ_BASE. So we need to specify girq->first otherwise: "If device tree is used, then first_irq will be 0 and irqs get mapped dynamically on the fly" And that's not the thing we want. Signed-off-by: Nikita Shubin Acked-by: Alexander Sverdlin --- drivers/gpio/gpio-ep93xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index b990d37da143..dc88115e34da 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -430,6 +430,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_level_irq; gc->to_irq = ep93xx_gpio_f_to_irq; + girq->first = EP93XX_GPIO_F_IRQ_BASE; } return devm_gpiochip_add_data(dev, gc, epg); From patchwork Thu Jan 28 12:21:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 1432777 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maquefel.me header.i=@maquefel.me header.a=rsa-sha256 header.s=mail header.b=itNi+t5n; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DRKPM18wSz9sVv for ; Thu, 28 Jan 2021 23:23:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231694AbhA1MWq (ORCPT ); Thu, 28 Jan 2021 07:22:46 -0500 Received: from forward100p.mail.yandex.net ([77.88.28.100]:38372 "EHLO forward100p.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231590AbhA1MWY (ORCPT ); Thu, 28 Jan 2021 07:22:24 -0500 Received: from sas2-3d0e723302f6.qloud-c.yandex.net (sas2-3d0e723302f6.qloud-c.yandex.net [IPv6:2a02:6b8:c08:6c80:0:640:3d0e:7233]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 2FFCA5981269; Thu, 28 Jan 2021 15:21:40 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas2-3d0e723302f6.qloud-c.yandex.net (mxback/Yandex) with ESMTP id SzMlFKvUZz-LeHmRjsC; Thu, 28 Jan 2021 15:21:40 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836500; bh=C5a9SAwNEUbR0EuvrWoukVA4pIVxaiS8G+ziQFPV0KI=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=itNi+t5nvny7pHGe6/qW2iTQ8KWsNovm2Xvj6ZoiyL0DI6UkhBhpNy9SEauETszZX z1f1nIxpnbcpdfubWT7apxteCdIVjmM8O5qxbNyYgy/Qe0mp4mlTHLl+I6YNfj1L8x fHQL1zlZL5lnJQtqUuU/gqsYScw5Lor5I+S2grx8= Authentication-Results: sas2-3d0e723302f6.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-Ldn81BQu; Thu, 28 Jan 2021 15:21:39 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/7] gpio: ep93xx: drop to_irq binding Date: Thu, 28 Jan 2021 15:21:20 +0300 Message-Id: <20210128122123.25341-5-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org As ->to_irq is redefined in gpiochip_add_irqchip, having it defined in driver is useless, so let's drop it. Signed-off-by: Nikita Shubin Acked-by: Alexander Sverdlin --- drivers/gpio/gpio-ep93xx.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index dc88115e34da..ee1cb3b894db 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -337,11 +337,6 @@ static int ep93xx_gpio_set_config(struct gpio_chip *gc, unsigned offset, return 0; } -static int ep93xx_gpio_f_to_irq(struct gpio_chip *gc, unsigned offset) -{ - return EP93XX_GPIO_F_IRQ_BASE + offset; -} - static void ep93xx_init_irq_chips(struct ep93xx_gpio *epg) { int i; @@ -429,7 +424,6 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, } girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_level_irq; - gc->to_irq = ep93xx_gpio_f_to_irq; girq->first = EP93XX_GPIO_F_IRQ_BASE; } From patchwork Thu Jan 28 12:21:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 1432776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maquefel.me header.i=@maquefel.me header.a=rsa-sha256 header.s=mail header.b=H06xb9+X; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DRKPL4RNkz9sVs for ; Thu, 28 Jan 2021 23:23:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231181AbhA1MWq (ORCPT ); Thu, 28 Jan 2021 07:22:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231618AbhA1MWY (ORCPT ); Thu, 28 Jan 2021 07:22:24 -0500 X-Greylist: delayed 92113 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 28 Jan 2021 04:21:43 PST Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::601]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D524CC0613ED; Thu, 28 Jan 2021 04:21:43 -0800 (PST) Received: from sas1-6b94a3a85f37.qloud-c.yandex.net (sas1-6b94a3a85f37.qloud-c.yandex.net [IPv6:2a02:6b8:c14:3924:0:640:6b94:a3a8]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 107BD3C01858; Thu, 28 Jan 2021 15:21:41 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas1-6b94a3a85f37.qloud-c.yandex.net (mxback/Yandex) with ESMTP id UwkmTbB7k9-LeGGgbRD; Thu, 28 Jan 2021 15:21:40 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836501; bh=G6UTnCkG7lzFro6B/bQoc3MicYbEM3+fJ+jQVroguG0=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=H06xb9+Xo0Nk+5GnCMF9EBQVnDsg1eRCOsnOj8+W3QVPr/Lb2UkkLwFlXcqfTDh70 RQPFje6fvygQSVW8fWy6w59dgPWJ3wukZL1Vc3QVyY/u+NSH/5gmrU1aoXyo3azOFk 0cvSWKs/vV6+zQ/En4tviMqnDol7XHQS2euDgBUQ= Authentication-Results: sas1-6b94a3a85f37.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-Len8wqOO; Thu, 28 Jan 2021 15:21:40 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/7] gpio: ep93xx: Fix typo s/hierarchial/hierarchical Date: Thu, 28 Jan 2021 15:21:21 +0300 Message-Id: <20210128122123.25341-6-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Fix typo in comment. Signed-off-by: Nikita Shubin --- 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 ee1cb3b894db..d69ec09cd618 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -402,7 +402,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, /* * FIXME: convert this to use hierarchical IRQ support! - * this requires fixing the root irqchip to be hierarchial. + * this requires fixing the root irqchip to be hierarchical. */ girq->parent_handler = ep93xx_gpio_f_irq_handler; girq->num_parents = 8; From patchwork Thu Jan 28 12:21:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 1432780 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maquefel.me header.i=@maquefel.me header.a=rsa-sha256 header.s=mail header.b=qzSCQ59N; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DRKR01SpZz9sSC for ; Thu, 28 Jan 2021 23:24:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231778AbhA1MYC (ORCPT ); Thu, 28 Jan 2021 07:24:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231560AbhA1MWv (ORCPT ); Thu, 28 Jan 2021 07:22:51 -0500 Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [IPv6:2a02:6b8:0:801:2::108]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BFB4C061786; Thu, 28 Jan 2021 04:21:44 -0800 (PST) Received: from sas1-44e0060c3838.qloud-c.yandex.net (sas1-44e0060c3838.qloud-c.yandex.net [IPv6:2a02:6b8:c08:f21a:0:640:44e0:60c]) by forward105j.mail.yandex.net (Yandex) with ESMTP id F22A7B2404F; Thu, 28 Jan 2021 15:21:41 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas1-44e0060c3838.qloud-c.yandex.net (mxback/Yandex) with ESMTP id cMRMwpIY5F-LfHiMgu4; Thu, 28 Jan 2021 15:21:41 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836501; bh=gSqzfAVVe2QLlO6bgA/NbmqOwAH97wz2L/kiPuJirpw=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=qzSCQ59NZiMeJvPDmiSQVxoAjN7dthHcfgSqeKJ3V7D60hcWsMqvUa44nFSM+WGWi bcBQR0zzmkbbvWJkEXil1PAXX0NiEcqlOviJdqhBweYS86XCPust3rSuf9jR4Ja6c6 TU1F4NUaFEhj3g/uBsbrrJJyk/CbPYGSQSTwwwq4= Authentication-Results: sas1-44e0060c3838.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-Lfn8Fdfd; Thu, 28 Jan 2021 15:21:41 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/7] gpio: ep93xx: refactor ep93xx_gpio_add_bank Date: Thu, 28 Jan 2021 15:21:22 +0300 Message-Id: <20210128122123.25341-7-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org - replace plain numbers with girq->num_parents in devm_kcalloc - replace plain numbers with girq->num_parents for port F - refactor i - 1 to i + 1 to make loop more readable - combine getting IRQ's loop and setting handler's into single loop Signed-off-by: Nikita Shubin Acked-by: Alexander Sverdlin --- v2->v3 - use ->num_parents instead of ARRAY_SIZE() --- drivers/gpio/gpio-ep93xx.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index d69ec09cd618..df55aa13bd9a 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -384,7 +384,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, girq->parent_handler = ep93xx_gpio_ab_irq_handler; girq->num_parents = 1; - girq->parents = devm_kcalloc(dev, 1, + girq->parents = devm_kcalloc(dev, girq->num_parents, sizeof(*girq->parents), GFP_KERNEL); if (!girq->parents) @@ -406,15 +406,14 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, */ girq->parent_handler = ep93xx_gpio_f_irq_handler; girq->num_parents = 8; - girq->parents = devm_kcalloc(dev, 8, + girq->parents = devm_kcalloc(dev, girq->num_parents, sizeof(*girq->parents), GFP_KERNEL); if (!girq->parents) return -ENOMEM; /* Pick resources 1..8 for these IRQs */ - for (i = 1; i <= 8; i++) - girq->parents[i - 1] = platform_get_irq(pdev, i); - for (i = 0; i < 8; i++) { + for (i = 0; i < girq->num_parents; i++) { + girq->parents[i] = platform_get_irq(pdev, i + 1); gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i; irq_set_chip_data(gpio_irq, &epg->gc[5]); irq_set_chip_and_handler(gpio_irq, From patchwork Thu Jan 28 12:21:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 1432781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maquefel.me header.i=@maquefel.me header.a=rsa-sha256 header.s=mail header.b=AGkP3Lv6; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DRKR130Bgz9sT6 for ; Thu, 28 Jan 2021 23:24:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231782AbhA1MYI (ORCPT ); Thu, 28 Jan 2021 07:24:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231496AbhA1MWv (ORCPT ); Thu, 28 Jan 2021 07:22:51 -0500 Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:109]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97AD2C061788; Thu, 28 Jan 2021 04:21:44 -0800 (PST) Received: from sas1-121c281eae19.qloud-c.yandex.net (sas1-121c281eae19.qloud-c.yandex.net [IPv6:2a02:6b8:c08:cf03:0:640:121c:281e]) by forward106p.mail.yandex.net (Yandex) with ESMTP id D7DB91C81DB1; Thu, 28 Jan 2021 15:21:42 +0300 (MSK) Received: from sas1-27140bb19246.qloud-c.yandex.net (sas1-27140bb19246.qloud-c.yandex.net [2a02:6b8:c08:1803:0:640:2714:bb1]) by sas1-121c281eae19.qloud-c.yandex.net (mxback/Yandex) with ESMTP id QDw1zldknv-LgICE5iY; Thu, 28 Jan 2021 15:21:42 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1611836502; bh=TxePM7yigEWZGALCm3l//RosNPu0MYRdbDRTJyb50So=; h=In-Reply-To:References:Date:Subject:To:From:Message-Id:Cc; b=AGkP3Lv6J+8Sh2s9RHlv3t3oiL7QDQkThKt+VtwXQGobRSfG/YNhmlqe1tF9kH5F5 XWSfwX/hpNpXZVZ6RWdys2P7VOFwOAm3IMFkjzjEcHXHIDWJB3VQexKS+oASxx0PL3 03O2MjrruruIAEHthauQ0LcRh+wJPYVzc+KG50Dg= Authentication-Results: sas1-121c281eae19.qloud-c.yandex.net; dkim=pass header.i=@maquefel.me Received: by sas1-27140bb19246.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id dVFT85naok-Lgn84O12; Thu, 28 Jan 2021 15:21:42 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Nikita Shubin Cc: Andy Shevchenko , Nikita Shubin , Linus Walleij , Bartosz Golaszewski , Alexander Sverdlin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/7] gpiod: ep93xx: refactor base IRQ number Date: Thu, 28 Jan 2021 15:21:23 +0300 Message-Id: <20210128122123.25341-8-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128122123.25341-1-nikita.shubin@maquefel.me> References: <20210128122123.25341-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org - use predefined constants instead of plain numbers - use provided bank IRQ number instead of defined constant for port F Signed-off-by: Nikita Shubin Acked-by: Alexander Sverdlin --- drivers/gpio/gpio-ep93xx.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index df55aa13bd9a..b1501607e8ed 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c @@ -28,6 +28,8 @@ /* Maximum value for irq capable line identifiers */ #define EP93XX_GPIO_LINE_MAX_IRQ 23 +#define EP93XX_GPIO_A_IRQ_BASE 64 +#define EP93XX_GPIO_B_IRQ_BASE 72 /* * Static mapping of GPIO bank F IRQS: * F0..F7 (16..24) to irq 80..87. @@ -311,14 +313,14 @@ struct ep93xx_gpio_bank { static struct ep93xx_gpio_bank ep93xx_gpio_banks[] = { /* Bank A has 8 IRQs */ - EP93XX_GPIO_BANK("A", 0x00, 0x10, 0, true, false, 64), + EP93XX_GPIO_BANK("A", 0x00, 0x10, 0, true, false, EP93XX_GPIO_A_IRQ_BASE), /* Bank B has 8 IRQs */ - EP93XX_GPIO_BANK("B", 0x04, 0x14, 8, true, false, 72), + EP93XX_GPIO_BANK("B", 0x04, 0x14, 8, true, false, EP93XX_GPIO_B_IRQ_BASE), EP93XX_GPIO_BANK("C", 0x08, 0x18, 40, false, false, 0), EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 24, false, false, 0), EP93XX_GPIO_BANK("E", 0x20, 0x24, 32, false, false, 0), /* Bank F has 8 IRQs */ - EP93XX_GPIO_BANK("F", 0x30, 0x34, 16, false, true, 0), + EP93XX_GPIO_BANK("F", 0x30, 0x34, 16, false, true, EP93XX_GPIO_F_IRQ_BASE), EP93XX_GPIO_BANK("G", 0x38, 0x3c, 48, false, false, 0), EP93XX_GPIO_BANK("H", 0x40, 0x44, 56, false, false, 0), }; @@ -414,7 +416,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, /* Pick resources 1..8 for these IRQs */ for (i = 0; i < girq->num_parents; i++) { girq->parents[i] = platform_get_irq(pdev, i + 1); - gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i; + gpio_irq = bank->irq_base + i; irq_set_chip_data(gpio_irq, &epg->gc[5]); irq_set_chip_and_handler(gpio_irq, &ep93xx_gpio_irq_chip, @@ -423,7 +425,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, } girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_level_irq; - girq->first = EP93XX_GPIO_F_IRQ_BASE; + girq->first = bank->irq_base; } return devm_gpiochip_add_data(dev, gc, epg);