mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
sh: sh_mobile ceu clock framework support
Add clock framework support to the sh_mobile ceu and adjust the board specific code accordingly. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
090d951b69
commit
a42b6dd69c
3 changed files with 21 additions and 3 deletions
|
@ -303,6 +303,7 @@ static struct resource ceu_resources[] = {
|
|||
|
||||
static struct platform_device ceu_device = {
|
||||
.name = "sh_mobile_ceu",
|
||||
.id = 0, /* "ceu0" clock */
|
||||
.num_resources = ARRAY_SIZE(ceu_resources),
|
||||
.resource = ceu_resources,
|
||||
.dev = {
|
||||
|
@ -375,7 +376,6 @@ static int __init ap325rxa_devices_setup(void)
|
|||
gpio_direction_output(GPIO_PTS3, 1);
|
||||
|
||||
/* CEU */
|
||||
clk_always_enable("mstp203");
|
||||
gpio_request(GPIO_FN_VIO_CLK2, NULL);
|
||||
gpio_request(GPIO_FN_VIO_VD2, NULL);
|
||||
gpio_request(GPIO_FN_VIO_HD2, NULL);
|
||||
|
|
|
@ -433,6 +433,7 @@ static struct resource migor_ceu_resources[] = {
|
|||
|
||||
static struct platform_device migor_ceu_device = {
|
||||
.name = "sh_mobile_ceu",
|
||||
.id = 0, /* "ceu0" clock */
|
||||
.num_resources = ARRAY_SIZE(migor_ceu_resources),
|
||||
.resource = migor_ceu_resources,
|
||||
.dev = {
|
||||
|
@ -554,7 +555,6 @@ static int __init migor_devices_setup(void)
|
|||
#endif
|
||||
|
||||
/* CEU */
|
||||
clk_always_enable("mstp203"); /* CEU */
|
||||
gpio_request(GPIO_FN_VIO_CLK2, NULL);
|
||||
gpio_request(GPIO_FN_VIO_VD2, NULL);
|
||||
gpio_request(GPIO_FN_VIO_HD2, NULL);
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <linux/clk.h>
|
||||
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
|
@ -89,6 +90,7 @@ struct sh_mobile_ceu_dev {
|
|||
|
||||
unsigned int irq;
|
||||
void __iomem *base;
|
||||
struct clk *clk;
|
||||
unsigned long video_limit;
|
||||
|
||||
/* lock used to protect videobuf */
|
||||
|
@ -309,6 +311,8 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
|
|||
if (ret)
|
||||
goto err;
|
||||
|
||||
clk_enable(pcdev->clk);
|
||||
|
||||
ceu_write(pcdev, CAPSR, 1 << 16); /* reset */
|
||||
while (ceu_read(pcdev, CSTSR) & 1)
|
||||
msleep(1);
|
||||
|
@ -342,6 +346,8 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
|
|||
}
|
||||
spin_unlock_irqrestore(&pcdev->lock, flags);
|
||||
|
||||
clk_disable(pcdev->clk);
|
||||
|
||||
icd->ops->release(icd);
|
||||
|
||||
dev_info(&icd->dev,
|
||||
|
@ -550,6 +556,7 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
|
|||
struct sh_mobile_ceu_dev *pcdev;
|
||||
struct resource *res;
|
||||
void __iomem *base;
|
||||
char clk_name[8];
|
||||
unsigned int irq;
|
||||
int err = 0;
|
||||
|
||||
|
@ -615,6 +622,14 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
|
|||
goto exit_release_mem;
|
||||
}
|
||||
|
||||
snprintf(clk_name, sizeof(clk_name), "ceu%d", pdev->id);
|
||||
pcdev->clk = clk_get(&pdev->dev, clk_name);
|
||||
if (IS_ERR(pcdev->clk)) {
|
||||
dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
|
||||
err = PTR_ERR(pcdev->clk);
|
||||
goto exit_free_irq;
|
||||
}
|
||||
|
||||
pcdev->ici.priv = pcdev;
|
||||
pcdev->ici.dev.parent = &pdev->dev;
|
||||
pcdev->ici.nr = pdev->id;
|
||||
|
@ -623,10 +638,12 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
|
|||
|
||||
err = soc_camera_host_register(&pcdev->ici);
|
||||
if (err)
|
||||
goto exit_free_irq;
|
||||
goto exit_free_clk;
|
||||
|
||||
return 0;
|
||||
|
||||
exit_free_clk:
|
||||
clk_put(pcdev->clk);
|
||||
exit_free_irq:
|
||||
free_irq(pcdev->irq, pcdev);
|
||||
exit_release_mem:
|
||||
|
@ -645,6 +662,7 @@ static int sh_mobile_ceu_remove(struct platform_device *pdev)
|
|||
struct sh_mobile_ceu_dev *pcdev = platform_get_drvdata(pdev);
|
||||
|
||||
soc_camera_host_unregister(&pcdev->ici);
|
||||
clk_put(pcdev->clk);
|
||||
free_irq(pcdev->irq, pcdev);
|
||||
if (platform_get_resource(pdev, IORESOURCE_MEM, 1))
|
||||
dma_release_declared_memory(&pdev->dev);
|
||||
|
|
Loading…
Reference in a new issue