xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] v4l: vsp1: Remove unexisting rt clocks

Browse Source 
The VSP1 has no rt clock. Remove them from the driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Laurent Pinchart
2014-04-02 11:21:56 -03:00
committed by Mauro Carvalho Chehab
parent ce9c22443e
commit 4fc7878401
2 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/platform/vsp1/vsp1.h
View File

@@ -45,7 +45,6 @@ struct vsp1_device {
void __iomem *mmio; void __iomem *mmio;
struct clk *clock; struct clk *clock;
struct clk *rt_clock;
struct mutex lock; struct mutex lock;
int ref_count; int ref_count;

40
drivers/media/platform/vsp1/vsp1_drv.c
View File

@@ -329,33 +329,6 @@ static int vsp1_device_init(struct vsp1_device *vsp1)
return 0; return 0;
} }
static int vsp1_clocks_enable(struct vsp1_device *vsp1)
{
int ret;
ret = clk_prepare_enable(vsp1->clock);
if (ret < 0)
return ret;
if (IS_ERR(vsp1->rt_clock))
return 0;
ret = clk_prepare_enable(vsp1->rt_clock);
if (ret < 0) {
clk_disable_unprepare(vsp1->clock);
return ret;
}
return 0;
}
static void vsp1_clocks_disable(struct vsp1_device *vsp1)
{
if (!IS_ERR(vsp1->rt_clock))
clk_disable_unprepare(vsp1->rt_clock);
clk_disable_unprepare(vsp1->clock);
}
/* /*
* vsp1_device_get - Acquire the VSP1 device * vsp1_device_get - Acquire the VSP1 device
* *
@@ -373,7 +346,7 @@ struct vsp1_device *vsp1_device_get(struct vsp1_device *vsp1)
if (vsp1->ref_count > 0) if (vsp1->ref_count > 0)
goto done; goto done;
ret = vsp1_clocks_enable(vsp1); ret = clk_prepare_enable(vsp1->clock);
if (ret < 0) { if (ret < 0) {
__vsp1 = NULL; __vsp1 = NULL;
goto done; goto done;
@@ -381,7 +354,7 @@ struct vsp1_device *vsp1_device_get(struct vsp1_device *vsp1)
ret = vsp1_device_init(vsp1); ret = vsp1_device_init(vsp1);
if (ret < 0) { if (ret < 0) {
vsp1_clocks_disable(vsp1); clk_disable_unprepare(vsp1->clock);
__vsp1 = NULL; __vsp1 = NULL;
goto done; goto done;
} }
@@ -405,7 +378,7 @@ void vsp1_device_put(struct vsp1_device *vsp1)
mutex_lock(&vsp1->lock); mutex_lock(&vsp1->lock);
if (--vsp1->ref_count == 0) if (--vsp1->ref_count == 0)
vsp1_clocks_disable(vsp1); clk_disable_unprepare(vsp1->clock);
mutex_unlock(&vsp1->lock); mutex_unlock(&vsp1->lock);
} }
@@ -424,7 +397,7 @@ static int vsp1_pm_suspend(struct device *dev)
if (vsp1->ref_count == 0) if (vsp1->ref_count == 0)
return 0; return 0;
vsp1_clocks_disable(vsp1); clk_disable_unprepare(vsp1->clock);
return 0; return 0;
} }
@@ -437,7 +410,7 @@ static int vsp1_pm_resume(struct device *dev)
if (vsp1->ref_count) if (vsp1->ref_count)
return 0; return 0;
return vsp1_clocks_enable(vsp1); return clk_prepare_enable(vsp1->clock);
} }
#endif #endif
@@ -511,9 +484,6 @@ static int vsp1_probe(struct platform_device *pdev)
return PTR_ERR(vsp1->clock); return PTR_ERR(vsp1->clock);
} }
/* The RT clock is optional */
vsp1->rt_clock = devm_clk_get(&pdev->dev, "rt");
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!irq) { if (!irq) {
dev_err(&pdev->dev, "missing IRQ\n"); dev_err(&pdev->dev, "missing IRQ\n");