diff options
Diffstat (limited to 'drivers/video/mxsfb.c')
| -rw-r--r-- | drivers/video/mxsfb.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index dc09ebe4aba5..d250ed0f806d 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -46,7 +46,6 @@ #include <linux/clk.h> #include <linux/dma-mapping.h> #include <linux/io.h> -#include <linux/pinctrl/consumer.h> #include <linux/fb.h> #include <linux/regulator/consumer.h> #include <video/of_display_timing.h> @@ -851,18 +850,11 @@ static int mxsfb_probe(struct platform_device *pdev) struct mxsfb_info *host; struct fb_info *fb_info; struct fb_modelist *modelist; - struct pinctrl *pinctrl; int ret; if (of_id) pdev->id_entry = of_id->data; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "Cannot get memory IO resource\n"); - return -ENODEV; - } - fb_info = framebuffer_alloc(sizeof(struct mxsfb_info), &pdev->dev); if (!fb_info) { dev_err(&pdev->dev, "Failed to allocate fbdev\n"); @@ -871,6 +863,7 @@ static int mxsfb_probe(struct platform_device *pdev) host = to_imxfb_host(fb_info); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); host->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(host->base)) { ret = PTR_ERR(host->base); @@ -882,12 +875,6 @@ static int mxsfb_probe(struct platform_device *pdev) host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data]; - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - ret = PTR_ERR(pinctrl); - goto fb_release; - } - host->clk = devm_clk_get(&host->pdev->dev, NULL); if (IS_ERR(host->clk)) { ret = PTR_ERR(host->clk); |