Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 204a6a25 authored by Fabrice Gasnier's avatar Fabrice Gasnier Committed by Jonathan Cameron
Browse files

iio: adc: stm32: make per instance bus clock optional 



STM32F4 requires one clock per ADC instance for register access. But,
newer version of ADC hardware block have common bus clock for all
instances (per instance driver isn't responsible for getting it).
So, make it optional by default. Still, enforce it's required on STM32F4.

Signed-off-by: default avatarFabrice Gasnier <fabrice.gasnier@st.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 64ad7f64

drivers/iio/adc/stm32-adc.c

+20 −8
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ struct stm32_adc; 
 * @regs:		registers descriptions

 * @adc_info:		per instance input channels definitions

 * @trigs:		external trigger sources

 * @clk_required:	clock is required

 * @start_conv:		routine to start conversions

 * @stop_conv:		routine to stop conversions

 */
@@ -167,6 +168,7 @@ struct stm32_adc_cfg { 
	const struct stm32_adc_regspec	*regs;

	const struct stm32_adc_info	*adc_info;

	struct stm32_adc_trig_info	*trigs;

	bool clk_required;

	void (*start_conv)(struct stm32_adc *, bool dma);

	void (*stop_conv)(struct stm32_adc *);

};
@@ -1145,15 +1147,22 @@ static int stm32_adc_probe(struct platform_device *pdev) 


	adc->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(adc->clk)) {

		ret = PTR_ERR(adc->clk);

		if (ret == -ENOENT && !adc->cfg->clk_required) {

			adc->clk = NULL;

		} else {

			dev_err(&pdev->dev, "Can't get clock\n");

		return PTR_ERR(adc->clk);

			return ret;

		}

	}



	if (adc->clk) {

		ret = clk_prepare_enable(adc->clk);

		if (ret < 0) {

			dev_err(&pdev->dev, "clk enable failed\n");

			return ret;

		}

	}



	ret = stm32_adc_of_get_resolution(indio_dev);

	if (ret < 0)
@@ -1196,6 +1205,7 @@ static int stm32_adc_probe(struct platform_device *pdev) 
		dma_release_channel(adc->dma_chan);

	}

err_clk_disable:

	if (adc->clk)

		clk_disable_unprepare(adc->clk);



	return ret;
@@ -1214,6 +1224,7 @@ static int stm32_adc_remove(struct platform_device *pdev) 
				  adc->rx_buf, adc->rx_dma_buf);

		dma_release_channel(adc->dma_chan);

	}

	if (adc->clk)

		clk_disable_unprepare(adc->clk);



	return 0;
@@ -1223,6 +1234,7 @@ static const struct stm32_adc_cfg stm32f4_adc_cfg = { 
	.regs = &stm32f4_adc_regspec,

	.adc_info = &stm32f4_adc_info,

	.trigs = stm32f4_adc_trigs,

	.clk_required = true,

	.start_conv = stm32f4_adc_start_conv,

	.stop_conv = stm32f4_adc_stop_conv,

};