summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-nexell/include/mach/display_dev.h4
-rw-r--r--drivers/video/nexell_display.c14
2 files changed, 5 insertions, 13 deletions
diff --git a/arch/arm/mach-nexell/include/mach/display_dev.h b/arch/arm/mach-nexell/include/mach/display_dev.h
index 77eb614768c..0dd96f67957 100644
--- a/arch/arm/mach-nexell/include/mach/display_dev.h
+++ b/arch/arm/mach-nexell/include/mach/display_dev.h
@@ -15,8 +15,8 @@
#endif
struct nx_display_dev {
-#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO
- GraphicDevice graphic_device;
+#if defined CONFIG_DM_VIDEO
+ /* GraphicDevice graphic_device; -- not defined anymore */
#elif defined CONFIG_LCD
vidinfo_t *panel_info;
#endif
diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index c7621ef49c5..a0bd44c8b84 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -537,7 +537,6 @@ static int nx_display_probe(struct udevice *dev)
struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
struct video_priv *uc_priv = dev_get_uclass_priv(dev);
struct nx_display_plat *plat = dev_get_plat(dev);
- static GraphicDevice *graphic_device;
char addr[64];
debug("%s()\n", __func__);
@@ -564,7 +563,7 @@ static int nx_display_probe(struct udevice *dev)
}
struct nx_display_dev *dp;
- unsigned int pp_index = 0;
+ /* unsigned int pp_index = 0; */
dp = nx_display_setup();
if (!dp) {
@@ -574,6 +573,7 @@ static int nx_display_probe(struct udevice *dev)
}
switch (dp->depth) {
+#if 0 /* GDF_16BIT_565RGB is not defined in video.h */
case 2:
pp_index = GDF_16BIT_565RGB;
uc_priv->bpix = VIDEO_BPP16;
@@ -586,6 +586,7 @@ static int nx_display_probe(struct udevice *dev)
pp_index = GDF_32BIT_X888RGB;
uc_priv->bpix = VIDEO_BPP32;
break;
+#endif
default:
printf("fail : not support LCD bit per pixel %d\n",
dp->depth * 8);
@@ -596,15 +597,6 @@ static int nx_display_probe(struct udevice *dev)
uc_priv->ysize = dp->fb_plane->height;
uc_priv->rot = 0;
- graphic_device = &dp->graphic_device;
- graphic_device->frameAdrs = dp->fb_addr;
- graphic_device->gdfIndex = pp_index;
- graphic_device->gdfBytesPP = dp->depth;
- graphic_device->winSizeX = dp->fb_plane->width;
- graphic_device->winSizeY = dp->fb_plane->height;
- graphic_device->plnSizeX =
- graphic_device->winSizeX * graphic_device->gdfBytesPP;
-
/*
* set environment variable "fb_addr" (frame buffer address), required
* for splash image. Because drv_video_init() in common/stdio.c is only