From nobody Fri Dec 19 00:53:55 2025 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 CC70AC61D9C for ; Wed, 22 Nov 2023 09:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235240AbjKVJDq (ORCPT ); Wed, 22 Nov 2023 04:03:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343577AbjKVJB0 (ORCPT ); Wed, 22 Nov 2023 04:01:26 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF182D56 for ; Wed, 22 Nov 2023 01:01:19 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPS id 27B0EC3278B; Wed, 22 Nov 2023 09:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700643676; bh=sw2MkB18QSeVhQfLFfCWUOcb13oM4tTjmotBekjjwW4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=n2MkGZeeQUojIZXTGLMwqm/qA7eoK0ddvn/nE8DWEl/F3b/ZW4zi4LmsBHUN3bjg2 P9AC49E6+6EDlUKhmSm7+vR2YmR+uWdNIgCbUGFEwecgdAj/Uq7ajhEGCwM0rbKh8E T8YEV/YaswSQV71zqHFcJ2QcgZMIzqkB+89PgxBng31sRVCR0rz0yLimtb+U9QQyUn 62vFNxnDSji6i4eRVFZexXnIpkLUwuSFibWJvFlt/QfwM6a1Yk/UHcob9ufFKyBBYI GMgj2R1SkQfMfbVW8EjvXXcnBf6A51bxeQwnfhyegk2SgbHo47GjfQCvzvMlOATx71 TCLcriQ7PREzQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 162CEC61D9B; Wed, 22 Nov 2023 09:01:16 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Wed, 22 Nov 2023 12:00:13 +0300 Subject: [PATCH v5 35/39] ata: pata_ep93xx: remove legacy pinctrl use MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231122-ep93xx-v5-35-d59a76d5df29@maquefel.me> References: <20231122-ep93xx-v5-0-d59a76d5df29@maquefel.me> In-Reply-To: <20231122-ep93xx-v5-0-d59a76d5df29@maquefel.me> To: Hartley Sweeten , Alexander Sverdlin , Russell King , Sergey Shtylyov , Damien Le Moal , Nikita Shubin , Linus Walleij , Dmitry Torokhov , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Cc: Thierry Reding , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, Alexander Sverdlin X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1700643671; l=5393; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=RZQTZq/2wHCG0HMWpZQNj4TbaOPFYr/Sd1OS95suUDA=; =?utf-8?q?b=3DVtd7hwZSXjkU?= =?utf-8?q?uTkSUpy+fN9LlaYyiqpw3WsEmFoRyeBGKWA9cBrGg9MmYKFN4aILfEEMzarwbGfu?= HYyUv00yAQWUgKZb83+JZZsZLuQZ/UKdAI2BOo/dD0iAQy2JazTz X-Developer-Key: i=nikita.shubin@maquefel.me; a=ed25519; pk=vqf5YIUJ7BJv3EJFaNNxWZgGuMgDH6rwufTLflwU9ac= X-Endpoint-Received: by B4 Relay for nikita.shubin@maquefel.me/20230718 with auth_id=65 X-Original-From: Nikita Shubin Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nikita Shubin Drop legacy acquire/release since we are using pinctrl for this now. Reviewed-by: Sergey Shtylyov Acked-by: Damien Le Moal Reviewed-by: Linus Walleij Signed-off-by: Nikita Shubin Reviewed-by: Andy Shevchenko --- arch/arm/mach-ep93xx/core.c | 72 -----------------------------------= ---- drivers/ata/pata_ep93xx.c | 25 ++++---------- include/linux/soc/cirrus/ep93xx.h | 4 --- 3 files changed, 6 insertions(+), 95 deletions(-) diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 9afc6095d1c1..66dba9b4a6f9 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -778,78 +778,6 @@ void __init ep93xx_register_ide(void) platform_device_register(&ep93xx_ide_device); } =20 -int ep93xx_ide_acquire_gpio(struct platform_device *pdev) -{ - int err; - int i; - - err =3D gpio_request(EP93XX_GPIO_LINE_EGPIO2, dev_name(&pdev->dev)); - if (err) - return err; - err =3D gpio_request(EP93XX_GPIO_LINE_EGPIO15, dev_name(&pdev->dev)); - if (err) - goto fail_egpio15; - for (i =3D 2; i < 8; i++) { - err =3D gpio_request(EP93XX_GPIO_LINE_E(i), dev_name(&pdev->dev)); - if (err) - goto fail_gpio_e; - } - for (i =3D 4; i < 8; i++) { - err =3D gpio_request(EP93XX_GPIO_LINE_G(i), dev_name(&pdev->dev)); - if (err) - goto fail_gpio_g; - } - for (i =3D 0; i < 8; i++) { - err =3D gpio_request(EP93XX_GPIO_LINE_H(i), dev_name(&pdev->dev)); - if (err) - goto fail_gpio_h; - } - - /* GPIO ports E[7:2], G[7:4] and H used by IDE */ - ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_EONIDE | - EP93XX_SYSCON_DEVCFG_GONIDE | - EP93XX_SYSCON_DEVCFG_HONIDE); - return 0; - -fail_gpio_h: - for (--i; i >=3D 0; --i) - gpio_free(EP93XX_GPIO_LINE_H(i)); - i =3D 8; -fail_gpio_g: - for (--i; i >=3D 4; --i) - gpio_free(EP93XX_GPIO_LINE_G(i)); - i =3D 8; -fail_gpio_e: - for (--i; i >=3D 2; --i) - gpio_free(EP93XX_GPIO_LINE_E(i)); - gpio_free(EP93XX_GPIO_LINE_EGPIO15); -fail_egpio15: - gpio_free(EP93XX_GPIO_LINE_EGPIO2); - return err; -} -EXPORT_SYMBOL(ep93xx_ide_acquire_gpio); - -void ep93xx_ide_release_gpio(struct platform_device *pdev) -{ - int i; - - for (i =3D 2; i < 8; i++) - gpio_free(EP93XX_GPIO_LINE_E(i)); - for (i =3D 4; i < 8; i++) - gpio_free(EP93XX_GPIO_LINE_G(i)); - for (i =3D 0; i < 8; i++) - gpio_free(EP93XX_GPIO_LINE_H(i)); - gpio_free(EP93XX_GPIO_LINE_EGPIO15); - gpio_free(EP93XX_GPIO_LINE_EGPIO2); - - - /* GPIO ports E[7:2], G[7:4] and H used by GPIO */ - ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_EONIDE | - EP93XX_SYSCON_DEVCFG_GONIDE | - EP93XX_SYSCON_DEVCFG_HONIDE); -} -EXPORT_SYMBOL(ep93xx_ide_release_gpio); - /************************************************************************* * EP93xx ADC *************************************************************************/ diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index 3f33916c2d23..400c9baa19c2 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -923,28 +923,18 @@ static int ep93xx_pata_probe(struct platform_device *= pdev) void __iomem *ide_base; int err; =20 - err =3D ep93xx_ide_acquire_gpio(pdev); - if (err) - return err; - /* INT[3] (IRQ_EP93XX_EXT3) line connected as pull down */ irq =3D platform_get_irq(pdev, 0); - if (irq < 0) { - err =3D irq; - goto err_rel_gpio; - } + if (irq < 0) + return irq; =20 ide_base =3D devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res); - if (IS_ERR(ide_base)) { - err =3D PTR_ERR(ide_base); - goto err_rel_gpio; - } + if (IS_ERR(ide_base)) + return PTR_ERR(ide_base); =20 drv_data =3D devm_kzalloc(&pdev->dev, sizeof(*drv_data), GFP_KERNEL); - if (!drv_data) { - err =3D -ENOMEM; - goto err_rel_gpio; - } + if (!drv_data) + return -ENOMEM; =20 drv_data->pdev =3D pdev; drv_data->ide_base =3D ide_base; @@ -1003,8 +993,6 @@ static int ep93xx_pata_probe(struct platform_device *p= dev) =20 err_rel_dma: ep93xx_pata_release_dma(drv_data); -err_rel_gpio: - ep93xx_ide_release_gpio(pdev); return err; } =20 @@ -1016,7 +1004,6 @@ static void ep93xx_pata_remove(struct platform_device= *pdev) ata_host_detach(host); ep93xx_pata_release_dma(drv_data); ep93xx_pata_clear_regs(drv_data->ide_base); - ep93xx_ide_release_gpio(pdev); } =20 static const struct of_device_id ep93xx_pata_of_ids[] =3D { diff --git a/include/linux/soc/cirrus/ep93xx.h b/include/linux/soc/cirrus/e= p93xx.h index fc4a2f9d4729..da8bdfc36526 100644 --- a/include/linux/soc/cirrus/ep93xx.h +++ b/include/linux/soc/cirrus/ep93xx.h @@ -37,15 +37,11 @@ struct ep93xx_regmap_adev { container_of((_adev), struct ep93xx_regmap_adev, adev) =20 #ifdef CONFIG_ARCH_EP93XX -int ep93xx_ide_acquire_gpio(struct platform_device *pdev); -void ep93xx_ide_release_gpio(struct platform_device *pdev); int ep93xx_i2s_acquire(void); void ep93xx_i2s_release(void); unsigned int ep93xx_chip_revision(void); =20 #else -static inline int ep93xx_ide_acquire_gpio(struct platform_device *pdev) { = return 0; } -static inline void ep93xx_ide_release_gpio(struct platform_device *pdev) {} static inline int ep93xx_i2s_acquire(void) { return 0; } static inline void ep93xx_i2s_release(void) {} static inline unsigned int ep93xx_chip_revision(void) { return 0; } --=20 2.41.0