Unverified Commit aa5b18d1 authored by Adam Thomson's avatar Adam Thomson Committed by Mark Brown
Browse files

ASoC: da7219: Move soft reset handling to codec level probe 



As part of the reorganisation of the device level and codec
level probe functionlity, the soft reset handling should really
reside at the codec level and after the instantiation of supplies.
This commit makes the relevant changes to support this change of
scope including the remove of devm_* functions being called for
regulator instantiation at the codec level.

Signed-off-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Link: https://lore.kernel.org/r/f7603a4855647429b754ce76f887ec441622015c.1597164865.git.Adam.Thomson.Opensource@diasemi.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 21f279f3

sound/soc/codecs/da7219.c

+188 −183
Original line number Diff line number Diff line
@@ -1846,18 +1846,18 @@ static const char *da7219_supply_names[DA7219_NUM_SUPPLIES] = { 
	[DA7219_SUPPLY_VDDIO] = "VDDIO",

};



static int da7219_handle_supplies(struct snd_soc_component *component)

static int da7219_handle_supplies(struct snd_soc_component *component,

				  u8 *io_voltage_lvl)

{

	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);

	struct regulator *vddio;

	u8 io_voltage_lvl = DA7219_IO_VOLTAGE_LEVEL_2_5V_3_6V;

	int i, ret;



	/* Get required supplies */

	for (i = 0; i < DA7219_NUM_SUPPLIES; ++i)

		da7219->supplies[i].supply = da7219_supply_names[i];



	ret = devm_regulator_bulk_get(component->dev, DA7219_NUM_SUPPLIES,

	ret = regulator_bulk_get(component->dev, DA7219_NUM_SUPPLIES,

				 da7219->supplies);

	if (ret) {

		dev_err(component->dev, "Failed to get supplies");
@@ -1870,21 +1870,18 @@ static int da7219_handle_supplies(struct snd_soc_component *component) 
	if (ret < 1200000)

		dev_warn(component->dev, "Invalid VDDIO voltage\n");

	else if (ret < 2800000)

		io_voltage_lvl = DA7219_IO_VOLTAGE_LEVEL_1_2V_2_8V;

		*io_voltage_lvl = DA7219_IO_VOLTAGE_LEVEL_1_2V_2_8V;

	else

		*io_voltage_lvl = DA7219_IO_VOLTAGE_LEVEL_2_5V_3_6V;



	/* Enable main supplies */

	ret = regulator_bulk_enable(DA7219_NUM_SUPPLIES, da7219->supplies);

	if (ret) {

		dev_err(component->dev, "Failed to enable supplies");

		regulator_bulk_free(DA7219_NUM_SUPPLIES, da7219->supplies);

		return ret;

	}



	/* Ensure device in active mode */

	snd_soc_component_write(component, DA7219_SYSTEM_ACTIVE, DA7219_SYSTEM_ACTIVE_MASK);



	/* Update IO voltage level range */

	snd_soc_component_write(component, DA7219_IO_CTRL, io_voltage_lvl);



	return 0;

}
@@ -2250,6 +2247,142 @@ static void da7219_handle_pdata(struct snd_soc_component *component) 
	}

}





/*

 * Regmap configs

 */



static struct reg_default da7219_reg_defaults[] = {

	{ DA7219_MIC_1_SELECT, 0x00 },

	{ DA7219_CIF_TIMEOUT_CTRL, 0x01 },

	{ DA7219_SR_24_48, 0x00 },

	{ DA7219_SR, 0x0A },

	{ DA7219_CIF_I2C_ADDR_CFG, 0x02 },

	{ DA7219_PLL_CTRL, 0x10 },

	{ DA7219_PLL_FRAC_TOP, 0x00 },

	{ DA7219_PLL_FRAC_BOT, 0x00 },

	{ DA7219_PLL_INTEGER, 0x20 },

	{ DA7219_DIG_ROUTING_DAI, 0x10 },

	{ DA7219_DAI_CLK_MODE, 0x01 },

	{ DA7219_DAI_CTRL, 0x28 },

	{ DA7219_DAI_TDM_CTRL, 0x40 },

	{ DA7219_DIG_ROUTING_DAC, 0x32 },

