Unverified Commit 0776d6a8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: wcd934x: minor fixes" from Srinivas Kandagatla... 

Merge series "ASoC: wcd934x: minor fixes" from Srinivas Kandagatla <srinivas.kandagatla@linaro.org>:

This patchset has 1 fix and a header cleanup found during
recent testing.

Srinivas Kandagatla (2):
  ASoC: wcd934x: fix High Accuracy Buck enable
  ASoC: wcd934x: remove unused headers

 sound/soc/codecs/wcd934x.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

--
2.21.0
parents f9c23615 e0e247d5

sound/soc/codecs/wcd934x.c

+5 −9
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/gpio.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/mfd/wcd934x/registers.h>
@@ -11,10 +10,7 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of_clk.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/regulator/consumer.h>
@@ -1202,11 +1198,6 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src) 
		regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,

				   WCD934X_ANA_RCO_BG_EN_MASK, 0);

		usleep_range(100, 110);

	} else if (sido_src == SIDO_SOURCE_RCO_BG) {

		regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,

				   WCD934X_ANA_RCO_BG_EN_MASK,

				   WCD934X_ANA_RCO_BG_ENABLE);

		usleep_range(100, 110);

		regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,

				   WCD934X_ANA_BUCK_PRE_EN1_MASK,

				   WCD934X_ANA_BUCK_PRE_EN1_ENABLE);
@@ -1219,6 +1210,11 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src) 
				   WCD934X_ANA_BUCK_HI_ACCU_EN_MASK,

				   WCD934X_ANA_BUCK_HI_ACCU_ENABLE);

		usleep_range(100, 110);

	} else if (sido_src == SIDO_SOURCE_RCO_BG) {

		regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,

				   WCD934X_ANA_RCO_BG_EN_MASK,

				   WCD934X_ANA_RCO_BG_ENABLE);

		usleep_range(100, 110);

	}

	wcd->sido_input_src = sido_src;

CRA Git | Maintained and supported by SUSTech CRA and CCSE