Skip to contentSkip to conversation

ARM: Samsung: ADC: Move to clk_prepare_enable/clk_disable_unprepare

PATCH New Vasily Khoruzhick 3 participants 3 messages Jun 30, 2014 – Jul 8, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Vasily Khoruzhick

author
#0 lore raw

PATCH 1/1 ARM: Samsung: ADC: Move to clk_prepare_enable/clk_disable_unprepare

Use clk_prepare_enable/clk_disable_unprepare to make the driver work properly with common clock framework.

Signed-off-by Vasily Khoruzhick <[email protected]>
---
 arch/arm/plat-samsung/adc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/plat-samsung/adc.c +4 -4
index 79690f2..c5831b49 100644
@@ -389,7 +389,7 @@ static int s3c_adc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	clk_enable(adc->clk);
+	clk_prepare_enable(adc->clk);
 
 	tmp = adc->prescale | S3C2410_ADCCON_PRSCEN;
 

@@ -413,7 +413,7 @@ static int s3c_adc_remove(struct platform_device *pdev)
 {
 	struct adc_device *adc = platform_get_drvdata(pdev);
 
-	clk_disable(adc->clk);
+	clk_disable_unprepare(adc->clk);
 	regulator_disable(adc->vdd);
 
 	return 0;

@@ -436,7 +436,7 @@ static int s3c_adc_suspend(struct device *dev)
 
 	disable_irq(adc->irq);
 	spin_unlock_irqrestore(&adc->lock, flags);
-	clk_disable(adc->clk);
+	clk_disable_unprepare(adc->clk);
 	regulator_disable(adc->vdd);
 
 	return 0;

@@ -454,7 +454,7 @@ static int s3c_adc_resume(struct device *dev)
 	ret = regulator_enable(adc->vdd);
 	if (ret)
 		return ret;
-	clk_enable(adc->clk);
+	clk_prepare_enable(adc->clk);
 	enable_irq(adc->irq);
 
 	tmp = adc->prescale | S3C2410_ADCCON_PRSCEN;
Signature · 1 line
2.0.0
#1 lore raw

PATCH 1/1 ARM: Samsung: ADC: Move to clk_prepare_enable/clk_disable_unprepare

Hi Vasily,

Quoted 7 lines · Vasily Khoruzhick

Use clk_prepare_enable/clk_disable_unprepare to make the driver work properly with common clock framework.

Signed-off-by Vasily Khoruzhick <[email protected]>
---
 arch/arm/plat-samsung/adc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by Tomasz Figa <[email protected]>

--
Best regards,
Tomasz

#2 lore raw

PATCH 1/1 ARM: Samsung: ADC: Move to clk_prepare_enable/clk_disable_unprepare

Quoted 7 lines · Tomasz Figa

Hi Vasily,

Quoted 3 lines · Vasily Khoruzhick

Use clk_prepare_enable/clk_disable_unprepare to make the driver work properly with common clock framework.

Quoted 7 lines
Quoted 4 lines
Signed-off-by Vasily Khoruzhick <[email protected]>
---
 arch/arm/plat-samsung/adc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by Tomasz Figa <[email protected]>

Looks good to me, will apply.

Thanks,
Kukjin