lkml.org 
[lkml]   [2024]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v8 33/38] pwm: ep93xx: drop legacy pinctrl
    From: Nikita Shubin <nikita.shubin@maquefel.me>

    Drop legacy gpio request/free since we are using
    pinctrl for this now.

    Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Thierry Reding <thierry.reding@gmail.com>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
    ---
    arch/arm/mach-ep93xx/core.c | 42 ---------------------------------------
    drivers/pwm/pwm-ep93xx.c | 18 -----------------
    include/linux/soc/cirrus/ep93xx.h | 4 ----
    3 files changed, 64 deletions(-)

    diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
    index b99c46d22c4d..4ddf1a4cba33 100644
    --- a/arch/arm/mach-ep93xx/core.c
    +++ b/arch/arm/mach-ep93xx/core.c
    @@ -577,48 +577,6 @@ void __init ep93xx_register_pwm(int pwm0, int pwm1)
    platform_device_register(&ep93xx_pwm1_device);
    }

    -int ep93xx_pwm_acquire_gpio(struct platform_device *pdev)
    -{
    - int err;
    -
    - if (pdev->id == 0) {
    - err = 0;
    - } else if (pdev->id == 1) {
    - err = gpio_request(EP93XX_GPIO_LINE_EGPIO14,
    - dev_name(&pdev->dev));
    - if (err)
    - return err;
    - err = gpio_direction_output(EP93XX_GPIO_LINE_EGPIO14, 0);
    - if (err)
    - goto fail;
    -
    - /* PWM 1 output on EGPIO[14] */
    - ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_PONG);
    - } else {
    - err = -ENODEV;
    - }
    -
    - return err;
    -
    -fail:
    - gpio_free(EP93XX_GPIO_LINE_EGPIO14);
    - return err;
    -}
    -EXPORT_SYMBOL(ep93xx_pwm_acquire_gpio);
    -
    -void ep93xx_pwm_release_gpio(struct platform_device *pdev)
    -{
    - if (pdev->id == 1) {
    - gpio_direction_input(EP93XX_GPIO_LINE_EGPIO14);
    - gpio_free(EP93XX_GPIO_LINE_EGPIO14);
    -
    - /* EGPIO[14] used for GPIO */
    - ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_PONG);
    - }
    -}
    -EXPORT_SYMBOL(ep93xx_pwm_release_gpio);
    -
    -
    /*************************************************************************
    * EP93xx video peripheral handling
    *************************************************************************/
    diff --git a/drivers/pwm/pwm-ep93xx.c b/drivers/pwm/pwm-ep93xx.c
    index 7cf05d0b78fb..0d17dbe10fcf 100644
    --- a/drivers/pwm/pwm-ep93xx.c
    +++ b/drivers/pwm/pwm-ep93xx.c
    @@ -27,8 +27,6 @@

    #include <asm/div64.h>

    -#include <linux/soc/cirrus/ep93xx.h> /* for ep93xx_pwm_{acquire,release}_gpio() */
    -
    #define EP93XX_PWMx_TERM_COUNT 0x00
    #define EP93XX_PWMx_DUTY_CYCLE 0x04
    #define EP93XX_PWMx_ENABLE 0x08
    @@ -45,20 +43,6 @@ static inline struct ep93xx_pwm *to_ep93xx_pwm(struct pwm_chip *chip)
    return container_of(chip, struct ep93xx_pwm, chip);
    }

    -static int ep93xx_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
    -{
    - struct platform_device *pdev = to_platform_device(chip->dev);
    -
    - return ep93xx_pwm_acquire_gpio(pdev);
    -}
    -
    -static void ep93xx_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
    -{
    - struct platform_device *pdev = to_platform_device(chip->dev);
    -
    - ep93xx_pwm_release_gpio(pdev);
    -}
    -
    static int ep93xx_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
    const struct pwm_state *state)
    {
    @@ -157,8 +141,6 @@ static int ep93xx_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
    }

    static const struct pwm_ops ep93xx_pwm_ops = {
    - .request = ep93xx_pwm_request,
    - .free = ep93xx_pwm_free,
    .apply = ep93xx_pwm_apply,
    };

    diff --git a/include/linux/soc/cirrus/ep93xx.h b/include/linux/soc/cirrus/ep93xx.h
    index 8942bfaf1545..f6376edc1b33 100644
    --- a/include/linux/soc/cirrus/ep93xx.h
    +++ b/include/linux/soc/cirrus/ep93xx.h
    @@ -37,8 +37,6 @@ struct ep93xx_regmap_adev {
    container_of((_adev), struct ep93xx_regmap_adev, adev)

    #ifdef CONFIG_ARCH_EP93XX
    -int ep93xx_pwm_acquire_gpio(struct platform_device *pdev);
    -void ep93xx_pwm_release_gpio(struct platform_device *pdev);
    int ep93xx_ide_acquire_gpio(struct platform_device *pdev);
    void ep93xx_ide_release_gpio(struct platform_device *pdev);
    int ep93xx_i2s_acquire(void);
    @@ -46,8 +44,6 @@ void ep93xx_i2s_release(void);
    unsigned int ep93xx_chip_revision(void);

    #else
    -static inline int ep93xx_pwm_acquire_gpio(struct platform_device *pdev) { return 0; }
    -static inline void ep93xx_pwm_release_gpio(struct platform_device *pdev) {}
    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; }
    --
    2.41.0


    \
     
     \ /
      Last update: 2024-05-27 15:21    [W:4.045 / U:25.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site