lkml.org 
[lkml]   [2022]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/11] ASoC: ak5386: switch to using gpiod API
    Date
    Switch the driver from legacy gpio API that is deprecated to the newer
    gpiod API that respects line polarities described in ACPI/DT.

    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    ---
    sound/soc/codecs/ak5386.c | 30 ++++++++++++++----------------
    1 file changed, 14 insertions(+), 16 deletions(-)

    diff --git a/sound/soc/codecs/ak5386.c b/sound/soc/codecs/ak5386.c
    index 0c5e00679c7d..0562890b5dc7 100644
    --- a/sound/soc/codecs/ak5386.c
    +++ b/sound/soc/codecs/ak5386.c
    @@ -6,11 +6,12 @@
    * (c) 2013 Daniel Mack <zonque@gmail.com>
    */

    +
    +#include <linux/err.h>
    +#include <linux/gpio/consumer.h>
    #include <linux/module.h>
    #include <linux/slab.h>
    #include <linux/of.h>
    -#include <linux/of_gpio.h>
    -#include <linux/of_device.h>
    #include <linux/regulator/consumer.h>
    #include <sound/soc.h>
    #include <sound/pcm.h>
    @@ -21,7 +22,7 @@ static const char * const supply_names[] = {
    };

    struct ak5386_priv {
    - int reset_gpio;
    + struct gpio_desc *reset_gpio;
    struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)];
    };

    @@ -111,8 +112,8 @@ static int ak5386_hw_params(struct snd_pcm_substream *substream,
    * the AK5386 in power-down mode (PDN pin = “L”).
    */

    - if (gpio_is_valid(priv->reset_gpio))
    - gpio_set_value(priv->reset_gpio, 1);
    + if (priv->reset_gpio)
    + gpiod_set_value(priv->reset_gpio, 0);

    return 0;
    }
    @@ -123,8 +124,8 @@ static int ak5386_hw_free(struct snd_pcm_substream *substream,
    struct snd_soc_component *component = dai->component;
    struct ak5386_priv *priv = snd_soc_component_get_drvdata(component);

    - if (gpio_is_valid(priv->reset_gpio))
    - gpio_set_value(priv->reset_gpio, 0);
    + if (priv->reset_gpio)
    + gpiod_set_value(priv->reset_gpio, 1);

    return 0;
    }
    @@ -168,7 +169,6 @@ static int ak5386_probe(struct platform_device *pdev)
    if (!priv)
    return -ENOMEM;

    - priv->reset_gpio = -EINVAL;
    dev_set_drvdata(dev, priv);

    for (i = 0; i < ARRAY_SIZE(supply_names); i++)
    @@ -179,15 +179,13 @@ static int ak5386_probe(struct platform_device *pdev)
    if (ret < 0)
    return ret;

    - if (of_match_device(of_match_ptr(ak5386_dt_ids), dev))
    - priv->reset_gpio = of_get_named_gpio(dev->of_node,
    - "reset-gpio", 0);
    + priv->reset_gpio = devm_gpiod_get_optional(dev, "reset",
    + GPIOD_OUT_HIGH);
    + ret = PTR_ERR_OR_ZERO(priv->reset_gpio);
    + if (ret)
    + return ret;

    - if (gpio_is_valid(priv->reset_gpio))
    - if (devm_gpio_request_one(dev, priv->reset_gpio,
    - GPIOF_OUT_INIT_LOW,
    - "AK5386 Reset"))
    - priv->reset_gpio = -EINVAL;
    + gpiod_set_consumer_name(priv->reset_gpio, "AK5386 Reset");

    return devm_snd_soc_register_component(dev, &soc_component_ak5386,
    &ak5386_dai, 1);
    --
    2.38.1.431.g37b22c650d-goog
    \
     
     \ /
      Last update: 2022-11-16 06:38    [W:2.663 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site