Unverified Commit 44cb08fd authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Convert remaining Realtek codecs to GPIO 

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

After dropping unused headers a few Realtek devices
actually using the GPIO descriptors remain.

Converting them to use optional GPIO descriptors is
pretty straight-forward.
parents b41efc22 8793bee7

include/sound/rt5665.h

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ struct rt5665_platform_data { 
	bool in3_diff;

	bool in4_diff;



	int ldo1_en; /* GPIO for LDO1_EN */



	enum rt5665_dmic1_data_pin dmic1_data_pin;

	enum rt5665_dmic2_data_pin dmic2_data_pin;

	enum rt5665_jd_src jd_src;

include/sound/rt5668.h

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ enum rt5668_jd_src { 
};



struct rt5668_platform_data {



	int ldo1_en; /* GPIO for LDO1_EN */



	enum rt5668_dmic1_data_pin dmic1_data_pin;

	enum rt5668_dmic1_clk_pin dmic1_clk_pin;

	enum rt5668_jd_src jd_src;

include/sound/rt5682.h

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ enum rt5682_dai_clks { 
};



struct rt5682_platform_data {



	int ldo1_en; /* GPIO for LDO1_EN */



	enum rt5682_dmic1_data_pin dmic1_data_pin;

	enum rt5682_dmic1_clk_pin dmic1_clk_pin;

	enum rt5682_jd_src jd_src;

include/sound/rt5682s.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ enum rt5682s_dai_clks { 
};



struct rt5682s_platform_data {



	int ldo1_en; /* GPIO for LDO1_EN */



	enum rt5682s_dmic1_data_pin dmic1_data_pin;

	enum rt5682s_dmic1_clk_pin dmic1_clk_pin;

	enum rt5682s_jd_src jd_src;

sound/soc/codecs/rt5640.c

+15 −40
Original line number Diff line number Diff line
@@ -12,11 +12,10 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/i2c.h>

#include <linux/regmap.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/platform_device.h>

#include <linux/spi/spi.h>

#include <linux/acpi.h>
@@ -2812,8 +2811,8 @@ static int rt5640_suspend(struct snd_soc_component *component) 
	rt5640_reset(component);

	regcache_cache_only(rt5640->regmap, true);

	regcache_mark_dirty(rt5640->regmap);

	if (gpio_is_valid(rt5640->ldo1_en))

		gpio_set_value_cansleep(rt5640->ldo1_en, 0);

	if (rt5640->ldo1_en)

		gpiod_set_value_cansleep(rt5640->ldo1_en, 0);



	return 0;

}
@@ -2822,8 +2821,8 @@ static int rt5640_resume(struct snd_soc_component *component) 
{

	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);



	if (gpio_is_valid(rt5640->ldo1_en)) {

		gpio_set_value_cansleep(rt5640->ldo1_en, 1);

	if (rt5640->ldo1_en) {

		gpiod_set_value_cansleep(rt5640->ldo1_en, 1);

		msleep(400);

	}
@@ -2986,22 +2985,6 @@ static const struct acpi_device_id rt5640_acpi_match[] = { 
MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match);

#endif



static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np)

{

	rt5640->ldo1_en = of_get_named_gpio(np, "realtek,ldo1-en-gpios", 0);

	/*

	 * LDO1_EN is optional (it may be statically tied on the board).

	 * -ENOENT means that the property doesn't exist, i.e. there is no

	 * GPIO, so is not an error. Any other error code means the property

	 * exists, but could not be parsed.

	 */

	if (!gpio_is_valid(rt5640->ldo1_en) &&

			(rt5640->ldo1_en != -ENOENT))

		return rt5640->ldo1_en;



	return 0;

}



static int rt5640_i2c_probe(struct i2c_client *i2c)

{

	struct rt5640_priv *rt5640;
@@ -3015,12 +2998,16 @@ static int rt5640_i2c_probe(struct i2c_client *i2c) 
		return -ENOMEM;

	i2c_set_clientdata(i2c, rt5640);



	if (i2c->dev.of_node) {

		ret = rt5640_parse_dt(rt5640, i2c->dev.of_node);

		if (ret)

			return ret;

	} else

		rt5640->ldo1_en = -EINVAL;

	rt5640->ldo1_en = devm_gpiod_get_optional(&i2c->dev,

						  "realtek,ldo1-en",

						  GPIOD_OUT_HIGH);

	if (IS_ERR(rt5640->ldo1_en))

		return PTR_ERR(rt5640->ldo1_en);



	if (rt5640->ldo1_en) {

		gpiod_set_consumer_name(rt5640->ldo1_en, "RT5640 LDO1_EN");

		msleep(400);

	}



	rt5640->regmap = devm_regmap_init_i2c(i2c, &rt5640_regmap);

	if (IS_ERR(rt5640->regmap)) {
@@ -3030,18 +3017,6 @@ static int rt5640_i2c_probe(struct i2c_client *i2c) 
		return ret;

	}



	if (gpio_is_valid(rt5640->ldo1_en)) {

		ret = devm_gpio_request_one(&i2c->dev, rt5640->ldo1_en,

					    GPIOF_OUT_INIT_HIGH,

					    "RT5640 LDO1_EN");

		if (ret < 0) {

			dev_err(&i2c->dev, "Failed to request LDO1_EN %d: %d\n",

				rt5640->ldo1_en, ret);

			return ret;

		}

		msleep(400);

	}



	regmap_read(rt5640->regmap, RT5640_VENDOR_ID2, &val);

	if (val != RT5640_DEVICE_ID) {

		dev_err(&i2c->dev,