	{ DA7219_DAI_OFFSET_LOWER, 0x00 },

	{ DA7219_DAI_OFFSET_UPPER, 0x00 },

	{ DA7219_REFERENCES, 0x08 },

	{ DA7219_MIXIN_L_SELECT, 0x00 },

	{ DA7219_MIXIN_L_GAIN, 0x03 },

	{ DA7219_ADC_L_GAIN, 0x6F },

	{ DA7219_ADC_FILTERS1, 0x80 },

	{ DA7219_MIC_1_GAIN, 0x01 },

	{ DA7219_SIDETONE_CTRL, 0x40 },

	{ DA7219_SIDETONE_GAIN, 0x0E },

	{ DA7219_DROUTING_ST_OUTFILT_1L, 0x01 },

	{ DA7219_DROUTING_ST_OUTFILT_1R, 0x02 },

	{ DA7219_DAC_FILTERS5, 0x00 },

	{ DA7219_DAC_FILTERS2, 0x88 },

	{ DA7219_DAC_FILTERS3, 0x88 },

	{ DA7219_DAC_FILTERS4, 0x08 },

	{ DA7219_DAC_FILTERS1, 0x80 },

	{ DA7219_DAC_L_GAIN, 0x6F },

	{ DA7219_DAC_R_GAIN, 0x6F },

	{ DA7219_CP_CTRL, 0x20 },

	{ DA7219_HP_L_GAIN, 0x39 },

	{ DA7219_HP_R_GAIN, 0x39 },

	{ DA7219_MIXOUT_L_SELECT, 0x00 },

	{ DA7219_MIXOUT_R_SELECT, 0x00 },

	{ DA7219_MICBIAS_CTRL, 0x03 },

	{ DA7219_MIC_1_CTRL, 0x40 },

	{ DA7219_MIXIN_L_CTRL, 0x40 },

	{ DA7219_ADC_L_CTRL, 0x40 },

	{ DA7219_DAC_L_CTRL, 0x40 },

	{ DA7219_DAC_R_CTRL, 0x40 },

	{ DA7219_HP_L_CTRL, 0x40 },

	{ DA7219_HP_R_CTRL, 0x40 },

	{ DA7219_MIXOUT_L_CTRL, 0x10 },

	{ DA7219_MIXOUT_R_CTRL, 0x10 },

	{ DA7219_CHIP_ID1, 0x23 },

	{ DA7219_CHIP_ID2, 0x93 },

	{ DA7219_IO_CTRL, 0x00 },

	{ DA7219_GAIN_RAMP_CTRL, 0x00 },

	{ DA7219_PC_COUNT, 0x02 },

	{ DA7219_CP_VOL_THRESHOLD1, 0x0E },

	{ DA7219_DIG_CTRL, 0x00 },

	{ DA7219_ALC_CTRL2, 0x00 },

	{ DA7219_ALC_CTRL3, 0x00 },

	{ DA7219_ALC_NOISE, 0x3F },

	{ DA7219_ALC_TARGET_MIN, 0x3F },

	{ DA7219_ALC_TARGET_MAX, 0x00 },

	{ DA7219_ALC_GAIN_LIMITS, 0xFF },

	{ DA7219_ALC_ANA_GAIN_LIMITS, 0x71 },

	{ DA7219_ALC_ANTICLIP_CTRL, 0x00 },

	{ DA7219_ALC_ANTICLIP_LEVEL, 0x00 },

	{ DA7219_DAC_NG_SETUP_TIME, 0x00 },

	{ DA7219_DAC_NG_OFF_THRESH, 0x00 },

	{ DA7219_DAC_NG_ON_THRESH, 0x00 },

	{ DA7219_DAC_NG_CTRL, 0x00 },

	{ DA7219_TONE_GEN_CFG1, 0x00 },

	{ DA7219_TONE_GEN_CFG2, 0x00 },

	{ DA7219_TONE_GEN_CYCLES, 0x00 },

	{ DA7219_TONE_GEN_FREQ1_L, 0x55 },

	{ DA7219_TONE_GEN_FREQ1_U, 0x15 },

	{ DA7219_TONE_GEN_FREQ2_L, 0x00 },

