Unverified Commit 4295c8cc authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: cs35l41: Fix a bunch of trivial code formating/style issues 



Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210914141349.30218-6-ckeepax@opensource.cirrus.com


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

sound/soc/codecs/cs35l41-i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ static int cs35l41_i2c_probe(struct i2c_client *client, 
	cs35l41->regmap = devm_regmap_init_i2c(client, regmap_config);

	if (IS_ERR(cs35l41->regmap)) {

		ret = PTR_ERR(cs35l41->regmap);

		dev_err(cs35l41->dev, "Failed to allocate register map: %d\n",

			ret);

		dev_err(cs35l41->dev, "Failed to allocate register map: %d\n", ret);

		return ret;

	}

sound/soc/codecs/cs35l41-spi.c

+4 −9
Original line number Diff line number Diff line
@@ -73,24 +73,19 @@ static void cs35l41_spi_otp_setup(struct cs35l41_private *cs35l41, 
static int cs35l41_spi_probe(struct spi_device *spi)

{

	const struct regmap_config *regmap_config = &cs35l41_regmap_spi;

	struct cs35l41_platform_data *pdata =

					dev_get_platdata(&spi->dev);

	struct cs35l41_platform_data *pdata = dev_get_platdata(&spi->dev);

	struct cs35l41_private *cs35l41;

	int ret;



	cs35l41 = devm_kzalloc(&spi->dev,

			       sizeof(struct cs35l41_private),

			       GFP_KERNEL);

	cs35l41 = devm_kzalloc(&spi->dev, sizeof(struct cs35l41_private), GFP_KERNEL);

	if (!cs35l41)

		return -ENOMEM;





	spi_set_drvdata(spi, cs35l41);

	cs35l41->regmap = devm_regmap_init_spi(spi, regmap_config);

	if (IS_ERR(cs35l41->regmap)) {

		ret = PTR_ERR(cs35l41->regmap);

		dev_err(&spi->dev, "Failed to allocate register map: %d\n",

			ret);

		dev_err(&spi->dev, "Failed to allocate register map: %d\n", ret);

		return ret;

	}

sound/soc/codecs/cs35l41-tables.c

+237 −240
Original line number Diff line number Diff line
@@ -349,8 +349,7 @@ bool cs35l41_volatile_reg(struct device *dev, unsigned int reg) 
	}

}



static const struct cs35l41_otp_packed_element_t

					otp_map_1[CS35L41_NUM_OTP_ELEM] = {

static const struct cs35l41_otp_packed_element_t otp_map_1[CS35L41_NUM_OTP_ELEM] = {

	/* addr         shift   size */

	{ 0x00002030,	0,	4 }, /*TRIM_OSC_FREQ_TRIM*/

	{ 0x00002030,	7,	1 }, /*TRIM_OSC_TRIM_DONE*/
@@ -453,8 +452,7 @@ static const struct cs35l41_otp_packed_element_t 
	{ 0x00017044,	0,	24 }, /*LOT_NUMBER*/

};



static const struct cs35l41_otp_packed_element_t

					otp_map_2[CS35L41_NUM_OTP_ELEM] = {

static const struct cs35l41_otp_packed_element_t otp_map_2[CS35L41_NUM_OTP_ELEM] = {

	/* addr         shift   size */

	{ 0x00002030,	0,	4 }, /*TRIM_OSC_FREQ_TRIM*/

	{ 0x00002030,	7,	1 }, /*TRIM_OSC_TRIM_DONE*/
@@ -557,8 +555,7 @@ static const struct cs35l41_otp_packed_element_t 
	{ 0x00017044,	0,	24 }, /*LOT_NUMBER*/

};



const struct cs35l41_otp_map_element_t

				cs35l41_otp_map_map[CS35L41_NUM_OTP_MAPS] = {

const struct cs35l41_otp_map_element_t cs35l41_otp_map_map[CS35L41_NUM_OTP_MAPS] = {

	{

		.id = 0x01,

		.map = otp_map_1,

sound/soc/codecs/cs35l41.c

+184 −203
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ static const unsigned char cs35l41_bst_k2_table[4][5] = { 
};



static const unsigned char cs35l41_bst_slope_table[4] = {

					0x75, 0x6B, 0x3B, 0x28};

	0x75, 0x6B, 0x3B, 0x28

};



static int cs35l41_get_fs_mon_config_index(int freq)

{
@@ -189,7 +190,8 @@ static const struct snd_kcontrol_new dre_ctrl = 
	SOC_DAPM_SINGLE("Switch", CS35L41_PWR_CTRL3, 20, 1, 0);



static const char * const cs35l41_pcm_sftramp_text[] =  {

	"Off", ".5ms", "1ms", "2ms", "4ms", "8ms", "15ms", "30ms"};

	"Off", ".5ms", "1ms", "2ms", "4ms", "8ms", "15ms", "30ms"

};



static SOC_ENUM_SINGLE_DECL(pcm_sft_ramp,

			    CS35L41_AMP_DIG_VOL_CTRL, 0,
@@ -206,20 +208,16 @@ static SOC_VALUE_ENUM_SINGLE_DECL(cs35l41_pcm_source_enum, 
static const struct snd_kcontrol_new pcm_source_mux =

	SOC_DAPM_ENUM("PCM Source", cs35l41_pcm_source_enum);



static const char * const cs35l41_tx_input_texts[] = {"Zero", "ASPRX1",

							"ASPRX2", "VMON",

							"IMON", "VPMON",

							"VBSTMON",

							"DSPTX1", "DSPTX2"};

static const unsigned int cs35l41_tx_input_values[] = {0x00,

						CS35L41_INPUT_SRC_ASPRX1,

						CS35L41_INPUT_SRC_ASPRX2,

						CS35L41_INPUT_SRC_VMON,

						CS35L41_INPUT_SRC_IMON,

						CS35L41_INPUT_SRC_VPMON,

						CS35L41_INPUT_SRC_VBSTMON,

						CS35L41_INPUT_DSP_TX1,

						CS35L41_INPUT_DSP_TX2};

static const char * const cs35l41_tx_input_texts[] = {

	"Zero", "ASPRX1", "ASPRX2", "VMON", "IMON",

	"VPMON", "VBSTMON", "DSPTX1", "DSPTX2"

};



static const unsigned int cs35l41_tx_input_values[] = {

	0x00, CS35L41_INPUT_SRC_ASPRX1, CS35L41_INPUT_SRC_ASPRX2,

	CS35L41_INPUT_SRC_VMON, CS35L41_INPUT_SRC_IMON, CS35L41_INPUT_SRC_VPMON,

	CS35L41_INPUT_SRC_VBSTMON, CS35L41_INPUT_DSP_TX1, CS35L41_INPUT_DSP_TX2

};



static SOC_VALUE_ENUM_SINGLE_DECL(cs35l41_asptx1_enum,

				  CS35L41_ASP_TX1_SRC,
@@ -309,8 +307,7 @@ static int cs35l41_otp_unpack(void *data) 
	u32 otp_val, otp_id_reg;

	u32 *otp_mem;



	otp_mem = kmalloc_array(CS35L41_OTP_SIZE_WORDS, sizeof(*otp_mem),

							GFP_KERNEL);

	otp_mem = kmalloc_array(CS35L41_OTP_SIZE_WORDS, sizeof(*otp_mem), GFP_KERNEL);

	if (!otp_mem)

		return -ENOMEM;
@@ -372,7 +369,6 @@ static int cs35l41_otp_unpack(void *data) 
					(32 - bit_offset);

			bit_offset += otp_map[i].size - 32;

		} else {



			otp_val = (otp_mem[word_offset] &

				GENMASK(bit_offset + otp_map[i].size - 1,

					bit_offset)) >>	bit_offset;
@@ -393,7 +389,8 @@ static int cs35l41_otp_unpack(void *data) 
						 otp_map[i].shift),

						 otp_val << otp_map[i].shift);

			if (ret < 0) {

				dev_err(cs35l41->dev, "Write OTP val failed: %d\n", ret);

				dev_err(cs35l41->dev, "Write OTP val failed: %d\n",

					ret);

				goto err_otp_unpack;

			}

		}
@@ -501,8 +498,7 @@ static irqreturn_t cs35l41_irq(int irq, void *data) 
				   CS35L41_BST_OVP_ERR_RLS, 0);

		regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,

				   CS35L41_BST_EN_MASK,

					CS35L41_BST_EN_DEFAULT <<

					CS35L41_BST_EN_SHIFT);

				   CS35L41_BST_EN_DEFAULT << CS35L41_BST_EN_SHIFT);

		ret = IRQ_HANDLED;

	}
@@ -520,8 +516,7 @@ static irqreturn_t cs35l41_irq(int irq, void *data) 
				   CS35L41_BST_UVP_ERR_RLS, 0);

		regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,

				   CS35L41_BST_EN_MASK,

					CS35L41_BST_EN_DEFAULT <<

					CS35L41_BST_EN_SHIFT);

				   CS35L41_BST_EN_DEFAULT << CS35L41_BST_EN_SHIFT);

		ret = IRQ_HANDLED;

	}
