Unverified Commit f0d82f07 authored by Mark Brown's avatar Mark Brown
Browse files

Convert Mediatek ASoC codecs to use GPIO descriptors 

Merge series from Linus Walleij <linus.walleij@linaro.org>:

Convert over the Mediatek codecs to use GPIO descriptors.

One few-liner affects gpiolib-of.h, I don't think there
will be conflicts so I suggest that all of this can be
merged through ASoC after review.
parents fee44f43 3b5d22bd

drivers/gpio/gpiolib-of.c

+4 −0
Original line number Diff line number Diff line
@@ -512,6 +512,10 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np, 
#if IS_ENABLED(CONFIG_SND_SOC_CS42L56)

		{ "reset",	"cirrus,gpio-nreset",	"cirrus,cs42l56" },

#endif

#if IS_ENABLED(CONFIG_SND_SOC_MT2701_CS42448)

		{ "i2s1-in-sel-gpio1",	NULL,	"mediatek,mt2701-cs42448-machine" },

		{ "i2s1-in-sel-gpio2",	NULL,	"mediatek,mt2701-cs42448-machine" },

#endif

#if IS_ENABLED(CONFIG_SND_SOC_TLV320AIC3X)

		{ "reset",	"gpio-reset",	"ti,tlv320aic3x" },

		{ "reset",	"gpio-reset",	"ti,tlv320aic33" },

sound/soc/mediatek/mt2701/mt2701-cs42448.c

+22 −32
Original line number Diff line number Diff line
@@ -10,16 +10,15 @@ 
#include <linux/module.h>

#include <sound/soc.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/pinctrl/consumer.h>

#include <linux/of_gpio.h>



#include "mt2701-afe-common.h"



struct mt2701_cs42448_private {

	int i2s1_in_mux;

	int i2s1_in_mux_gpio_sel_1;

	int i2s1_in_mux_gpio_sel_2;

	struct gpio_desc *i2s1_in_mux_sel_1;

	struct gpio_desc *i2s1_in_mux_sel_2;

};



static const char * const i2sin_mux_switch_text[] = {
@@ -53,20 +52,20 @@ static int mt2701_cs42448_i2sin1_mux_set(struct snd_kcontrol *kcontrol, 


	switch (ucontrol->value.integer.value[0]) {

	case 0:

		gpio_set_value(priv->i2s1_in_mux_gpio_sel_1, 0);

		gpio_set_value(priv->i2s1_in_mux_gpio_sel_2, 0);

		gpiod_set_value(priv->i2s1_in_mux_sel_1, 0);

		gpiod_set_value(priv->i2s1_in_mux_sel_2, 0);

		break;

	case 1:

		gpio_set_value(priv->i2s1_in_mux_gpio_sel_1, 1);

		gpio_set_value(priv->i2s1_in_mux_gpio_sel_2, 0);

		gpiod_set_value(priv->i2s1_in_mux_sel_1, 1);

		gpiod_set_value(priv->i2s1_in_mux_sel_2, 0);

		break;

	case 2:

		gpio_set_value(priv->i2s1_in_mux_gpio_sel_1, 0);

		gpio_set_value(priv->i2s1_in_mux_gpio_sel_2, 1);

		gpiod_set_value(priv->i2s1_in_mux_sel_1, 0);

		gpiod_set_value(priv->i2s1_in_mux_sel_2, 1);

		break;

	case 3:

		gpio_set_value(priv->i2s1_in_mux_gpio_sel_1, 1);

		gpio_set_value(priv->i2s1_in_mux_gpio_sel_2, 1);

		gpiod_set_value(priv->i2s1_in_mux_sel_1, 1);

		gpiod_set_value(priv->i2s1_in_mux_sel_2, 1);

		break;

	default:

		dev_warn(card->dev, "%s invalid setting\n", __func__);
@@ -382,27 +381,18 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
		return ret;

	}



	priv->i2s1_in_mux_gpio_sel_1 =

		of_get_named_gpio(dev->of_node, "i2s1-in-sel-gpio1", 0);

	if (gpio_is_valid(priv->i2s1_in_mux_gpio_sel_1)) {

		ret = devm_gpio_request(dev, priv->i2s1_in_mux_gpio_sel_1,

					"i2s1_in_mux_gpio_sel_1");

		if (ret)

			dev_warn(&pdev->dev, "%s devm_gpio_request fail %d\n",

				 __func__, ret);

		gpio_direction_output(priv->i2s1_in_mux_gpio_sel_1, 0);

	}

	priv->i2s1_in_mux_sel_1 = devm_gpiod_get_optional(dev, "i2s1-in-sel-gpio1",

							  GPIOD_OUT_LOW);

	if (IS_ERR(priv->i2s1_in_mux_sel_1))

		return dev_err_probe(dev, PTR_ERR(priv->i2s1_in_mux_sel_1),

				     "error getting mux 1 selector\n");



	priv->i2s1_in_mux_sel_2 = devm_gpiod_get_optional(dev, "i2s1-in-sel-gpio2",

							  GPIOD_OUT_LOW);

	if (IS_ERR(priv->i2s1_in_mux_sel_2))

		return dev_err_probe(dev, PTR_ERR(priv->i2s1_in_mux_sel_2),

				     "error getting mux 2 selector\n");



	priv->i2s1_in_mux_gpio_sel_2 =

		of_get_named_gpio(dev->of_node, "i2s1-in-sel-gpio2", 0);

	if (gpio_is_valid(priv->i2s1_in_mux_gpio_sel_2)) {

		ret = devm_gpio_request(dev, priv->i2s1_in_mux_gpio_sel_2,

					"i2s1_in_mux_gpio_sel_2");

		if (ret)

			dev_warn(&pdev->dev, "%s devm_gpio_request fail2 %d\n",

				 __func__, ret);

		gpio_direction_output(priv->i2s1_in_mux_gpio_sel_2, 0);

	}

	snd_soc_card_set_drvdata(card, priv);



	ret = devm_snd_soc_register_card(&pdev->dev, card);

sound/soc/mediatek/mt8173/mt8173-max98090.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/module.h>

#include <sound/soc.h>

#include <sound/jack.h>

#include <linux/gpio.h>

#include "../../codecs/max98090.h"



static struct snd_soc_jack mt8173_max98090_jack;

sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
 */



#include <linux/module.h>

#include <linux/gpio.h>

#include <linux/of_gpio.h>

#include <sound/soc.h>

#include <sound/jack.h>

#include "../../codecs/rt5645.h"

sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
 */



#include <linux/module.h>

#include <linux/gpio.h>

#include <linux/of_gpio.h>

#include <sound/soc.h>

#include <sound/jack.h>

#include "../../codecs/rt5645.h"