	{ DA7219_TONE_GEN_FREQ2_U, 0x40 },

	{ DA7219_TONE_GEN_ON_PER, 0x02 },

	{ DA7219_TONE_GEN_OFF_PER, 0x01 },

	{ DA7219_ACCDET_IRQ_MASK_A, 0x00 },

	{ DA7219_ACCDET_IRQ_MASK_B, 0x00 },

	{ DA7219_ACCDET_CONFIG_1, 0xD6 },

	{ DA7219_ACCDET_CONFIG_2, 0x34 },

	{ DA7219_ACCDET_CONFIG_3, 0x0A },

	{ DA7219_ACCDET_CONFIG_4, 0x16 },

	{ DA7219_ACCDET_CONFIG_5, 0x21 },

	{ DA7219_ACCDET_CONFIG_6, 0x3E },

	{ DA7219_ACCDET_CONFIG_7, 0x01 },

	{ DA7219_SYSTEM_ACTIVE, 0x00 },

};



static bool da7219_volatile_register(struct device *dev, unsigned int reg)

{

	switch (reg) {

	case DA7219_MIC_1_GAIN_STATUS:

	case DA7219_MIXIN_L_GAIN_STATUS:

	case DA7219_ADC_L_GAIN_STATUS:

	case DA7219_DAC_L_GAIN_STATUS:

	case DA7219_DAC_R_GAIN_STATUS:

	case DA7219_HP_L_GAIN_STATUS:

	case DA7219_HP_R_GAIN_STATUS:

	case DA7219_CIF_CTRL:

	case DA7219_PLL_SRM_STS:

	case DA7219_ALC_CTRL1:

	case DA7219_SYSTEM_MODES_INPUT:

	case DA7219_SYSTEM_MODES_OUTPUT:

	case DA7219_ALC_OFFSET_AUTO_M_L:

	case DA7219_ALC_OFFSET_AUTO_U_L:

	case DA7219_TONE_GEN_CFG1:

	case DA7219_ACCDET_STATUS_A:

	case DA7219_ACCDET_STATUS_B:

	case DA7219_ACCDET_IRQ_EVENT_A:

	case DA7219_ACCDET_IRQ_EVENT_B:

	case DA7219_ACCDET_CONFIG_8:

	case DA7219_SYSTEM_STATUS:

		return true;

	default:

		return false;

	}

}



static const struct regmap_config da7219_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,



	.max_register = DA7219_SYSTEM_ACTIVE,

	.reg_defaults = da7219_reg_defaults,

	.num_reg_defaults = ARRAY_SIZE(da7219_reg_defaults),

	.volatile_reg = da7219_volatile_register,

	.cache_type = REGCACHE_RBTREE,

};



static struct reg_sequence da7219_rev_aa_patch[] = {