@@ -539,8 +534,7 @@ static irqreturn_t cs35l41_irq(int irq, void *data) 
				   CS35L41_BST_SHORT_ERR_RLS, 0);

		regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,

				   CS35L41_BST_EN_MASK,

					CS35L41_BST_EN_DEFAULT <<

					CS35L41_BST_EN_SHIFT);

				   CS35L41_BST_EN_DEFAULT << CS35L41_BST_EN_SHIFT);

		ret = IRQ_HANDLED;

	}
@@ -566,10 +560,8 @@ static const struct reg_sequence cs35l41_pdn_patch[] = { 
static int cs35l41_main_amp_event(struct snd_soc_dapm_widget *w,

				  struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_component *component =

		snd_soc_dapm_to_component(w->dapm);

	struct cs35l41_private *cs35l41 =

		snd_soc_component_get_drvdata(component);

	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(component);

	unsigned int val;

	int ret = 0;

	bool pdn;
@@ -608,6 +600,7 @@ static int cs35l41_main_amp_event(struct snd_soc_dapm_widget *w, 
		dev_err(cs35l41->dev, "Invalid event = 0x%x\n", event);

		ret = -EINVAL;

	}



	return ret;

}
@@ -647,7 +640,6 @@ static const struct snd_soc_dapm_widget cs35l41_dapm_widgets[] = { 
};



static const struct snd_soc_dapm_route cs35l41_audio_map[] = {



	{"ASP TX1 Source", "VMON", "VMON ADC"},

	{"ASP TX1 Source", "IMON", "IMON ADC"},

	{"ASP TX1 Source", "VPMON", "VPMON ADC"},
@@ -696,15 +688,13 @@ static const struct snd_soc_dapm_route cs35l41_audio_map[] = { 


	{"PCM Source", "ASP", "ASPRX1"},

	{"CLASS H", NULL, "PCM Source"},



};



static int cs35l41_set_channel_map(struct snd_soc_dai *dai, unsigned int tx_num,

				   unsigned int *tx_slot, unsigned int rx_num,

				   unsigned int *rx_slot)

{

	struct cs35l41_private *cs35l41 =

			snd_soc_component_get_drvdata(dai->component);

	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(dai->component);

	unsigned int val, mask;

	int i;
@@ -732,10 +722,9 @@ static int cs35l41_set_channel_map(struct snd_soc_dai *dai, unsigned int tx_num, 
	return 0;

}



static int cs35l41_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)

static int cs35l41_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)

{

	struct cs35l41_private *cs35l41 =

			snd_soc_component_get_drvdata(codec_dai->component);

	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(dai->component);

	unsigned int daifmt = 0;



	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
@@ -808,8 +797,7 @@ static int cs35l41_pcm_hw_params(struct snd_pcm_substream *substream, 
				 struct snd_pcm_hw_params *params,

				 struct snd_soc_dai *dai)

{

	struct cs35l41_private *cs35l41 =

			snd_soc_component_get_drvdata(dai->component);

	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(dai->component);

	unsigned int rate = params_rate(params);

	u8 asp_wl;

	int i;
@@ -877,16 +865,16 @@ static int cs35l41_pcm_startup(struct snd_pcm_substream *substream, 
{

	if (substream->runtime)

		return snd_pcm_hw_constraint_list(substream->runtime, 0,

				SNDRV_PCM_HW_PARAM_RATE, &cs35l41_constraints);

						  SNDRV_PCM_HW_PARAM_RATE,

						  &cs35l41_constraints);

	return 0;

}



static int cs35l41_component_set_sysclk(struct snd_soc_component *component,

				int clk_id, int source, unsigned int freq,

				int dir)

					int clk_id, int source,

					unsigned int freq, int dir)

{

	struct cs35l41_private *cs35l41 =

				       snd_soc_component_get_drvdata(component);

	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(component);

	int extclk_cfg, clksrc;



	switch (clk_id) {
@@ -936,24 +924,24 @@ static int cs35l41_component_set_sysclk(struct snd_soc_component *component, 
static int cs35l41_dai_set_sysclk(struct snd_soc_dai *dai,

				  int clk_id, unsigned int freq, int dir)

{

	struct cs35l41_private *cs35l41 =

				  snd_soc_component_get_drvdata(dai->component);

	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(dai->component);

	unsigned int fs1_val;

	unsigned int fs2_val;

	unsigned int val;

	int fsIndex;

	int fsindex;



	fsIndex = cs35l41_get_fs_mon_config_index(freq);

	if (fsIndex < 0) {

	fsindex = cs35l41_get_fs_mon_config_index(freq);

	if (fsindex < 0) {

		dev_err(cs35l41->dev, "Invalid CLK Config freq: %u\n", freq);

		return -EINVAL;

	}



	dev_dbg(cs35l41->dev, "Set DAI sysclk %d\n", freq);



	if (freq <= 6144000) {

		/* Use the lookup table */

		fs1_val = cs35l41_fs_mon[fsIndex].fs1;

		fs2_val = cs35l41_fs_mon[fsIndex].fs2;

		fs1_val = cs35l41_fs_mon[fsindex].fs1;

		fs2_val = cs35l41_fs_mon[fsindex].fs2;

	} else {

		/* Use hard-coded values */

		fs1_val = 0x10;
@@ -989,8 +977,7 @@ static int cs35l41_boost_config(struct cs35l41_private *cs35l41, 
		bst_lbst_val = 3;

		break;

	default:

		dev_err(dev, "Invalid boost inductor value: %d nH\n",

				boost_ind);

		dev_err(dev, "Invalid boost inductor value: %d nH\n", boost_ind);

		return -EINVAL;

	}
@@ -1032,7 +1019,7 @@ static int cs35l41_boost_config(struct cs35l41_private *cs35l41, 
		return ret;

	}



	if ((boost_ipk < 1600) || (boost_ipk > 4500)) {

	if (boost_ipk < 1600 || boost_ipk > 4500) {

		dev_err(dev, "Invalid boost inductor peak current: %d mA\n",

			boost_ipk);

		return -EINVAL;
@@ -1191,10 +1178,8 @@ static int cs35l41_handle_pdata(struct device *dev, 
					"cirrus,gpio1-output-enable");

	ret = device_property_read_u32(dev, "cirrus,gpio1-src-select",

				       &val);

	if (ret >= 0) {

		val |= CS35L41_VALID_PDATA;

		irq_gpio1_config->irq_src_sel = val;

	}

	if (ret >= 0)

		irq_gpio1_config->irq_src_sel = val | CS35L41_VALID_PDATA;



	/* GPIO2 Pin Config */

	irq_gpio2_config->irq_pol_inv = device_property_read_bool(dev,
@@ -1203,10 +1188,8 @@ static int cs35l41_handle_pdata(struct device *dev, 
					"cirrus,gpio2-output-enable");

	ret = device_property_read_u32(dev, "cirrus,gpio2-src-select",

				       &val);

	if (ret >= 0) {

		val |= CS35L41_VALID_PDATA;

		irq_gpio2_config->irq_src_sel = val;

	}

	if (ret >= 0)

		irq_gpio2_config->irq_src_sel = val | CS35L41_VALID_PDATA;



	return 0;

}
@@ -1266,8 +1249,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, 
	if (pdata) {

		cs35l41->pdata = *pdata;

	} else {

		ret = cs35l41_handle_pdata(cs35l41->dev, &cs35l41->pdata,

					     cs35l41);

		ret = cs35l41_handle_pdata(cs35l41->dev, &cs35l41->pdata, cs35l41);

		if (ret != 0)

			return ret;

	}
@@ -1278,16 +1260,13 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, 
	ret = devm_regulator_bulk_get(cs35l41->dev, CS35L41_NUM_SUPPLIES,

				      cs35l41->supplies);

	if (ret != 0) {

		dev_err(cs35l41->dev,

			"Failed to request core supplies: %d\n",

			ret);

		dev_err(cs35l41->dev, "Failed to request core supplies: %d\n", ret);

		return ret;

	}



	ret = regulator_bulk_enable(CS35L41_NUM_SUPPLIES, cs35l41->supplies);

	if (ret != 0) {

		dev_err(cs35l41->dev,

			"Failed to enable core supplies: %d\n", ret);

		dev_err(cs35l41->dev, "Failed to enable core supplies: %d\n", ret);

		return ret;

	}
@@ -1394,8 +1373,8 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, 
	regmap_write(cs35l41->regmap, CS35L41_IRQ1_MASK1,

		     CS35L41_INT1_MASK_DEFAULT);



	ret = devm_request_threaded_irq(cs35l41->dev, cs35l41->irq, NULL,

			cs35l41_irq, IRQF_ONESHOT | IRQF_SHARED | irq_pol,

	ret = devm_request_threaded_irq(cs35l41->dev, cs35l41->irq, NULL, cs35l41_irq,

					IRQF_ONESHOT | IRQF_SHARED | irq_pol,

					"cs35l41", cs35l41);



	/* CS35L41 needs INT for PDN_DONE */
@@ -1452,6 +1431,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, 
err:

	regulator_bulk_disable(CS35L41_NUM_SUPPLIES, cs35l41->supplies);

	gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);



	return ret;

}
@@ -1460,6 +1440,7 @@ int cs35l41_remove(struct cs35l41_private *cs35l41) 
	regmap_write(cs35l41->regmap, CS35L41_IRQ1_MASK1, 0xFFFFFFFF);

	regulator_bulk_disable(CS35L41_NUM_SUPPLIES, cs35l41->supplies);

	gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);



	return 0;

}

sound/soc/codecs/cs35l41.h

+40 −41
Original line number Diff line number Diff line
@@ -691,7 +691,6 @@ 
#define CS35L41_TEMP_WARN_ERR_RLS	0x20

#define CS35L41_TEMP_ERR_RLS		0x40





#define CS35L41_INT1_MASK_DEFAULT	0x7FFCFE3F

#define CS35L41_INT1_UNMASK_PUP		0xFEFFFFFF

#define CS35L41_INT1_UNMASK_PDN		0xFF7FFFFF
@@ -709,7 +708,7 @@ 
#define CS35L41_GPIO_POL_SHIFT		12



#define CS35L41_AMP_INV_PCM_SHIFT	14

#define CS35L41_AMP_INV_PCM_MASK	(1 << CS35L41_AMP_INV_PCM_SHIFT)

#define CS35L41_AMP_INV_PCM_MASK	BIT(CS35L41_AMP_INV_PCM_SHIFT)

#define CS35L41_AMP_PCM_VOL_SHIFT	3

#define CS35L41_AMP_PCM_VOL_MASK	(0x7FF << 3)

#define CS35L41_AMP_PCM_VOL_MUTE	0x4CF