OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

video: xilinxfb: Group bus initialization 

Move of_address_to_resource() to xilinxfb_assign()
which simplify driver probing.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Michal Simek 2013-06-03 12:13:20 +02:00 committed by Tomi Valkeinen
parent c88fafef01
commit a8f045aa07
1 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/video/xilinxfb.c
View File

@ -227,33 +227,23 @@ static struct fb_ops xilinxfb_ops =
* Bus independent setup/teardown * Bus independent setup/teardown
*/ */
static int xilinxfb_assign(struct device *dev, static int xilinxfb_assign(struct platform_device *pdev,
struct xilinxfb_drvdata *drvdata, struct xilinxfb_drvdata *drvdata,
unsigned long physaddr,
struct xilinxfb_platform_data *pdata) struct xilinxfb_platform_data *pdata)
{ {
int rc; int rc;
struct device *dev = &pdev->dev;
int fbsize = pdata->xvirt * pdata->yvirt * BYTES_PER_PIXEL; int fbsize = pdata->xvirt * pdata->yvirt * BYTES_PER_PIXEL;
if (drvdata->flags & BUS_ACCESS_FLAG) { if (drvdata->flags & BUS_ACCESS_FLAG) {
/* struct resource *res;
* Map the control registers in if the controller
* is on direct BUS interface.
*/
if (!request_mem_region(physaddr, 8, DRIVER_NAME)) {
dev_err(dev, "Couldn't lock memory region at 0x%08lX\n",
physaddr);
rc = -ENODEV;
goto err_region;
}
drvdata->regs_phys = physaddr; res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
drvdata->regs = ioremap(physaddr, 8); drvdata->regs_phys = res->start;
drvdata->regs = devm_request_and_ioremap(&pdev->dev, res);
if (!drvdata->regs) { if (!drvdata->regs) {
dev_err(dev, "Couldn't lock memory region at 0x%08lX\n", rc = -EADDRNOTAVAIL;
physaddr); goto err_region;
rc = -ENODEV;
goto err_map;
} }
} }
@ -349,11 +339,7 @@ err_cmap:
err_fbmem: err_fbmem:
if (drvdata->flags & BUS_ACCESS_FLAG) if (drvdata->flags & BUS_ACCESS_FLAG)
iounmap(drvdata->regs); devm_iounmap(dev, drvdata->regs);
err_map:
if (drvdata->flags & BUS_ACCESS_FLAG)
release_mem_region(drvdata->regs_phys, 8);
err_region: err_region:
kfree(drvdata); kfree(drvdata);
@ -384,10 +370,8 @@ static int xilinxfb_release(struct device *dev)
xilinx_fb_out32(drvdata, REG_CTRL, 0); xilinx_fb_out32(drvdata, REG_CTRL, 0);
/* Release the resources, as allocated based on interface */ /* Release the resources, as allocated based on interface */
if (drvdata->flags & BUS_ACCESS_FLAG) { if (drvdata->flags & BUS_ACCESS_FLAG)
iounmap(drvdata->regs); devm_iounmap(dev, drvdata->regs);
release_mem_region(drvdata->regs_phys, 8);
}
#ifdef CONFIG_PPC_DCR #ifdef CONFIG_PPC_DCR
else else
dcr_unmap(drvdata->dcr_host, drvdata->dcr_len); dcr_unmap(drvdata->dcr_host, drvdata->dcr_len);
@ -408,8 +392,7 @@ static int xilinxfb_of_probe(struct platform_device *op)
const u32 *prop; const u32 *prop;
u32 tft_access = 0; u32 tft_access = 0;
struct xilinxfb_platform_data pdata; struct xilinxfb_platform_data pdata;
struct resource res; int size;
int size, rc;
struct xilinxfb_drvdata *drvdata; struct xilinxfb_drvdata *drvdata;
/* Copy with the default pdata (not a ptr reference!) */ /* Copy with the default pdata (not a ptr reference!) */
@ -435,22 +418,17 @@ static int xilinxfb_of_probe(struct platform_device *op)
*/ */
if (tft_access) { if (tft_access) {
drvdata->flags |= BUS_ACCESS_FLAG; drvdata->flags |= BUS_ACCESS_FLAG;
rc = of_address_to_resource(op->dev.of_node, 0, &res);
if (rc) {
dev_err(&op->dev, "invalid address\n");
goto err;
}
} }
#ifdef CONFIG_PPC_DCR #ifdef CONFIG_PPC_DCR
else { else {
int start; int start;
res.start = 0;
start = dcr_resource_start(op->dev.of_node, 0); start = dcr_resource_start(op->dev.of_node, 0);
drvdata->dcr_len = dcr_resource_len(op->dev.of_node, 0); drvdata->dcr_len = dcr_resource_len(op->dev.of_node, 0);
drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len); drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len);
if (!DCR_MAP_OK(drvdata->dcr_host)) { if (!DCR_MAP_OK(drvdata->dcr_host)) {
dev_err(&op->dev, "invalid DCR address\n"); dev_err(&op->dev, "invalid DCR address\n");
goto err; kfree(drvdata);
return -ENODEV;
} }
} }
#endif #endif
@ -477,11 +455,7 @@ static int xilinxfb_of_probe(struct platform_device *op)
pdata.rotate_screen = 1; pdata.rotate_screen = 1;
dev_set_drvdata(&op->dev, drvdata); dev_set_drvdata(&op->dev, drvdata);
return xilinxfb_assign(&op->dev, drvdata, res.start, &pdata); return xilinxfb_assign(op, drvdata, &pdata);
err:
kfree(drvdata);
return -ENODEV;
} }
static int xilinxfb_of_remove(struct platform_device *op) static int xilinxfb_of_remove(struct platform_device *op)