	{ DA7219_REFERENCES, 0x08 },

};
@@ -2257,18 +2390,56 @@ static struct reg_sequence da7219_rev_aa_patch[] = { 
static int da7219_probe(struct snd_soc_component *component)

{

	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);

	unsigned int rev;

	int ret;

	unsigned int system_active, system_status, rev;

	u8 io_voltage_lvl;

	int i, ret;



	da7219->component = component;

	mutex_init(&da7219->ctrl_lock);

	mutex_init(&da7219->pll_lock);



	/* Regulator configuration */

	ret = da7219_handle_supplies(component);

	ret = da7219_handle_supplies(component, &io_voltage_lvl);

	if (ret)

		return ret;



	regcache_cache_bypass(da7219->regmap, true);



	/* Disable audio paths if still active from previous start */

	regmap_read(da7219->regmap, DA7219_SYSTEM_ACTIVE, &system_active);

	if (system_active) {

		regmap_write(da7219->regmap, DA7219_GAIN_RAMP_CTRL,

			     DA7219_GAIN_RAMP_RATE_NOMINAL);

		regmap_write(da7219->regmap, DA7219_SYSTEM_MODES_INPUT, 0x00);

		regmap_write(da7219->regmap, DA7219_SYSTEM_MODES_OUTPUT, 0x01);



		for (i = 0; i < DA7219_SYS_STAT_CHECK_RETRIES; ++i) {

			regmap_read(da7219->regmap, DA7219_SYSTEM_STATUS,

				    &system_status);

			if (!system_status)

				break;



			msleep(DA7219_SYS_STAT_CHECK_DELAY);

		}

	}



	/* Soft reset component */

	regmap_write_bits(da7219->regmap, DA7219_ACCDET_CONFIG_1,

			  DA7219_ACCDET_EN_MASK, 0);

	regmap_write_bits(da7219->regmap, DA7219_CIF_CTRL,

			  DA7219_CIF_REG_SOFT_RESET_MASK,

			  DA7219_CIF_REG_SOFT_RESET_MASK);

	regmap_write_bits(da7219->regmap, DA7219_SYSTEM_ACTIVE,

			  DA7219_SYSTEM_ACTIVE_MASK, 0);

	regmap_write_bits(da7219->regmap, DA7219_SYSTEM_ACTIVE,

			  DA7219_SYSTEM_ACTIVE_MASK, 1);



	regcache_cache_bypass(da7219->regmap, false);

	regmap_reinit_cache(da7219->regmap, &da7219_regmap_config);



	/* Update IO voltage level range based on supply level */

	snd_soc_component_write(component, DA7219_IO_CTRL, io_voltage_lvl);



	ret = regmap_read(da7219->regmap, DA7219_CHIP_REVISION, &rev);

	if (ret) {

		dev_err(component->dev, "Failed to read chip revision: %d\n", ret);
@@ -2349,6 +2520,7 @@ static int da7219_probe(struct snd_soc_component *component) 


err_disable_reg:

	regulator_bulk_disable(DA7219_NUM_SUPPLIES, da7219->supplies);

	regulator_bulk_free(DA7219_NUM_SUPPLIES, da7219->supplies);



	return ret;

}
@@ -2371,6 +2543,7 @@ static void da7219_remove(struct snd_soc_component *component) 


	/* Supplies */

	regulator_bulk_disable(DA7219_NUM_SUPPLIES, da7219->supplies);

	regulator_bulk_free(DA7219_NUM_SUPPLIES, da7219->supplies);

}



#ifdef CONFIG_PM
@@ -2423,142 +2596,6 @@ static const struct snd_soc_component_driver soc_component_dev_da7219 = { 
};





/*

 * Regmap configs

 */



static struct reg_default da7219_reg_defaults[] = {

	{ DA7219_MIC_1_SELECT, 0x00 },

	{ DA7219_CIF_TIMEOUT_CTRL, 0x01 },

	{ DA7219_SR_24_48, 0x00 },

	{ DA7219_SR, 0x0A },

	{ DA7219_CIF_I2C_ADDR_CFG, 0x02 },

	{ DA7219_PLL_CTRL, 0x10 },

	{ DA7219_PLL_FRAC_TOP, 0x00 },

	{ DA7219_PLL_FRAC_BOT, 0x00 },

	{ DA7219_PLL_INTEGER, 0x20 },

	{ DA7219_DIG_ROUTING_DAI, 0x10 },

	{ DA7219_DAI_CLK_MODE, 0x01 },

	{ DA7219_DAI_CTRL, 0x28 },

	{ DA7219_DAI_TDM_CTRL, 0x40 },

	{ DA7219_DIG_ROUTING_DAC, 0x32 },

	{ DA7219_DAI_OFFSET_LOWER, 0x00 },

	{ DA7219_DAI_OFFSET_UPPER, 0x00 },

	{ DA7219_REFERENCES, 0x08 },

	{ DA7219_MIXIN_L_SELECT, 0x00 },

	{ DA7219_MIXIN_L_GAIN, 0x03 },

	{ DA7219_ADC_L_GAIN, 0x6F },

	{ DA7219_ADC_FILTERS1, 0x80 },

	{ DA7219_MIC_1_GAIN, 0x01 },

	{ DA7219_SIDETONE_CTRL, 0x40 },

	{ DA7219_SIDETONE_GAIN, 0x0E },

	{ DA7219_DROUTING_ST_OUTFILT_1L, 0x01 },

	{ DA7219_DROUTING_ST_OUTFILT_1R, 0x02 },

