diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/atmel_lcdfb_core.c | 8 | ||||
-rw-r--r-- | drivers/video/imx-ipu-fb.c | 8 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/imx-hdmi.c | 8 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/ipu-common.c | 8 | ||||
-rw-r--r-- | drivers/video/imx.c | 8 | ||||
-rw-r--r-- | drivers/video/pxa.c | 8 | ||||
-rw-r--r-- | drivers/video/s3c24xx.c | 6 | ||||
-rw-r--r-- | drivers/video/stm.c | 6 |
8 files changed, 40 insertions, 20 deletions
diff --git a/drivers/video/atmel_lcdfb_core.c b/drivers/video/atmel_lcdfb_core.c index 76116af1da..555799ea4b 100644 --- a/drivers/video/atmel_lcdfb_core.c +++ b/drivers/video/atmel_lcdfb_core.c @@ -245,6 +245,7 @@ static struct fb_ops atmel_lcdc_ops = { int atmel_lcdc_register(struct device_d *dev, struct atmel_lcdfb_devdata *data) { + struct resource *iores; struct atmel_lcdfb_info *sinfo; struct atmel_lcdfb_platform_data *pdata = dev->platform_data; int ret = 0; @@ -257,9 +258,10 @@ int atmel_lcdc_register(struct device_d *dev, struct atmel_lcdfb_devdata *data) sinfo = xzalloc(sizeof(*sinfo)); sinfo->pdata = pdata; - sinfo->mmio = dev_request_mem_region(dev, 0); - if (IS_ERR(sinfo->mmio)) - return PTR_ERR(sinfo->mmio); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + sinfo->mmio = IOMEM(iores->start); sinfo->dev_data = data; diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index 03d191a331..7c3a800149 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -988,6 +988,7 @@ static int sdc_fb_register_overlay(struct ipu_fb_info *fbi, void *fb) static int imxfb_probe(struct device_d *dev) { + struct resource *iores; struct ipu_fb_info *fbi; struct fb_info *info; const struct imx_ipu_fb_platform_data *pdata = dev->platform_data; @@ -1003,9 +1004,10 @@ static int imxfb_probe(struct device_d *dev) if (IS_ERR(fbi->clk)) return PTR_ERR(fbi->clk); - fbi->regs = dev_request_mem_region(dev, 0); - if (IS_ERR(fbi->regs)) - return PTR_ERR(fbi->regs); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + fbi->regs = IOMEM(iores->start); fbi->dev = dev; fbi->enable = pdata->enable; fbi->disp_data_fmt = pdata->disp_data_fmt; diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c index 49cbca16e6..8b251a52ea 100644 --- a/drivers/video/imx-ipu-v3/imx-hdmi.c +++ b/drivers/video/imx-ipu-v3/imx-hdmi.c @@ -1271,6 +1271,7 @@ static int dw_hdmi_ioctl(struct vpl *vpl, unsigned int port, static int dw_hdmi_probe(struct device_d *dev) { + struct resource *iores; struct device_node *np = dev->device_node; struct dw_hdmi *hdmi; int ret; @@ -1293,9 +1294,10 @@ static int dw_hdmi_probe(struct device_d *dev) hdmi->ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0); - hdmi->regs = dev_request_mem_region(dev, 0); - if (IS_ERR(hdmi->regs)) - return PTR_ERR(hdmi->regs); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + hdmi->regs = IOMEM(iores->start); hdmi->isfr_clk = clk_get(hdmi->dev, "isfr"); if (IS_ERR(hdmi->isfr_clk)) { diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c index 398eefbd5b..1811e50227 100644 --- a/drivers/video/imx-ipu-v3/ipu-common.c +++ b/drivers/video/imx-ipu-v3/ipu-common.c @@ -751,6 +751,7 @@ err_register: static int ipu_probe(struct device_d *dev) { + struct resource *iores; struct ipu_soc *ipu; void __iomem *ipu_base; int i, ret; @@ -760,9 +761,10 @@ static int ipu_probe(struct device_d *dev) if (ret) return ret; - ipu_base = dev_request_mem_region(dev, 0); - if (IS_ERR(ipu_base)) - return PTR_ERR(ipu_base); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + ipu_base = IOMEM(iores->start); ipu = xzalloc(sizeof(*ipu)); diff --git a/drivers/video/imx.c b/drivers/video/imx.c index 11d49c6cfb..78cb5c0ca2 100644 --- a/drivers/video/imx.c +++ b/drivers/video/imx.c @@ -539,6 +539,7 @@ static int imxfb_register_overlay(struct imxfb_info *fbi, void *fb) static int imxfb_probe(struct device_d *dev) { + struct resource *iores; struct imxfb_info *fbi; struct fb_info *info; struct imx_fb_platform_data *pdata = dev->platform_data; @@ -573,9 +574,10 @@ static int imxfb_probe(struct device_d *dev) return PTR_ERR(fbi->ipg_clk); fbi->mode = pdata->mode; - fbi->regs = dev_request_mem_region(dev, 0); - if (IS_ERR(fbi->regs)) - return PTR_ERR(fbi->regs); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + fbi->regs = IOMEM(iores->start); fbi->pcr = pdata->mode->pcr; fbi->pwmr = pdata->pwmr; diff --git a/drivers/video/pxa.c b/drivers/video/pxa.c index e76404d9c9..d444e0981f 100644 --- a/drivers/video/pxa.c +++ b/drivers/video/pxa.c @@ -487,6 +487,7 @@ static struct fb_ops pxafb_ops = { static int pxafb_probe(struct device_d *dev) { + struct resource *iores; struct pxafb_platform_data *pdata = dev->platform_data; struct pxafb_info *fbi; struct fb_info *info; @@ -499,9 +500,10 @@ static int pxafb_probe(struct device_d *dev) info = &fbi->info; fbi->mode = pdata->mode; - fbi->regs = dev_request_mem_region(dev, 0); - if (IS_ERR(fbi->regs)) - return PTR_ERR(fbi->regs); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + fbi->regs = IOMEM(iores->start); fbi->dev = dev; fbi->lcd_power = pdata->lcd_power; diff --git a/drivers/video/s3c24xx.c b/drivers/video/s3c24xx.c index b1883e232c..84ed0aee39 100644 --- a/drivers/video/s3c24xx.c +++ b/drivers/video/s3c24xx.c @@ -358,13 +358,17 @@ static struct s3cfb_info fbi = { static int s3cfb_probe(struct device_d *hw_dev) { + struct resource *iores; struct s3c_fb_platform_data *pdata = hw_dev->platform_data; int ret; if (! pdata) return -ENODEV; - fbi.base = dev_request_mem_region(hw_dev, 0); + iores = dev_request_mem_resource(hw_dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + fbi.base = IOMEM(iores->start); writel(0, fbi.base + LCDCON1); writel(0, fbi.base + LCDCON5); /* FIXME not 0 for some displays */ diff --git a/drivers/video/stm.c b/drivers/video/stm.c index e5c1ef3974..0c190d36ae 100644 --- a/drivers/video/stm.c +++ b/drivers/video/stm.c @@ -505,6 +505,7 @@ static struct imxfb_info fbi = { static int stmfb_probe(struct device_d *hw_dev) { + struct resource *iores; struct imx_fb_platformdata *pdata = hw_dev->platform_data; int ret; @@ -513,7 +514,10 @@ static int stmfb_probe(struct device_d *hw_dev) /* add runtime hardware info */ fbi.hw_dev = hw_dev; - fbi.base = dev_request_mem_region(hw_dev, 0); + iores = dev_request_mem_resource(hw_dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + fbi.base = IOMEM(iores->start); fbi.clk = clk_get(hw_dev, NULL); if (IS_ERR(fbi.clk)) return PTR_ERR(fbi.clk); |