Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp1981370rdh; Tue, 26 Sep 2023 08:54:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEiY7dLEsbbccr0ekdlR9LsotlzOXyihjyj37bQU8TBtYnvfsHeEi4Pwy7GyhhpioYxiiO3 X-Received: by 2002:a17:90a:8b91:b0:268:557e:1848 with SMTP id z17-20020a17090a8b9100b00268557e1848mr7519692pjn.2.1695743643063; Tue, 26 Sep 2023 08:54:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695743643; cv=none; d=google.com; s=arc-20160816; b=kvsHiSn/Xqx5AjUzOonzgQrKJNQ47Y6Hh79T/Z5uMCnArieS4i+tpA9iX4WL0zKfEP GsFskxQxvungR+ufpjzoArzViBIKuynLZ8gVwypWKDwzE8RM6v8TDnnpLKZLCqV85baM cbtLHhFwO1GaIgWvCWn+Mlf6Wfp+OGvKq3qPOyHHFpkCNJNt3cSrqNnkQmk5+dmWczcf NEhDOSjB4HGNBxmP4ykV2JXnPJqSg1j0yqKPzuPWgPw7IEeWa4YBweE+nIQguIpXgyOk WM3vEAvbKieyIYHeNewe/bYDSB+v/fDFAMRJEBeAgi85aqu+shzKI/zNes1Swk/Fn3z9 wkqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=DzFTJp2r1kq5KRO68u1AOqFbA+D3yujyYlhjaIp9kAE=; fh=UU0GqEaQ9Xnukct86UJbX2/ZB3UfIgAdTfbf6iYszSw=; b=NDKd03ApIb6GMU/XJgNVzZsNxm53jdLX53hAZN23d4/OXYCds53n04Nd3YKe7/yne0 +SgE6YN3cynfcpBEEWn0mz8kkV4XofJmuOP3X9Gc4rFH/jbqitFVBR26NjIxvpJyYrhG k/xOgxG3+z9iJ5f2vLpezjj4blR4TIMx2H75IUibhKPRgdVNS7UCV6LXuqjYu1OOkTz1 w7Pw34Hc93Py47v9KZpOqwBn2cB07oFNg/dWEoxpDA0njXMQuukpvpm3VmvDxkCHmzR+ 0dy+TFnSb1eUgp/gM6TJbgJyQvi+dCJbvHLaU4b2JQhC1wN7jtO0znpodpqt0No6KRRC UiLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id mp18-20020a17090b191200b00277816efefasi1473070pjb.106.2023.09.26.08.54.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 08:54:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5AB1B8028A7B; Tue, 26 Sep 2023 08:46:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235098AbjIZPqy (ORCPT + 99 others); Tue, 26 Sep 2023 11:46:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229807AbjIZPqx (ORCPT ); Tue, 26 Sep 2023 11:46:53 -0400 Received: from mx.skole.hr (mx2.hosting.skole.hr [161.53.165.186]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A624FEB; Tue, 26 Sep 2023 08:46:46 -0700 (PDT) Received: from mx2.hosting.skole.hr (localhost.localdomain [127.0.0.1]) by mx.skole.hr (mx.skole.hr) with ESMTP id 792648369A; Tue, 26 Sep 2023 17:46:35 +0200 (CEST) From: =?utf-8?q?Duje_Mihanovi=C4=87?= Date: Tue, 26 Sep 2023 17:46:25 +0200 Subject: [PATCH RFC v2 4/6] ARM: pxa: Convert reset driver to GPIO descriptors MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20230926-pxa-gpio-v2-4-984464d165dd@skole.hr> References: <20230926-pxa-gpio-v2-0-984464d165dd@skole.hr> In-Reply-To: <20230926-pxa-gpio-v2-0-984464d165dd@skole.hr> To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Alan Stern , Greg Kroah-Hartman , Linus Walleij , Bartosz Golaszewski , Andy Shevchenko Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-gpio@vger.kernel.org, =?utf-8?q?Duje_Mihanovi=C4=87?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3609; i=duje.mihanovic@skole.hr; h=from:subject:message-id; bh=AHxB1OpKYRVa4xCGIARryQkz4h6Z/eDJMO/mv2k3OZ4=; b=owEBbQKS/ZANAwAIAZoRnrBCLZbhAcsmYgBlEvzWugFrB9Kmuw2EXyDUX+5J0fCtKGeWNbwrK yhkhbWRbbeJAjMEAAEIAB0WIQRT351NnD/hEPs2LXiaEZ6wQi2W4QUCZRL81gAKCRCaEZ6wQi2W 4ZIGD/9xGXp2+i77FgWrIAnEBuV5D7waxV2SRys2Wd+2gaWNjopdSV19fiXlAbTJs/UjxWlglUI tHMutzwABC/prGL/EgSDTUJZCaGAeX/q65mpqB9HXTmEJ3RjvSTbyzeJ6ijvFShHNP4t+eJ6I+y okcrEWlmO/FHVU6GCemaDpkVJq1On7bqfichD5ZUfqV2MhzbixPGWbww7sBXkDn27LPokR2osmY HaTFQuFS1RfbPn7tjVLATZWT1sDhXMH2+TaBp1hE1XJdJgPnR5ytNz0XXdvLLNWeL0bkUFgSMhX /9Z29jfTOy2IkJbGsFtTYexL+ZThMr9wn44RESUTwAsK4SP/9GnVcy5XD8Sv1wvXsEH1oEidcAn ATb9RM1zOARe8fUxaWkzBEFBvPajb8y2JeN8ry1MZb0TVAHFzsXjkoTdVWqJgPjvVENTpsbJTIV CZqUKi8pj7Kv03pVEb3dAyE3hS3jkapsK2qMQV/RD2NXjAajC0tvtkiI7KEpcNyHtUYgkuL8eLs g65eoa+1q9SCely42M15FEU2uaeuIc/zbTSRbB2ksWZGe6AUsZF9sjYCdea+z8d1G48FUBzrnaV taUfpTEgtMAe/iirDKfkVsdY8RcFX/PwhniZH5jpHKhuzEqtkXlFR7uruUieM1NU+1cAwMyNYxO DvORHCX3/s+nQLw== X-Developer-Key: i=duje.mihanovic@skole.hr; a=openpgp; fpr=53DF9D4D9C3FE110FB362D789A119EB0422D96E1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 26 Sep 2023 08:46:56 -0700 (PDT) The PXA reset driver still uses the legacy GPIO interface for configuring and asserting the reset pin. Convert it to use the GPIO descriptor interface. Signed-off-by: Duje Mihanović --- arch/arm/mach-pxa/reset.c | 39 +++++++++++++-------------------------- arch/arm/mach-pxa/reset.h | 3 +-- arch/arm/mach-pxa/spitz.c | 6 +++++- 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index 27293549f8ad..dfcd6c45398d 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -14,33 +14,20 @@ static void do_hw_reset(void); -static int reset_gpio = -1; +static struct gpio_desc *reset_gpio = NULL; -int init_gpio_reset(int gpio, int output, int level) +int init_gpio_reset(int output, int level) { - int rc; - - rc = gpio_request(gpio, "reset generator"); - if (rc) { - printk(KERN_ERR "Can't request reset_gpio\n"); - goto out; + reset_gpio = gpiod_get(NULL, "reset generator", GPIOD_ASIS); + if (IS_ERR(reset_gpio)) { + pr_err("Can't request reset_gpio: %pe\n", reset_gpio); + return PTR_ERR(reset_gpio); } if (output) - rc = gpio_direction_output(gpio, level); + return gpiod_direction_output(reset_gpio, level); else - rc = gpio_direction_input(gpio); - if (rc) { - printk(KERN_ERR "Can't configure reset_gpio\n"); - gpio_free(gpio); - goto out; - } - -out: - if (!rc) - reset_gpio = gpio; - - return rc; + return gpiod_direction_input(reset_gpio); } /* @@ -50,16 +37,16 @@ int init_gpio_reset(int gpio, int output, int level) */ static void do_gpio_reset(void) { - BUG_ON(reset_gpio == -1); + BUG_ON(IS_ERR(reset_gpio)); /* drive it low */ - gpio_direction_output(reset_gpio, 0); + gpiod_direction_output(reset_gpio, 0); mdelay(2); /* rising edge or drive high */ - gpio_set_value(reset_gpio, 1); + gpiod_set_value(reset_gpio, 1); mdelay(2); /* falling edge */ - gpio_set_value(reset_gpio, 0); + gpiod_set_value(reset_gpio, 0); /* give it some time */ mdelay(10); diff --git a/arch/arm/mach-pxa/reset.h b/arch/arm/mach-pxa/reset.h index 963dd190bc13..5864f61a0e94 100644 --- a/arch/arm/mach-pxa/reset.h +++ b/arch/arm/mach-pxa/reset.h @@ -13,10 +13,9 @@ extern void pxa_register_wdt(unsigned int reset_status); /** * init_gpio_reset() - register GPIO as reset generator - * @gpio: gpio nr * @output: set gpio as output instead of input during normal work * @level: output level */ -extern int init_gpio_reset(int gpio, int output, int level); +extern int init_gpio_reset(int output, int level); #endif /* __ASM_ARCH_RESET_H */ diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 616305978727..94bcb187713b 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -1024,9 +1024,13 @@ static void spitz_restart(enum reboot_mode mode, const char *cmd) spitz_poweroff(); } +GPIO_LOOKUP_SINGLE(spitz_reset_gpio_table, NULL, "pxa-gpio", + SPITZ_GPIO_ON_RESET, "reset generator", GPIO_ACTIVE_HIGH); + static void __init spitz_init(void) { - init_gpio_reset(SPITZ_GPIO_ON_RESET, 1, 0); + gpiod_add_lookup_table(&spitz_reset_gpio_table); + init_gpio_reset(1, 0); pm_power_off = spitz_poweroff; PMCR = 0x00; -- 2.42.0