AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-16 08:37:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: cs4271: claim reset GPIO in bus probe function

Browse Source 
Move the GPIO acquisition from the codec to the bus probe functions.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Daniel Mack 2014-02-19 14:05:54 +01:00 committed by Mark Brown
parent b224e9b857
commit d6cf89ee07
1 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
sound/soc/codecs/cs4271.c
View File

@ -539,14 +539,10 @@ static int cs4271_probe(struct snd_soc_codec *codec)
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; struct cs4271_platform_data *cs4271plat = codec->dev->platform_data;
int ret; int ret;
int gpio_nreset = -EINVAL;
bool amutec_eq_bmutec = false; bool amutec_eq_bmutec = false;
#ifdef CONFIG_OF #ifdef CONFIG_OF
if (of_match_device(cs4271_dt_ids, codec->dev)) { if (of_match_device(cs4271_dt_ids, codec->dev)) {
gpio_nreset = of_get_named_gpio(codec->dev->of_node,
"reset-gpio", 0);
if (of_get_property(codec->dev->of_node, if (of_get_property(codec->dev->of_node,
"cirrus,amutec-eq-bmutec", NULL)) "cirrus,amutec-eq-bmutec", NULL))
amutec_eq_bmutec = true; amutec_eq_bmutec = true;
@ -558,27 +554,19 @@ static int cs4271_probe(struct snd_soc_codec *codec)
#endif #endif
if (cs4271plat) { if (cs4271plat) {
if (gpio_is_valid(cs4271plat->gpio_nreset))
gpio_nreset = cs4271plat->gpio_nreset;
amutec_eq_bmutec = cs4271plat->amutec_eq_bmutec; amutec_eq_bmutec = cs4271plat->amutec_eq_bmutec;
cs4271->enable_soft_reset = cs4271plat->enable_soft_reset; cs4271->enable_soft_reset = cs4271plat->enable_soft_reset;
} }
if (gpio_nreset >= 0) if (gpio_is_valid(cs4271->gpio_nreset)) {
if (devm_gpio_request(codec->dev, gpio_nreset, "CS4271 Reset"))
gpio_nreset = -EINVAL;
if (gpio_nreset >= 0) {
/* Reset codec */ /* Reset codec */
gpio_direction_output(gpio_nreset, 0); gpio_direction_output(cs4271->gpio_nreset, 0);
udelay(1); udelay(1);
gpio_set_value(gpio_nreset, 1); gpio_set_value(cs4271->gpio_nreset, 1);
/* Give the codec time to wake up */ /* Give the codec time to wake up */
udelay(1); udelay(1);
} }
cs4271->gpio_nreset = gpio_nreset;
ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
CS4271_MODE2_PDN | CS4271_MODE2_CPEN, CS4271_MODE2_PDN | CS4271_MODE2_CPEN,
CS4271_MODE2_PDN | CS4271_MODE2_CPEN); CS4271_MODE2_PDN | CS4271_MODE2_CPEN);
@ -640,13 +628,44 @@ static const struct regmap_config cs4271_spi_regmap = {
.volatile_reg = cs4271_volatile_reg, .volatile_reg = cs4271_volatile_reg,
}; };
static int cs4271_common_probe(struct device *dev,
struct cs4271_private **c)
{
struct cs4271_platform_data *cs4271plat = dev->platform_data;
struct cs4271_private *cs4271;
cs4271 = devm_kzalloc(dev, sizeof(*cs4271), GFP_KERNEL);
if (!cs4271)
return -ENOMEM;
if (of_match_device(cs4271_dt_ids, dev))
cs4271->gpio_nreset =
of_get_named_gpio(dev->of_node, "reset-gpio", 0);
if (cs4271plat)
cs4271->gpio_nreset = cs4271plat->gpio_nreset;
if (gpio_is_valid(cs4271->gpio_nreset)) {
int ret;
ret = devm_gpio_request(dev, cs4271->gpio_nreset,
"CS4271 Reset");
if (ret < 0)
return ret;
}
*c = cs4271;
return 0;
}
static int cs4271_spi_probe(struct spi_device *spi) static int cs4271_spi_probe(struct spi_device *spi)
{ {
struct cs4271_private *cs4271; struct cs4271_private *cs4271;
int ret;
cs4271 = devm_kzalloc(&spi->dev, sizeof(*cs4271), GFP_KERNEL); ret = cs4271_common_probe(&spi->dev, &cs4271);
if (!cs4271) if (ret < 0)
return -ENOMEM; return ret;
spi_set_drvdata(spi, cs4271); spi_set_drvdata(spi, cs4271);
cs4271->regmap = devm_regmap_init_spi(spi, &cs4271_spi_regmap); cs4271->regmap = devm_regmap_init_spi(spi, &cs4271_spi_regmap);
@ -697,10 +716,11 @@ static int cs4271_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct cs4271_private *cs4271; struct cs4271_private *cs4271;
int ret;
cs4271 = devm_kzalloc(&client->dev, sizeof(*cs4271), GFP_KERNEL); ret = cs4271_common_probe(&client->dev, &cs4271);
if (!cs4271) if (ret < 0)
return -ENOMEM; return ret;
i2c_set_clientdata(client, cs4271); i2c_set_clientdata(client, cs4271);
cs4271->regmap = devm_regmap_init_i2c(client, &cs4271_i2c_regmap); cs4271->regmap = devm_regmap_init_i2c(client, &cs4271_i2c_regmap);