	{ DA7219_DAC_FILTERS5, 0x00 },

	{ DA7219_DAC_FILTERS2, 0x88 },

	{ DA7219_DAC_FILTERS3, 0x88 },

	{ DA7219_DAC_FILTERS4, 0x08 },

	{ DA7219_DAC_FILTERS1, 0x80 },

	{ DA7219_DAC_L_GAIN, 0x6F },

	{ DA7219_DAC_R_GAIN, 0x6F },

	{ DA7219_CP_CTRL, 0x20 },

	{ DA7219_HP_L_GAIN, 0x39 },

	{ DA7219_HP_R_GAIN, 0x39 },

	{ DA7219_MIXOUT_L_SELECT, 0x00 },

	{ DA7219_MIXOUT_R_SELECT, 0x00 },

	{ DA7219_MICBIAS_CTRL, 0x03 },

	{ DA7219_MIC_1_CTRL, 0x40 },

	{ DA7219_MIXIN_L_CTRL, 0x40 },

	{ DA7219_ADC_L_CTRL, 0x40 },

	{ DA7219_DAC_L_CTRL, 0x40 },

	{ DA7219_DAC_R_CTRL, 0x40 },

	{ DA7219_HP_L_CTRL, 0x40 },

	{ DA7219_HP_R_CTRL, 0x40 },

	{ DA7219_MIXOUT_L_CTRL, 0x10 },

	{ DA7219_MIXOUT_R_CTRL, 0x10 },

	{ DA7219_CHIP_ID1, 0x23 },

	{ DA7219_CHIP_ID2, 0x93 },

	{ DA7219_IO_CTRL, 0x00 },

	{ DA7219_GAIN_RAMP_CTRL, 0x00 },

	{ DA7219_PC_COUNT, 0x02 },

	{ DA7219_CP_VOL_THRESHOLD1, 0x0E },

	{ DA7219_DIG_CTRL, 0x00 },

	{ DA7219_ALC_CTRL2, 0x00 },

	{ DA7219_ALC_CTRL3, 0x00 },

	{ DA7219_ALC_NOISE, 0x3F },

	{ DA7219_ALC_TARGET_MIN, 0x3F },

	{ DA7219_ALC_TARGET_MAX, 0x00 },

	{ DA7219_ALC_GAIN_LIMITS, 0xFF },

	{ DA7219_ALC_ANA_GAIN_LIMITS, 0x71 },

	{ DA7219_ALC_ANTICLIP_CTRL, 0x00 },

	{ DA7219_ALC_ANTICLIP_LEVEL, 0x00 },

	{ DA7219_DAC_NG_SETUP_TIME, 0x00 },

	{ DA7219_DAC_NG_OFF_THRESH, 0x00 },

	{ DA7219_DAC_NG_ON_THRESH, 0x00 },

	{ DA7219_DAC_NG_CTRL, 0x00 },

	{ DA7219_TONE_GEN_CFG1, 0x00 },

	{ DA7219_TONE_GEN_CFG2, 0x00 },

	{ DA7219_TONE_GEN_CYCLES, 0x00 },

	{ DA7219_TONE_GEN_FREQ1_L, 0x55 },

	{ DA7219_TONE_GEN_FREQ1_U, 0x15 },

	{ DA7219_TONE_GEN_FREQ2_L, 0x00 },

	{ DA7219_TONE_GEN_FREQ2_U, 0x40 },

	{ DA7219_TONE_GEN_ON_PER, 0x02 },

	{ DA7219_TONE_GEN_OFF_PER, 0x01 },

	{ DA7219_ACCDET_IRQ_MASK_A, 0x00 },

	{ DA7219_ACCDET_IRQ_MASK_B, 0x00 },

	{ DA7219_ACCDET_CONFIG_1, 0xD6 },

	{ DA7219_ACCDET_CONFIG_2, 0x34 },

	{ DA7219_ACCDET_CONFIG_3, 0x0A },

	{ DA7219_ACCDET_CONFIG_4, 0x16 },

	{ DA7219_ACCDET_CONFIG_5, 0x21 },

	{ DA7219_ACCDET_CONFIG_6, 0x3E },

	{ DA7219_ACCDET_CONFIG_7, 0x01 },

