Commit 9c5eb724 authored by Christophe Branchereau's avatar Christophe Branchereau Committed by Jonathan Cameron
Browse files

iio/adc: ingenic: rename has_aux2 to has_aux_md 



The jz4760(b) socs have 3 aux channels.

The purpose of has_aux2 is to set the MD bits used to select
the AUX channel to be sampled, not to describe the hardware.

Rename it to a more appropriate name.

Signed-off-by: default avatarChristophe Branchereau <cbranchereau@gmail.com>

Reviewed-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20210726082033.351533-2-cbranchereau@gmail.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 7a3605be

drivers/iio/adc/ingenic-adc.c

+5 −5
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct ingenic_adc_soc_data { 
	const int *battery_scale_avail;

	size_t battery_scale_avail_size;

	unsigned int battery_vref_mode: 1;

	unsigned int has_aux2: 1;

	unsigned int has_aux_md: 1;

	const struct iio_chan_spec *channels;

	unsigned int num_channels;

	int (*init_clk_div)(struct device *dev, struct ingenic_adc *adc);
@@ -506,7 +506,7 @@ static const struct ingenic_adc_soc_data jz4725b_adc_soc_data = { 
	.battery_scale_avail = jz4725b_adc_battery_scale_avail,

	.battery_scale_avail_size = ARRAY_SIZE(jz4725b_adc_battery_scale_avail),

	.battery_vref_mode = true,

	.has_aux2 = false,

	.has_aux_md = false,

	.channels = jz4740_channels,

	.num_channels = ARRAY_SIZE(jz4740_channels),

	.init_clk_div = jz4725b_adc_init_clk_div,
@@ -520,7 +520,7 @@ static const struct ingenic_adc_soc_data jz4740_adc_soc_data = { 
	.battery_scale_avail = jz4740_adc_battery_scale_avail,

	.battery_scale_avail_size = ARRAY_SIZE(jz4740_adc_battery_scale_avail),

	.battery_vref_mode = true,

	.has_aux2 = false,

	.has_aux_md = false,

	.channels = jz4740_channels,

	.num_channels = ARRAY_SIZE(jz4740_channels),

	.init_clk_div = NULL, /* no ADCLK register on JZ4740 */
@@ -534,7 +534,7 @@ static const struct ingenic_adc_soc_data jz4770_adc_soc_data = { 
	.battery_scale_avail = jz4770_adc_battery_scale_avail,

	.battery_scale_avail_size = ARRAY_SIZE(jz4770_adc_battery_scale_avail),

	.battery_vref_mode = false,

	.has_aux2 = true,

	.has_aux_md = true,

	.channels = jz4770_channels,

	.num_channels = ARRAY_SIZE(jz4770_channels),

	.init_clk_div = jz4770_adc_init_clk_div,
@@ -581,7 +581,7 @@ static int ingenic_adc_read_chan_info_raw(struct iio_dev *iio_dev, 


	/* We cannot sample AUX/AUX2 in parallel. */

	mutex_lock(&adc->aux_lock);

	if (adc->soc_data->has_aux2 && engine == 0) {

	if (adc->soc_data->has_aux_md && engine == 0) {

		bit = BIT(chan->channel == INGENIC_ADC_AUX2);

		ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_AUX_MD, bit);

	}