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

ASoC: codecs: wcd family: cleanups 

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

Set of simple cleanups from similar issues in all Qualcomm WCD93xx
codecs.

The first patch "ASoC: codecs: wcd-mbhc: Constify passed MBHC reg
fields" is a requirement for few others, but except this they are
independent.
parents 8ae105be 34935cd4

sound/soc/codecs/wcd-mbhc-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct wcd_mbhc { 
	struct wcd_mbhc_config *cfg;

	const struct wcd_mbhc_cb *mbhc_cb;

	const struct wcd_mbhc_intr *intr_ids;

	struct wcd_mbhc_field *fields;

	const struct wcd_mbhc_field *fields;

	/* Delayed work to report long button press */

	struct delayed_work mbhc_btn_dwork;

	/* Work to handle plug report */
@@ -1505,7 +1505,7 @@ EXPORT_SYMBOL(wcd_dt_parse_mbhc_data); 
struct wcd_mbhc *wcd_mbhc_init(struct snd_soc_component *component,

			       const struct wcd_mbhc_cb *mbhc_cb,

			       const struct wcd_mbhc_intr *intr_ids,

			       struct wcd_mbhc_field *fields,

			       const struct wcd_mbhc_field *fields,

			       bool impedance_det_en)

{

	struct device *dev = component->dev;

sound/soc/codecs/wcd-mbhc-v2.h

+2 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ int wcd_mbhc_typec_report_unplug(struct wcd_mbhc *mbhc); 
struct wcd_mbhc *wcd_mbhc_init(struct snd_soc_component *component,

		      const struct wcd_mbhc_cb *mbhc_cb,

		      const struct wcd_mbhc_intr *mbhc_cdc_intr_ids,

		      struct wcd_mbhc_field *fields,

		      const struct wcd_mbhc_field *fields,

		      bool impedance_det_en);

int wcd_mbhc_get_impedance(struct wcd_mbhc *mbhc, uint32_t *zl,

			   uint32_t *zr);
@@ -300,7 +300,7 @@ static inline void wcd_mbhc_stop(struct wcd_mbhc *mbhc) 
static inline struct wcd_mbhc *wcd_mbhc_init(struct snd_soc_component *component,

		      const struct wcd_mbhc_cb *mbhc_cb,

		      const struct wcd_mbhc_intr *mbhc_cdc_intr_ids,

		      struct wcd_mbhc_field *fields,

		      const struct wcd_mbhc_field *fields,

		      bool impedance_det_en)

{

	return ERR_PTR(-ENOTSUPP);

sound/soc/codecs/wcd9335.c

+17 −81
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ struct wcd9335_codec { 
	struct clk *mclk;

	struct clk *native_clk;

	u32 mclk_rate;

	u8 version;



	struct slim_device *slim;

	struct slim_device *slim_ifc_dev;
@@ -345,10 +344,6 @@ struct wcd9335_codec { 
	int dmic_0_1_clk_cnt;

	int dmic_2_3_clk_cnt;

	int dmic_4_5_clk_cnt;

	int dmic_sample_rate;

	int mad_dmic_sample_rate;



	int native_clk_users;

};



struct wcd9335_irq {
@@ -397,13 +392,13 @@ struct interp_sample_rate { 
	int rate_val;

};



static struct interp_sample_rate int_mix_rate_val[] = {

static const struct interp_sample_rate int_mix_rate_val[] = {

	{48000, 0x4},	/* 48K */

	{96000, 0x5},	/* 96K */

	{192000, 0x6},	/* 192K */

};



static struct interp_sample_rate int_prim_rate_val[] = {

static const struct interp_sample_rate int_prim_rate_val[] = {

	{8000, 0x0},	/* 8K */

	{16000, 0x1},	/* 16K */

	{24000, -EINVAL},/* 24K */
@@ -2847,56 +2842,15 @@ static int wcd9335_codec_enable_dec(struct snd_soc_dapm_widget *w, 
}



static u8 wcd9335_get_dmic_clk_val(struct snd_soc_component *component,

				 u32 mclk_rate, u32 dmic_clk_rate)

				 u32 mclk_rate)

{

	u32 div_factor;

	u8 dmic_ctl_val;



	dev_err(component->dev,

		"%s: mclk_rate = %d, dmic_sample_rate = %d\n",

		__func__, mclk_rate, dmic_clk_rate);



	/* Default value to return in case of error */

	if (mclk_rate == WCD9335_MCLK_CLK_9P6MHZ)

		dmic_ctl_val = WCD9335_DMIC_CLK_DIV_2;

	else

		dmic_ctl_val = WCD9335_DMIC_CLK_DIV_3;



	if (dmic_clk_rate == 0) {

		dev_err(component->dev,

			"%s: dmic_sample_rate cannot be 0\n",

			__func__);

		goto done;

	}



	div_factor = mclk_rate / dmic_clk_rate;

	switch (div_factor) {

	case 2:

		dmic_ctl_val = WCD9335_DMIC_CLK_DIV_2;

		break;

	case 3:

		dmic_ctl_val = WCD9335_DMIC_CLK_DIV_3;

		break;

	case 4:

		dmic_ctl_val = WCD9335_DMIC_CLK_DIV_4;

		break;

	case 6:

		dmic_ctl_val = WCD9335_DMIC_CLK_DIV_6;

		break;

	case 8:

		dmic_ctl_val = WCD9335_DMIC_CLK_DIV_8;

		break;

	case 16:

		dmic_ctl_val = WCD9335_DMIC_CLK_DIV_16;

		break;

	default:

		dev_err(component->dev,

			"%s: Invalid div_factor %u, clk_rate(%u), dmic_rate(%u)\n",

			__func__, div_factor, mclk_rate, dmic_clk_rate);

		break;

	}



done:

	return dmic_ctl_val;

}
@@ -2950,11 +2904,7 @@ static int wcd9335_codec_enable_dmic(struct snd_soc_dapm_widget *w, 


	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		dmic_rate_val =

			wcd9335_get_dmic_clk_val(comp,

					wcd->mclk_rate,

					wcd->dmic_sample_rate);



		dmic_rate_val = wcd9335_get_dmic_clk_val(comp, wcd->mclk_rate);

		(*dmic_clk_cnt)++;

		if (*dmic_clk_cnt == 1) {

			snd_soc_component_update_bits(comp, dmic_clk_reg,
@@ -2966,10 +2916,7 @@ static int wcd9335_codec_enable_dmic(struct snd_soc_dapm_widget *w, 


		break;

	case SND_SOC_DAPM_POST_PMD:

		dmic_rate_val =

			wcd9335_get_dmic_clk_val(comp,

					wcd->mclk_rate,

					wcd->mad_dmic_sample_rate);

		dmic_rate_val = wcd9335_get_dmic_clk_val(comp, wcd->mclk_rate);

		(*dmic_clk_cnt)--;

		if (*dmic_clk_cnt  == 0) {

			snd_soc_component_update_bits(comp, dmic_clk_reg,
@@ -4026,7 +3973,7 @@ static irqreturn_t wcd9335_slimbus_irq(int irq, void *data) 
	return ret;

}



static struct wcd9335_irq wcd9335_irqs[] = {

static const struct wcd9335_irq wcd9335_irqs[] = {

	{

		.irq = WCD9335_IRQ_SLIMBUS,

		.handler = wcd9335_slimbus_irq,
@@ -4963,7 +4910,7 @@ static bool wcd9335_is_volatile_register(struct device *dev, unsigned int reg) 
	}

}



static struct regmap_config wcd9335_regmap_config = {

static const struct regmap_config wcd9335_regmap_config = {

	.reg_bits = 16,

	.val_bits = 8,

	.cache_type = REGCACHE_MAPLE,
@@ -4987,7 +4934,7 @@ static const struct regmap_range_cfg wcd9335_ifc_ranges[] = { 
	},

};



static struct regmap_config wcd9335_ifc_regmap_config = {

static const struct regmap_config wcd9335_ifc_regmap_config = {

	.reg_bits = 16,

	.val_bits = 8,

	.can_multi_write = true,
@@ -5034,22 +4981,16 @@ static int wcd9335_parse_dt(struct wcd9335_codec *wcd) 
	int ret;



	wcd->reset_gpio = of_get_named_gpio(np,	"reset-gpios", 0);

	if (wcd->reset_gpio < 0) {

		dev_err(dev, "Reset GPIO missing from DT\n");

		return wcd->reset_gpio;

	}

	if (wcd->reset_gpio < 0)

		return dev_err_probe(dev, wcd->reset_gpio, "Reset GPIO missing from DT\n");



	wcd->mclk = devm_clk_get(dev, "mclk");

	if (IS_ERR(wcd->mclk)) {

		dev_err(dev, "mclk not found\n");

		return PTR_ERR(wcd->mclk);

	}

	if (IS_ERR(wcd->mclk))

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



	wcd->native_clk = devm_clk_get(dev, "slimbus");

	if (IS_ERR(wcd->native_clk)) {

		dev_err(dev, "slimbus clock not found\n");

		return PTR_ERR(wcd->native_clk);

	}

	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";
@@ -5058,10 +4999,8 @@ static int wcd9335_parse_dt(struct wcd9335_codec *wcd) 
	wcd->supplies[4].supply = "vdd-io";



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

	if (ret) {

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

		return ret;

	}

	if (ret)

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



	return 0;

}
@@ -5109,7 +5048,6 @@ static int wcd9335_bring_up(struct wcd9335_codec *wcd) 


	if (byte0 == 0x1) {

		dev_info(wcd->dev, "WCD9335 CODEC version is v2.0\n");

		wcd->version = WCD9335_VERSION_2_0;

		regmap_write(rm, WCD9335_CODEC_RPM_RST_CTL, 0x01);

		regmap_write(rm, WCD9335_SIDO_SIDO_TEST_2, 0x00);

		regmap_write(rm, WCD9335_SIDO_SIDO_CCL_8, 0x6F);
@@ -5161,10 +5099,8 @@ static int wcd9335_slim_probe(struct slim_device *slim) 


	wcd->dev = dev;

	ret = wcd9335_parse_dt(wcd);

	if (ret) {

		dev_err(dev, "Error parsing DT: %d\n", ret);

	if (ret)

		return ret;

	}



	ret = wcd9335_power_on_reset(wcd);

	if (ret)

sound/soc/codecs/wcd934x.c

+13 −29
Original line number Diff line number Diff line
@@ -475,17 +475,12 @@ enum { 
	INTn_2_INP_SEL_PROXIMITY,

};



enum {

	INTERP_MAIN_PATH,

	INTERP_MIX_PATH,

};



struct interp_sample_rate {

	int sample_rate;

	int rate_val;

};



static struct interp_sample_rate sr_val_tbl[] = {

static const struct interp_sample_rate sr_val_tbl[] = {

	{8000, 0x0},

	{16000, 0x1},

	{32000, 0x3},
@@ -527,7 +522,7 @@ static const struct regmap_range_cfg wcd934x_ifc_ranges[] = { 
	},

};



static struct regmap_config wcd934x_ifc_regmap_config = {

static const struct regmap_config wcd934x_ifc_regmap_config = {

	.reg_bits = 16,

	.val_bits = 8,

	.max_register = 0xffff,
@@ -571,10 +566,7 @@ struct wcd934x_codec { 
	struct mutex micb_lock;

	u32 micb_ref[WCD934X_MAX_MICBIAS];

	u32 pullup_ref[WCD934X_MAX_MICBIAS];

	u32 micb1_mv;

	u32 micb2_mv;

	u32 micb3_mv;

	u32 micb4_mv;

};



#define to_wcd934x_codec(_hw) container_of(_hw, struct wcd934x_codec, hw)
@@ -1217,7 +1209,7 @@ static const struct soc_enum cdc_if_tx13_mux_enum = 
	SOC_ENUM_SINGLE(WCD934X_DATA_HUB_SB_TX13_INP_CFG, 0,

			ARRAY_SIZE(cdc_if_tx13_mux_text), cdc_if_tx13_mux_text);



static struct wcd_mbhc_field wcd_mbhc_fields[WCD_MBHC_REG_FUNC_MAX] = {

static const struct wcd_mbhc_field wcd_mbhc_fields[WCD_MBHC_REG_FUNC_MAX] = {

	WCD_MBHC_FIELD(WCD_MBHC_L_DET_EN, WCD934X_ANA_MBHC_MECH, 0x80),

	WCD_MBHC_FIELD(WCD_MBHC_GND_DET_EN, WCD934X_ANA_MBHC_MECH, 0x40),

	WCD_MBHC_FIELD(WCD_MBHC_MECH_DETECTION_TYPE, WCD934X_ANA_MBHC_MECH, 0x20),
@@ -2208,6 +2200,7 @@ static int wcd934x_get_micbias_val(struct device *dev, const char *micbias, 
		mv = WCD934X_DEF_MICBIAS_MV;

	}



	if (micb_mv)

		*micb_mv = mv;



	return (mv - 1000) / 50;
@@ -2220,17 +2213,14 @@ static int wcd934x_init_dmic(struct snd_soc_component *comp) 
	u32 def_dmic_rate, dmic_clk_drv;



	vout_ctl_1 = wcd934x_get_micbias_val(comp->dev,

					     "qcom,micbias1-microvolt",

					     &wcd->micb1_mv);

					     "qcom,micbias1-microvolt", NULL);

	vout_ctl_2 = wcd934x_get_micbias_val(comp->dev,

					     "qcom,micbias2-microvolt",

					     &wcd->micb2_mv);

	vout_ctl_3 = wcd934x_get_micbias_val(comp->dev,

					     "qcom,micbias3-microvolt",

					     &wcd->micb3_mv);

					     "qcom,micbias3-microvolt", NULL);

	vout_ctl_4 = wcd934x_get_micbias_val(comp->dev,

					     "qcom,micbias4-microvolt",

					     &wcd->micb4_mv);

					     "qcom,micbias4-microvolt", NULL);



	snd_soc_component_update_bits(comp, WCD934X_ANA_MICB1,

				      WCD934X_MICB_VAL_MASK, vout_ctl_1);
@@ -5866,17 +5856,13 @@ static int wcd934x_codec_parse_data(struct wcd934x_codec *wcd) 
	struct device_node *ifc_dev_np;



	ifc_dev_np = of_parse_phandle(dev->of_node, "slim-ifc-dev", 0);

	if (!ifc_dev_np) {

		dev_err(dev, "No Interface device found\n");

		return -EINVAL;

	}

	if (!ifc_dev_np)

		return dev_err_probe(dev, -EINVAL, "No Interface device found\n");



	wcd->sidev = of_slim_get_device(wcd->sdev->ctrl, ifc_dev_np);

	of_node_put(ifc_dev_np);

	if (!wcd->sidev) {

		dev_err(dev, "Unable to get SLIM Interface device\n");

		return -EINVAL;

	}

	if (!wcd->sidev)

		return dev_err_probe(dev, -EINVAL, "Unable to get SLIM Interface device\n");



	slim_get_logical_addr(wcd->sidev);

	wcd->if_regmap = regmap_init_slimbus(wcd->sidev,
@@ -5922,10 +5908,8 @@ static int wcd934x_codec_probe(struct platform_device *pdev) 
	mutex_init(&wcd->micb_lock);



	ret = wcd934x_codec_parse_data(wcd);

	if (ret) {

		dev_err(wcd->dev, "Failed to get SLIM IRQ\n");

	if (ret)

		return ret;

	}



	/* set default rate 9P6MHz */

	regmap_update_bits(wcd->regmap, WCD934X_CODEC_RPM_CLK_MCLK_CFG,

sound/soc/codecs/wcd937x-sdw.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <sound/soc.h>

#include "wcd937x.h"



static struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] = {

static const struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] = {

	WCD_SDW_CH(WCD937X_HPH_L, WCD937X_HPH_PORT, BIT(0)),

	WCD_SDW_CH(WCD937X_HPH_R, WCD937X_HPH_PORT, BIT(1)),

	WCD_SDW_CH(WCD937X_CLSH, WCD937X_CLSH_PORT, BIT(0)),
@@ -30,7 +30,7 @@ static struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] = { 
	WCD_SDW_CH(WCD937X_DSD_R, WCD937X_DSD_PORT, BIT(1)),

};



static struct wcd937x_sdw_ch_info wcd937x_sdw_tx_ch_info[] = {

static const struct wcd937x_sdw_ch_info wcd937x_sdw_tx_ch_info[] = {

	WCD_SDW_CH(WCD937X_ADC1, WCD937X_ADC_1_PORT, BIT(0)),

	WCD_SDW_CH(WCD937X_ADC2, WCD937X_ADC_2_3_PORT, BIT(0)),

	WCD_SDW_CH(WCD937X_ADC3, WCD937X_ADC_2_3_PORT, BIT(0)),