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

ASoC: codecs: wcd93xx: Few regulator supplies fixes 

Merge series from Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>:

Fix cleanup paths in wcd9335 and wcd937x codec drivers.
parents e3de7984 63fe2986

sound/soc/codecs/wcd9335.c

+7 −18
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ struct wcd9335_codec { 


	int intr1;

	struct gpio_desc *reset_gpio;

	struct regulator_bulk_data supplies[WCD9335_MAX_SUPPLY];



	unsigned int rx_port_value[WCD9335_RX_MAX];

	unsigned int tx_port_value[WCD9335_TX_MAX];
@@ -355,6 +354,10 @@ struct wcd9335_irq { 
	char *name;

};



static const char * const wcd9335_supplies[] = {

	"vdd-buck", "vdd-buck-sido", "vdd-tx", "vdd-rx", "vdd-io",

};



static const struct wcd9335_slim_ch wcd9335_tx_chs[WCD9335_TX_MAX] = {

	WCD9335_SLIM_TX_CH(0),

	WCD9335_SLIM_TX_CH(1),
@@ -4989,30 +4992,16 @@ static int wcd9335_parse_dt(struct wcd9335_codec *wcd) 
	if (IS_ERR(wcd->native_clk))

		return dev_err_probe(dev, PTR_ERR(wcd->native_clk), "slimbus clock not found\n");



	wcd->supplies[0].supply = "vdd-buck";

	wcd->supplies[1].supply = "vdd-buck-sido";

	wcd->supplies[2].supply = "vdd-tx";

	wcd->supplies[3].supply = "vdd-rx";

	wcd->supplies[4].supply = "vdd-io";



	ret = regulator_bulk_get(dev, WCD9335_MAX_SUPPLY, wcd->supplies);

	ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(wcd9335_supplies),

					     wcd9335_supplies);

	if (ret)

		return dev_err_probe(dev, ret, "Failed to get supplies\n");

		return dev_err_probe(dev, ret, "Failed to get and enable supplies\n");



	return 0;

}



static int wcd9335_power_on_reset(struct wcd9335_codec *wcd)

{

	struct device *dev = wcd->dev;

	int ret;



	ret = regulator_bulk_enable(WCD9335_MAX_SUPPLY, wcd->supplies);

	if (ret) {

		dev_err(dev, "Failed to get supplies: err = %d\n", ret);

		return ret;

	}



	/*

	 * For WCD9335, it takes about 600us for the Vout_A and

	 * Vout_D to be ready after BUCK_SIDO is powered up.

sound/soc/codecs/wcd937x.c

+1 −6
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ struct wcd937x_priv { 
	struct regmap_irq_chip *wcd_regmap_irq_chip;

	struct regmap_irq_chip_data *irq_chip;

	struct regulator_bulk_data supplies[WCD937X_MAX_BULK_SUPPLY];

	struct regulator *buck_supply;

	struct snd_soc_jack *jack;

	unsigned long status_mask;

	s32 micb_ref[WCD937X_MAX_MICBIAS];
@@ -2945,10 +2944,8 @@ static int wcd937x_probe(struct platform_device *pdev) 
		return dev_err_probe(dev, ret, "Failed to get supplies\n");



	ret = regulator_bulk_enable(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);

	if (ret) {

		regulator_bulk_free(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);

	if (ret)

		return dev_err_probe(dev, ret, "Failed to enable supplies\n");

	}



	wcd937x_dt_parse_micbias_info(dev, wcd937x);
@@ -2984,7 +2981,6 @@ static int wcd937x_probe(struct platform_device *pdev) 


err_disable_regulators:

	regulator_bulk_disable(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);

	regulator_bulk_free(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);



	return ret;

}
@@ -3001,7 +2997,6 @@ static void wcd937x_remove(struct platform_device *pdev) 
	pm_runtime_dont_use_autosuspend(dev);



	regulator_bulk_disable(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);

	regulator_bulk_free(WCD937X_MAX_BULK_SUPPLY, wcd937x->supplies);

}



#if defined(CONFIG_OF)