Commit 9211402f authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown

regulator: arizona-micsupp: Don't use a common regulator name

The Arizona and Madera codecs all have a datasheet name of "MICVDD"
for the regulator output. But future codecs with a regulator that
can be controlled by this driver have different naming convention
for the output of the regulator.

Move the setting of the supply name from arizona_micsupp_common_init()
to arizona_micsupp_probe() and madera_micsupp_probe().
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221109165331.29332-8-rf@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2da34b23
...@@ -262,7 +262,6 @@ static int arizona_micsupp_common_init(struct platform_device *pdev, ...@@ -262,7 +262,6 @@ static int arizona_micsupp_common_init(struct platform_device *pdev,
INIT_WORK(&micsupp->check_cp_work, arizona_micsupp_check_cp); INIT_WORK(&micsupp->check_cp_work, arizona_micsupp_check_cp);
micsupp->init_data.consumer_supplies = &micsupp->supply; micsupp->init_data.consumer_supplies = &micsupp->supply;
micsupp->supply.supply = "MICVDD";
micsupp->supply.dev_name = dev_name(micsupp->dev); micsupp->supply.dev_name = dev_name(micsupp->dev);
micsupp->desc = desc; micsupp->desc = desc;
...@@ -319,6 +318,8 @@ static int arizona_micsupp_probe(struct platform_device *pdev) ...@@ -319,6 +318,8 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
micsupp->dapm = &arizona->dapm; micsupp->dapm = &arizona->dapm;
micsupp->dev = arizona->dev; micsupp->dev = arizona->dev;
micsupp->supply.supply = "MICVDD";
/* /*
* Since the chip usually supplies itself we provide some * Since the chip usually supplies itself we provide some
* default init_data for it. This will be overridden with * default init_data for it. This will be overridden with
...@@ -354,6 +355,8 @@ static int madera_micsupp_probe(struct platform_device *pdev) ...@@ -354,6 +355,8 @@ static int madera_micsupp_probe(struct platform_device *pdev)
micsupp->dev = madera->dev; micsupp->dev = madera->dev;
micsupp->init_data = arizona_micsupp_ext_default; micsupp->init_data = arizona_micsupp_ext_default;
micsupp->supply.supply = "MICVDD";
return arizona_micsupp_common_init(pdev, micsupp, &madera_micsupp, return arizona_micsupp_common_init(pdev, micsupp, &madera_micsupp,
&madera->pdata.micvdd); &madera->pdata.micvdd);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment