Commit 9fd243c4 authored by Fabrice Gasnier's avatar Fabrice Gasnier Committed by Jonathan Cameron

iio: adc: stm32: make core adc clock optional by default

Analog clock input is mandatory on stm32f4. But newer version of
ADC hardware block allow to select either bus clock or asynchronous
clock, for analog circuitry.

So, make it optional by default, but enforce clk presence on stm32f4.
Signed-off-by: default avatarFabrice Gasnier <fabrice.gasnier@st.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent aaf0ceb3
...@@ -85,13 +85,21 @@ static int stm32f4_adc_clk_sel(struct platform_device *pdev, ...@@ -85,13 +85,21 @@ static int stm32f4_adc_clk_sel(struct platform_device *pdev,
u32 val; u32 val;
int i; int i;
/* stm32f4 has one clk input for analog (mandatory), enforce it here */
if (!priv->aclk) {
dev_err(&pdev->dev, "No 'adc' clock found\n");
return -ENOENT;
}
rate = clk_get_rate(priv->aclk); rate = clk_get_rate(priv->aclk);
for (i = 0; i < ARRAY_SIZE(stm32f4_pclk_div); i++) { for (i = 0; i < ARRAY_SIZE(stm32f4_pclk_div); i++) {
if ((rate / stm32f4_pclk_div[i]) <= STM32F4_ADC_MAX_CLK_RATE) if ((rate / stm32f4_pclk_div[i]) <= STM32F4_ADC_MAX_CLK_RATE)
break; break;
} }
if (i >= ARRAY_SIZE(stm32f4_pclk_div)) if (i >= ARRAY_SIZE(stm32f4_pclk_div)) {
dev_err(&pdev->dev, "adc clk selection failed\n");
return -EINVAL; return -EINVAL;
}
val = readl_relaxed(priv->common.base + STM32F4_ADC_CCR); val = readl_relaxed(priv->common.base + STM32F4_ADC_CCR);
val &= ~STM32F4_ADC_ADCPRE_MASK; val &= ~STM32F4_ADC_ADCPRE_MASK;
...@@ -227,21 +235,25 @@ static int stm32_adc_probe(struct platform_device *pdev) ...@@ -227,21 +235,25 @@ static int stm32_adc_probe(struct platform_device *pdev)
priv->aclk = devm_clk_get(&pdev->dev, "adc"); priv->aclk = devm_clk_get(&pdev->dev, "adc");
if (IS_ERR(priv->aclk)) { if (IS_ERR(priv->aclk)) {
ret = PTR_ERR(priv->aclk); ret = PTR_ERR(priv->aclk);
dev_err(&pdev->dev, "Can't get 'adc' clock\n"); if (ret == -ENOENT) {
goto err_regulator_disable; priv->aclk = NULL;
} else {
dev_err(&pdev->dev, "Can't get 'adc' clock\n");
goto err_regulator_disable;
}
} }
ret = clk_prepare_enable(priv->aclk); if (priv->aclk) {
if (ret < 0) { ret = clk_prepare_enable(priv->aclk);
dev_err(&pdev->dev, "adc clk enable failed\n"); if (ret < 0) {
goto err_regulator_disable; dev_err(&pdev->dev, "adc clk enable failed\n");
goto err_regulator_disable;
}
} }
ret = stm32f4_adc_clk_sel(pdev, priv); ret = stm32f4_adc_clk_sel(pdev, priv);
if (ret < 0) { if (ret < 0)
dev_err(&pdev->dev, "adc clk selection failed\n");
goto err_clk_disable; goto err_clk_disable;
}
ret = stm32_adc_irq_probe(pdev, priv); ret = stm32_adc_irq_probe(pdev, priv);
if (ret < 0) if (ret < 0)
...@@ -261,7 +273,8 @@ static int stm32_adc_probe(struct platform_device *pdev) ...@@ -261,7 +273,8 @@ static int stm32_adc_probe(struct platform_device *pdev)
stm32_adc_irq_remove(pdev, priv); stm32_adc_irq_remove(pdev, priv);
err_clk_disable: err_clk_disable:
clk_disable_unprepare(priv->aclk); if (priv->aclk)
clk_disable_unprepare(priv->aclk);
err_regulator_disable: err_regulator_disable:
regulator_disable(priv->vref); regulator_disable(priv->vref);
...@@ -276,7 +289,8 @@ static int stm32_adc_remove(struct platform_device *pdev) ...@@ -276,7 +289,8 @@ static int stm32_adc_remove(struct platform_device *pdev)
of_platform_depopulate(&pdev->dev); of_platform_depopulate(&pdev->dev);
stm32_adc_irq_remove(pdev, priv); stm32_adc_irq_remove(pdev, priv);
clk_disable_unprepare(priv->aclk); if (priv->aclk)
clk_disable_unprepare(priv->aclk);
regulator_disable(priv->vref); regulator_disable(priv->vref);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment