From patchwork Fri Oct 6 13:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Duje_Mihanovi=C4=87?= X-Patchwork-Id: 149251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp342127vqo; Fri, 6 Oct 2023 06:46:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmJtDVR+33+1odWTdFqewBHjyUIIh/bCU/sc0JixYqnNHOCuqitD5JBjgBGt2wpcG4gIK8 X-Received: by 2002:a05:6a20:1005:b0:15d:5e1e:184e with SMTP id gs5-20020a056a20100500b0015d5e1e184emr7436893pzc.57.1696599975733; Fri, 06 Oct 2023 06:46:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696599975; cv=none; d=google.com; s=arc-20160816; b=lnr2YbjOO+9yLO7ukJvw9mH2ePetV9HJ7Rdf1O28wppKd+6EtojKXI5uNouQgei2PO AXVXm4ymSBUxYHu3EWbOsEg+JkDJSix44M2bffmphwtjrtu08wOc5gr69xhtP0yTOk2A ca3T3M+BBrB8opnJRVFZ4yS3xTmsskYpqbMHNg0yrZ35brbtAx1LWOH/+wTXdPRWhaqL T2F2bXG8DjwHO4u5aHNgykb1jRKBhlzQXK9D3Y7ksXDplQS1dmETsWRnHHBf0IVJ3jWV EUwDhtuZdA5ArbfN4I2zL2giL4trgOHmGRhgOdYCNPqwwA2iWULS8IdzYTj2TURuP0Rr p8lw== 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=v1ThJlkYhovOw6aEbn+W7j3h+Bh2kdpTbH55h5W9RLg=; fh=1i6b6fQBnaiq0xRa3ncF4yVLO4LQ/VVJhygl9h24PAo=; b=CDuuWfPYRV7XJ7kf6++qYxDCdl0jLUX3cGdCf8lZ5T+4JG1EqjNfLQMTMIOJ6CGLhR hFpcDBM58y5mX8GwY/Yib80CbSlJH7PcmoMgsboq8a7X59/BcdWgvk/zpvh6K4ccDd3j 971x7vOaEjMCc9P+HaMUhmVEV640K4qPgZpXSwoiXLS/t2iLgvmjX030NjQ+41VMmpOl 8XOOULK+bgzXq49CBk/rqDjpGoJuKJ3WtR8tec69IOILZFj01i9D8yn3GJ9DC5VveN5w HPWwQGD6uxiXolBh9DpQANwfSDjOPO94Rf6YJNEO5GihAk2FXzkHx80AWXHBEyZlGD1I wiWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id h22-20020aa786d6000000b006933e5559a3si1411679pfo.310.2023.10.06.06.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 06:46:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id C9E4A8029B49; Fri, 6 Oct 2023 06:46:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232484AbjJFNp1 (ORCPT + 18 others); Fri, 6 Oct 2023 09:45:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232473AbjJFNpR (ORCPT ); Fri, 6 Oct 2023 09:45:17 -0400 Received: from mx.skole.hr (mx2.hosting.skole.hr [161.53.165.186]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A60FAC; Fri, 6 Oct 2023 06:45:15 -0700 (PDT) Received: from mx2.hosting.skole.hr (localhost.localdomain [127.0.0.1]) by mx.skole.hr (mx.skole.hr) with ESMTP id 2E06083F6E; Fri, 6 Oct 2023 15:45:14 +0200 (CEST) From: =?utf-8?q?Duje_Mihanovi=C4=87?= Date: Fri, 06 Oct 2023 15:44:28 +0200 Subject: [PATCH RFT v6 4/6] ARM: pxa: Convert reset driver to GPIO descriptors MIME-Version: 1.0 Message-Id: <20231006-pxa-gpio-v6-4-981b4910d599@skole.hr> References: <20231006-pxa-gpio-v6-0-981b4910d599@skole.hr> In-Reply-To: <20231006-pxa-gpio-v6-0-981b4910d599@skole.hr> To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Alan Stern , Greg Kroah-Hartman , Linus Walleij , Bartosz Golaszewski , Andy Shevchenko , Dmitry Torokhov , Mark Brown Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-gpio@vger.kernel.org, linux-input@vger.kernel.org, linux-spi@vger.kernel.org, =?utf-8?q?Duje_Miha?= =?utf-8?q?novi=C4=87?= , Bartosz Golaszewski X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3701; i=duje.mihanovic@skole.hr; h=from:subject:message-id; bh=RO2FS16ccP9uEgSE5MIe1I+a1oRlIzxtkclTF982Y30=; b=owEBbQKS/ZANAwAIAZoRnrBCLZbhAcsmYgBlIA9dOFfYP80i5cCQEO2634FMtl0J7UbyJqQJb 160ZfaVayyJAjMEAAEIAB0WIQRT351NnD/hEPs2LXiaEZ6wQi2W4QUCZSAPXQAKCRCaEZ6wQi2W 4U4RD/9Fu4Xbkc5jhMwxez0QwhXDRlnBMS/ii5bFd5z8xv9VlbczdUdSHZjlhvntd+DDteI/d63 tThg7WMb2UZ+P3TwjR1g8Gd58lZQ0S6nASfACceHfzt9P89ERhMp4UpCYBbofI0wbKJupnaJGP4 3EraXQjqv6Pechea2UT6wHWiU+909yeC+kpAh/7PzK39hIBvhNjIYilzyQI+b903Y0r9IAcqKRr fFR85oXytHv7gPRG0GKG4Hi2bmJ6sM31gy66JsMZxW3Q98km6MgnlTIWUUoj5BsjytuZ1hhrxb2 Qe/eYfB1pAidQejHAtM3BbVgRtKC/TbDsUOo6GJr2N67asS3as6/v20uMEXKYpdKreYWSBjF2Kw U0bcxT0whn4FQWGzg9S9tOzAoGwmCSHmU57/NEwUIr7EvimizLRMqa0IlXhiKyqFXuZY8gPjYYX EWX2+Linv6UlBW9o58PhXsGjJbJ77bgXn7XMURrnVaOYNxZei6NlErsPKcogqyPlx9+Q7MRHpmP XSwDH282WpsvY7rAv6AvdmZuKBwmncLuhFctpY6/Bs0/08y0tX7/Kj8aZtZtSOtaaRBJrG1YIBG aGIW24N/nJXqn6f7pvSvPiAYsuE6df9I8XWDzsN29R8ih4ByYXfgEXwVulvFd5njIFwFpPfgc7v pMBuVazxRt+0WNw== X-Developer-Key: i=duje.mihanovic@skole.hr; a=openpgp; fpr=53DF9D4D9C3FE110FB362D789A119EB0422D96E1 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Fri, 06 Oct 2023 06:46:12 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779014016280231226 X-GMAIL-MSGID: 1779014016280231226 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. Acked-by: Linus Walleij Reviewed-by: Bartosz Golaszewski 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..08bc104b9411 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; -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", 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 8e9301cd0c93..554a4b9782c5 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -1026,9 +1026,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", 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;