diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-03-08 14:38:46 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2013-03-18 19:29:49 +0530 |
| commit | 693892d7c1bd0915de02e061ae3ca917a9f151c4 (patch) | |
| tree | 6f8d1eeef13a5bd1ca09a232f60888f52545387f | |
| parent | 410e63e79133b9e6b9788776cb4d0fd4baecee6d (diff) | |
video: s3c-fb: Skip GPIO setting for Arndale board
This is a hack to setup a dummy framebuffer.
Arndale board doesn't have GPIO lines for RGB_DATA[23:0], so skip
this.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | drivers/video/s3c-fb.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index 7288c89a0328..9b6421e39cac 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c @@ -30,6 +30,7 @@ #include <video/samsung_fimd.h> #include <mach/map.h> #include <plat/fb.h> +#include <plat/cpu.h> /* This driver will export a number of framebuffer interfaces depending * on the configuration passed in via the platform data. Each fb instance @@ -1420,6 +1421,9 @@ static int s3c_fb_dt_parse_gpios(struct device *dev, struct s3c_fb *sfb, { int nr_gpios, idx, gpio, ret; + if (soc_is_exynos5250()) + return 0; + nr_gpios = sfb->pdata->win[0]->max_bpp + 4; sfb->gpios = devm_kzalloc(dev, sizeof(int) * nr_gpios, GFP_KERNEL); if (!sfb->gpios) { @@ -1456,6 +1460,12 @@ static void s3c_fb_dt_free_gpios(struct s3c_fb *sfb) { unsigned int idx, nr_gpio; +<<<<<<< HEAD +======= + if (!IS_ERR(sfb->pctrl)) + return; + +>>>>>>> 8b3e129... video: s3c-fb: Skip GPIO setting for Arndale nr_gpio = sfb->pdata->win[0]->max_bpp + 4; for (idx = 0; idx < nr_gpio; idx++) gpio_free(sfb->gpios[idx]); |