	{ DA7219_SYSTEM_ACTIVE, 0x00 },

};



static bool da7219_volatile_register(struct device *dev, unsigned int reg)

{

	switch (reg) {

	case DA7219_MIC_1_GAIN_STATUS:

	case DA7219_MIXIN_L_GAIN_STATUS:

	case DA7219_ADC_L_GAIN_STATUS:

	case DA7219_DAC_L_GAIN_STATUS:

	case DA7219_DAC_R_GAIN_STATUS:

	case DA7219_HP_L_GAIN_STATUS:

	case DA7219_HP_R_GAIN_STATUS:

	case DA7219_CIF_CTRL:

	case DA7219_PLL_SRM_STS:

	case DA7219_ALC_CTRL1:

	case DA7219_SYSTEM_MODES_INPUT:

	case DA7219_SYSTEM_MODES_OUTPUT:

	case DA7219_ALC_OFFSET_AUTO_M_L:

	case DA7219_ALC_OFFSET_AUTO_U_L:

	case DA7219_TONE_GEN_CFG1:

	case DA7219_ACCDET_STATUS_A:

	case DA7219_ACCDET_STATUS_B:

	case DA7219_ACCDET_IRQ_EVENT_A:

	case DA7219_ACCDET_IRQ_EVENT_B:

	case DA7219_ACCDET_CONFIG_8:

	case DA7219_SYSTEM_STATUS:

		return true;

	default:

		return false;

	}

}



static const struct regmap_config da7219_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,



	.max_register = DA7219_SYSTEM_ACTIVE,

	.reg_defaults = da7219_reg_defaults,

	.num_reg_defaults = ARRAY_SIZE(da7219_reg_defaults),

	.volatile_reg = da7219_volatile_register,

	.cache_type = REGCACHE_RBTREE,

};





/*

 * I2C layer

 */
@@ -2568,8 +2605,7 @@ static int da7219_i2c_probe(struct i2c_client *i2c, 
{

	struct device *dev = &i2c->dev;

	struct da7219_priv *da7219;

	unsigned int system_active, system_status;

	int i, ret;

	int ret;



	da7219 = devm_kzalloc(dev, sizeof(struct da7219_priv),

			      GFP_KERNEL);
@@ -2585,37 +2621,6 @@ static int da7219_i2c_probe(struct i2c_client *i2c, 
		return ret;

	}



	regcache_cache_bypass(da7219->regmap, true);



	/* Disable audio paths if still active from previous start */

	regmap_read(da7219->regmap, DA7219_SYSTEM_ACTIVE, &system_active);

	if (system_active) {

		regmap_write(da7219->regmap, DA7219_GAIN_RAMP_CTRL,

			     DA7219_GAIN_RAMP_RATE_NOMINAL);

		regmap_write(da7219->regmap, DA7219_SYSTEM_MODES_INPUT, 0x00);

		regmap_write(da7219->regmap, DA7219_SYSTEM_MODES_OUTPUT, 0x01);



		for (i = 0; i < DA7219_SYS_STAT_CHECK_RETRIES; ++i) {

			regmap_read(da7219->regmap, DA7219_SYSTEM_STATUS,

				    &system_status);

			if (!system_status)

				break;



			msleep(DA7219_SYS_STAT_CHECK_DELAY);

		}

	}



	/* Soft reset component */

	regmap_write_bits(da7219->regmap, DA7219_ACCDET_CONFIG_1,

			  DA7219_ACCDET_EN_MASK, 0);

	regmap_write_bits(da7219->regmap, DA7219_CIF_CTRL,

			  DA7219_CIF_REG_SOFT_RESET_MASK,

			  DA7219_CIF_REG_SOFT_RESET_MASK);

	regmap_write_bits(da7219->regmap, DA7219_SYSTEM_ACTIVE,

			  DA7219_SYSTEM_ACTIVE_MASK, 0);



	regcache_cache_bypass(da7219->regmap, false);



	/* Retrieve DT/ACPI/Platform data */

	da7219->pdata = dev_get_platdata(dev);

	if (!da7219->pdata)

CRA Git | Maintained and supported by SUSTech CRA and CCSE