leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] v4l2: blackfin: select proper pinctrl state in ppi_set_params if CONFIG_PINCTRL is enabled

Browse Source 
Multiple pinctrl states are defined for 8, 16 and 24 data pin groups in PPI peripheral.
The driver should select correct group before set up further PPI parameters.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Sonic Zhang 2014-07-23 06:57:16 -03:00 committed by Mauro Carvalho Chehab
parent 7ba3c21c17
commit 0a6824bc10
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/platform/blackfin/ppi.c
View File

@ -206,6 +206,20 @@ static int ppi_set_params(struct ppi_if *ppi, struct ppi_params *params)
int dma_config, bytes_per_line; int dma_config, bytes_per_line;
int hcount, hdelay, samples_per_line; int hcount, hdelay, samples_per_line;
#ifdef CONFIG_PINCTRL
static const char * const pin_state[] = {"8bit", "16bit", "24bit"};
struct pinctrl *pctrl;
struct pinctrl_state *pstate;
if (params->dlen > 24 || params->dlen <= 0)
return -EINVAL;
pctrl = devm_pinctrl_get(ppi->dev);
pstate = pinctrl_lookup_state(pctrl,
pin_state[(params->dlen + 7) / 8 - 1]);
if (pinctrl_select_state(pctrl, pstate))
return -EINVAL;
#endif
bytes_per_line = params->width * params->bpp / 8; bytes_per_line = params->width * params->bpp / 8;
/* convert parameters unit from pixels to samples */ /* convert parameters unit from pixels to samples */
hcount = params->width * params->bpp / params->dlen; hcount = params->width * params->bpp / params->dlen;
@ -316,10 +330,12 @@ struct ppi_if *ppi_create_instance(struct platform_device *pdev,
if (!info || !info->pin_req) if (!info || !info->pin_req)
return NULL; return NULL;
#ifndef CONFIG_PINCTRL
if (peripheral_request_list(info->pin_req, KBUILD_MODNAME)) { if (peripheral_request_list(info->pin_req, KBUILD_MODNAME)) {
dev_err(&pdev->dev, "request peripheral failed\n"); dev_err(&pdev->dev, "request peripheral failed\n");
return NULL; return NULL;
} }
#endif
ppi = kzalloc(sizeof(*ppi), GFP_KERNEL); ppi = kzalloc(sizeof(*ppi), GFP_KERNEL);
if (!ppi) { if (!ppi) {
@ -329,6 +345,7 @@ struct ppi_if *ppi_create_instance(struct platform_device *pdev,
} }
ppi->ops = &ppi_ops; ppi->ops = &ppi_ops;
ppi->info = info; ppi->info = info;
ppi->dev = &pdev->dev;
pr_info("ppi probe success\n"); pr_info("ppi probe success\n");
return ppi; return ppi;

1
include/media/blackfin/ppi.h
View File

@ -83,6 +83,7 @@ struct ppi_info {
}; };
struct ppi_if { struct ppi_if {
struct device *dev;
unsigned long ppi_control; unsigned long ppi_control;
const struct ppi_ops *ops; const struct ppi_ops *ops;
const struct ppi_info *info; const struct ppi_info *info;