Commit c7ac4475 authored by Chris Morgan's avatar Chris Morgan Committed by Jonathan Cameron
Browse files

iio: adc: axp20x_adc: Add adc_en1 and adc_en2 to axp_data 



Add the register for adc_en1 and adc_en2 to the axp_data struct. This
allows us to specify a different register to enable the adc channels
for different devices such as the AXP717.

Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarChris Morgan <macromorgan@hotmail.com>
Acked-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240821215456.962564-2-macroalpha82@gmail.com


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

drivers/iio/adc/axp20x_adc.c

+15 −7
Original line number Diff line number Diff line
@@ -889,7 +889,9 @@ struct axp_data { 
	const struct iio_info		*iio_info;

	int				num_channels;

	struct iio_chan_spec const	*channels;

	unsigned long			adc_en1;

	unsigned long			adc_en1_mask;

	unsigned long			adc_en2;

	unsigned long			adc_en2_mask;

	int				(*adc_rate)(struct axp20x_adc_iio *info,

						    int rate);
@@ -910,7 +912,9 @@ static const struct axp_data axp20x_data = { 
	.iio_info = &axp20x_adc_iio_info,

	.num_channels = ARRAY_SIZE(axp20x_adc_channels),

	.channels = axp20x_adc_channels,

	.adc_en1 = AXP20X_ADC_EN1,

	.adc_en1_mask = AXP20X_ADC_EN1_MASK,

	.adc_en2 = AXP20X_ADC_EN2,

	.adc_en2_mask = AXP20X_ADC_EN2_MASK,

	.adc_rate = axp20x_adc_rate,

	.maps = axp20x_maps,
@@ -920,6 +924,7 @@ static const struct axp_data axp22x_data = { 
	.iio_info = &axp22x_adc_iio_info,

	.num_channels = ARRAY_SIZE(axp22x_adc_channels),

	.channels = axp22x_adc_channels,

	.adc_en1 = AXP20X_ADC_EN1,

	.adc_en1_mask = AXP22X_ADC_EN1_MASK,

	.adc_rate = axp22x_adc_rate,

	.maps = axp22x_maps,
@@ -929,6 +934,7 @@ static const struct axp_data axp813_data = { 
	.iio_info = &axp813_adc_iio_info,

	.num_channels = ARRAY_SIZE(axp813_adc_channels),

	.channels = axp813_adc_channels,

	.adc_en1 = AXP20X_ADC_EN1,

	.adc_en1_mask = AXP22X_ADC_EN1_MASK,

	.adc_rate = axp813_adc_rate,

	.maps = axp22x_maps,
@@ -988,13 +994,15 @@ static int axp20x_probe(struct platform_device *pdev) 
	indio_dev->channels = info->data->channels;



	/* Enable the ADCs on IP */

	regmap_write(info->regmap, AXP20X_ADC_EN1, info->data->adc_en1_mask);

	regmap_write(info->regmap, info->data->adc_en1,

		     info->data->adc_en1_mask);



	if (info->data->adc_en2_mask)

		regmap_set_bits(info->regmap, AXP20X_ADC_EN2,

		regmap_set_bits(info->regmap, info->data->adc_en2,

				info->data->adc_en2_mask);



	/* Configure ADCs rate */

	if (info->data->adc_rate)

		info->data->adc_rate(info, 100);



	ret = iio_map_array_register(indio_dev, info->data->maps);
@@ -1015,10 +1023,10 @@ static int axp20x_probe(struct platform_device *pdev) 
	iio_map_array_unregister(indio_dev);



fail_map:

	regmap_write(info->regmap, AXP20X_ADC_EN1, 0);

	regmap_write(info->regmap, info->data->adc_en1, 0);



	if (info->data->adc_en2_mask)

		regmap_write(info->regmap, AXP20X_ADC_EN2, 0);

		regmap_write(info->regmap, info->data->adc_en2, 0);



	return ret;

}
@@ -1031,10 +1039,10 @@ static void axp20x_remove(struct platform_device *pdev) 
	iio_device_unregister(indio_dev);

	iio_map_array_unregister(indio_dev);



	regmap_write(info->regmap, AXP20X_ADC_EN1, 0);

	regmap_write(info->regmap, info->data->adc_en1, 0);



	if (info->data->adc_en2_mask)

		regmap_write(info->regmap, AXP20X_ADC_EN2, 0);

		regmap_write(info->regmap, info->data->adc_en2, 0);

}



static struct platform_driver axp20x_adc_driver = {