nexell: Drop old LCD code

This relies on the old LCD implementation which is to be removed. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-nexell/include/mach/display_dev.h b/arch/arm/mach-nexell/include/mach/display_dev.h
index f24fb1739cf3d88f4722d4b62ed23e8d3274a262..4c54a5ecd4c37173f9d8b81e84ce3de5364d1a76 100644 (file)
--- a/arch/arm/mach-nexell/include/mach/display_dev.h
+++ b/arch/arm/mach-nexell/include/mach/display_dev.h
@@ -8,14 +8,7 @@
 #ifndef _NX__DISPLAY_DEV_H_
 #define _NX__DISPLAY_DEV_H_
 
-#if !defined(CONFIG_DM_VIDEO) && defined(CONFIG_LCD)
-#include <lcd.h>
-#endif
-
 struct nx_display_dev {
-#if !defined(CONFIG_DM_VIDEO) && defined(CONFIG_LCD)
-       vidinfo_t *panel_info;
-#endif
        unsigned long base;
        int module;
        struct dp_sync_info sync;

diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 090fd6ea3268c3430cfbb268e9077e86fdb1b22b..42b8d926b6ae349d4550b29be634c90555123acb 100644 (file)
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -16,7 +16,6 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 #include <video.h>             /* For struct video_uc_plat */
-#include <lcd.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/display.h>
@@ -481,56 +480,6 @@ err_setup:
        return NULL;
 }
 
-#if defined CONFIG_LCD
-
-/* default lcd */
-struct vidinfo panel_info = {
-       .vl_col = 320, .vl_row = 240, .vl_bpix = 32,
-};
-
-void lcd_ctrl_init(void *lcdbase)
-{
-       vidinfo_t *pi = &panel_info;
-       struct nx_display_dev *dp;
-       int bpix;
-
-       dp = nx_display_setup();
-       if (!dp)
-               return NULL;
-
-       switch (dp->depth) {
-       case 2:
-               bpix = LCD_COLOR16;
-               break;
-       case 3:
-       case 4:
-               bpix = LCD_COLOR32;
-               break;
-       default:
-               printf("fail : not support LCD bit per pixel %d\n",
-                      dp->depth * 8);
-               return NULL;
-       }
-
-       dp->panel_info = pi;
-
-       /* set resolution with config */
-       pi->vl_bpix = bpix;
-       pi->vl_col = dp->fb_plane->width;
-       pi->vl_row = dp->fb_plane->height;
-       pi->priv = dp;
-       gd->fb_base = dp->fb_addr;
-}
-
-void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue)
-{
-}
-
-__weak void lcd_enable(void)
-{
-}
-#endif
-
 static int nx_display_probe(struct udevice *dev)
 {
        struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);