staging: msm: remove video drivers for obsolete platforms

Start cleaning up the msm framebuffer in preparation
for integration with mainline. Remove unused drivers.

Signed-off-by: Neil Leeder <nleeder@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/msm/Kconfig b/drivers/staging/msm/Kconfig
index c57039f2060b29d76e5794fd954e1bf5e5ef89f4..c5309eec58fa96ca34a547b7bfbc3bda9275adb4 100644 (file)
--- a/drivers/staging/msm/Kconfig
+++ b/drivers/staging/msm/Kconfig
@@ -46,21 +46,11 @@ config FB_MSM_LCDC_PRISM_WVGA
        select FB_MSM_LCDC_PANEL
        default n
 
-config FB_MSM_LCDC_ST1_WXGA
-       bool
-       select FB_MSM_LCDC_PANEL
-       default n
-
 config FB_MSM_LCDC_ST15_WXGA
         bool
         select FB_MSM_LCDC_PANEL
         default n
 
-config FB_MSM_LCDC_WXGA
-       bool
-       select FB_MSM_LCDC_PANEL
-       default n
-
 choice
        prompt "LCD Panel"
        default FB_MSM_LCDC_ST15_PANEL

diff --git a/drivers/staging/msm/Makefile b/drivers/staging/msm/Makefile
index 98a0ce177cb28c8ee7d585f5f3200708f658f86d..bb3606faf20e975bc76db09d488f1615a5b73244 100644 (file)
--- a/drivers/staging/msm/Makefile
+++ b/drivers/staging/msm/Makefile
@@ -61,14 +61,12 @@ obj-y += mddi_prism.o
 obj-y += mddi_toshiba.o
 obj-y += mddi_toshiba_vga.o
 obj-y += mddi_toshiba_wvga_pt.o
-obj-y += mddi_toshiba_wvga.o
 obj-y += mddi_sharp.o
 else
 obj-$(CONFIG_FB_MSM_MDDI_PRISM_WVGA) += mddi_prism.o
 obj-$(CONFIG_FB_MSM_MDDI_TOSHIBA_COMMON) += mddi_toshiba.o
 obj-$(CONFIG_FB_MSM_MDDI_TOSHIBA_COMMON_VGA) += mddi_toshiba_vga.o
 obj-$(CONFIG_FB_MSM_MDDI_TOSHIBA_WVGA_PORTRAIT) += mddi_toshiba_wvga_pt.o
-obj-$(CONFIG_FB_MSM_MDDI_TOSHIBA_WVGA) += mddi_toshiba_wvga.o
 obj-$(CONFIG_FB_MSM_MDDI_SHARP_QVGA_128x128) += mddi_sharp.o
 endif
 
@@ -76,11 +74,8 @@ obj-$(CONFIG_FB_MSM_LCDC_PANEL) += lcdc_panel.o
 obj-$(CONFIG_FB_MSM_LCDC_PRISM_WVGA) += lcdc_prism.o
 obj-$(CONFIG_FB_MSM_LCDC_EXTERNAL_WXGA) += lcdc_external.o
 obj-$(CONFIG_FB_MSM_LCDC_GORDON_VGA) += lcdc_gordon.o
-obj-$(CONFIG_FB_MSM_LCDC_WXGA) += lcdc_wxga.o
 obj-$(CONFIG_FB_MSM_LCDC_TOSHIBA_WVGA_PT) += lcdc_toshiba_wvga_pt.o
 obj-$(CONFIG_FB_MSM_LCDC_SHARP_WVGA_PT) += lcdc_sharp_wvga_pt.o
-obj-$(CONFIG_FB_MSM_LCDC_GRAPEFRUIT_VGA) += lcdc_grapefruit.o
-obj-$(CONFIG_FB_MSM_LCDC_ST1_WXGA) += lcdc_st1_wxga.o
 obj-$(CONFIG_FB_MSM_LCDC_ST15_WXGA) += lcdc_st15.o
 obj-$(CONFIG_FB_MSM_HDMI_SII_EXTERNAL_720P) += hdmi_sii9022.o
 

diff --git a/drivers/staging/msm/lcdc_grapefruit.c b/drivers/staging/msm/lcdc_grapefruit.c
deleted file mode 100644 (file)
index 7284649..0000000
--- a/drivers/staging/msm/lcdc_grapefruit.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "msm_fb.h"
-
-#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
-#include "mddihosti.h"
-#endif
-
-static int __init lcdc_grapefruit_init(void)
-{
-       int ret;
-       struct msm_panel_info pinfo;
-
-#ifdef CONFIG_FB_MSM_TRY_MDDI_CATCH_LCDC_PRISM
-       if (msm_fb_detect_client("lcdc_grapefruit_vga"))
-               return 0;
-#endif
-
-       pinfo.xres = 1024;
-       pinfo.yres = 600;
-       pinfo.type = LCDC_PANEL;
-       pinfo.pdest = DISPLAY_1;
-       pinfo.wait_cycle = 0;
-       pinfo.bpp = 18;
-       pinfo.fb_num = 2;
-       pinfo.clk_rate = 40000000;
-
-       pinfo.lcdc.h_back_porch = 88;
-       pinfo.lcdc.h_front_porch = 40;
-       pinfo.lcdc.h_pulse_width = 128;
-       pinfo.lcdc.v_back_porch = 23;
-       pinfo.lcdc.v_front_porch = 1;
-       pinfo.lcdc.v_pulse_width = 4;
-       pinfo.lcdc.border_clr = 0;      /* blk */
-       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
-       pinfo.lcdc.hsync_skew = 0;
-
-       ret = lcdc_device_register(&pinfo);
-       if (ret)
-               printk(KERN_ERR "%s: failed to register device!\n", __func__);
-
-       return ret;
-}
-
-module_init(lcdc_grapefruit_init);

diff --git a/drivers/staging/msm/lcdc_st1_wxga.c b/drivers/staging/msm/lcdc_st1_wxga.c
deleted file mode 100644 (file)
index 7376001..0000000
--- a/drivers/staging/msm/lcdc_st1_wxga.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "msm_fb.h"
-
-static int __init lcdc_st1_wxga_init(void)
-{
-       int ret;
-       struct msm_panel_info pinfo;
-
-       if (msm_fb_detect_client("lcdc_st1_wxga"))
-               return 0;
-
-       pinfo.xres = 1280;
-       pinfo.yres = 720;
-       pinfo.type = LCDC_PANEL;
-       pinfo.pdest = DISPLAY_1;
-       pinfo.wait_cycle = 0;
-       pinfo.bpp = 18;
-       pinfo.fb_num = 2;
-       pinfo.clk_rate = 74250000;
-
-       pinfo.lcdc.h_back_porch = 124;
-       pinfo.lcdc.h_front_porch = 110;
-       pinfo.lcdc.h_pulse_width = 136;
-       pinfo.lcdc.v_back_porch = 19;
-       pinfo.lcdc.v_front_porch = 5;
-       pinfo.lcdc.v_pulse_width = 6;
-       pinfo.lcdc.border_clr = 0;      /* blk */
-       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
-       pinfo.lcdc.hsync_skew = 0;
-
-       ret = lcdc_device_register(&pinfo);
-       if (ret)
-               printk(KERN_ERR "%s: failed to register device!\n", __func__);
-
-       return ret;
-}
-
-module_init(lcdc_st1_wxga_init);

diff --git a/drivers/staging/msm/lcdc_wxga.c b/drivers/staging/msm/lcdc_wxga.c
deleted file mode 100644 (file)
index 202c92c..0000000
--- a/drivers/staging/msm/lcdc_wxga.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "msm_fb.h"
-
-static int __init lcdc_wxga_init(void)
-{
-       int ret;
-       struct msm_panel_info pinfo;
-
-#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
-       if (msm_fb_detect_client("lcdc_wxga"))
-               return 0;
-#endif
-
-       pinfo.xres = 1280;
-       pinfo.yres = 720;
-       pinfo.type = LCDC_PANEL;
-       pinfo.pdest = DISPLAY_1;
-       pinfo.wait_cycle = 0;
-       pinfo.bpp = 24;
-       pinfo.fb_num = 2;
-       pinfo.clk_rate = 74250000;
-
-       pinfo.lcdc.h_back_porch = 124;
-       pinfo.lcdc.h_front_porch = 110;
-       pinfo.lcdc.h_pulse_width = 136;
-       pinfo.lcdc.v_back_porch = 19;
-       pinfo.lcdc.v_front_porch = 5;
-       pinfo.lcdc.v_pulse_width = 6;
-       pinfo.lcdc.border_clr = 0;      /* blk */
-       pinfo.lcdc.underflow_clr = 0xff;        /* blue */
-       pinfo.lcdc.hsync_skew = 0;
-
-       ret = lcdc_device_register(&pinfo);
-       if (ret)
-               printk(KERN_ERR "%s: failed to register device!\n", __func__);
-
-       return ret;
-}
-
-module_init(lcdc_wxga_init);

diff --git a/drivers/staging/msm/mddi_toshiba_wvga.c b/drivers/staging/msm/mddi_toshiba_wvga.c
deleted file mode 100644 (file)
index 557b0f0..0000000
--- a/drivers/staging/msm/mddi_toshiba_wvga.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "msm_fb.h"
-#include "mddihost.h"
-#include "mddi_toshiba.h"
-
-static int __init mddi_toshiba_wvga_init(void)
-{
-       int ret;
-       struct msm_panel_info pinfo;
-
-#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
-       if (msm_fb_detect_client("mddi_toshiba_wvga"))
-               return 0;
-#endif
-
-       pinfo.xres = 800;
-       pinfo.yres = 480;
-       pinfo.pdest = DISPLAY_2;
-       pinfo.type = MDDI_PANEL;
-       pinfo.mddi.vdopkt = MDDI_DEFAULT_PRIM_PIX_ATTR;
-       pinfo.wait_cycle = 0;
-       pinfo.bpp = 18;
-       pinfo.lcd.vsync_enable = TRUE;
-       pinfo.lcd.refx100 = 6118;
-       pinfo.lcd.v_back_porch = 6;
-       pinfo.lcd.v_front_porch = 0;
-       pinfo.lcd.v_pulse_width = 0;
-       pinfo.lcd.hw_vsync_mode = FALSE;
-       pinfo.lcd.vsync_notifier_period = (1 * HZ);
-       pinfo.bl_max = 4;
-       pinfo.bl_min = 1;
-       pinfo.clk_rate = 192000000;
-       pinfo.clk_min =  190000000;
-       pinfo.clk_max =  200000000;
-       pinfo.fb_num = 2;
-
-       ret = mddi_toshiba_device_register(&pinfo, TOSHIBA_VGA_PRIM,
-                                          LCD_TOSHIBA_2P4_WVGA);
-       if (ret) {
-               printk(KERN_ERR "%s: failed to register device!\n", __func__);
-               return ret;
-       }
-
-       return ret;
-}
-
-module_init(mddi_toshiba_wvga_init);

diff --git a/drivers/staging/msm/staging-devices.c b/drivers/staging/msm/staging-devices.c
index 2a5c459b1e5aa5d640bb3079b55804e35f247ba7..861f330723144082af5f745dc97b9d53204ed3fa 100644 (file)
--- a/drivers/staging/msm/staging-devices.c
+++ b/drivers/staging/msm/staging-devices.c
@@ -114,17 +114,7 @@ static int msm_fb_detect_panel(const char *name)
        } else if ((machine_is_qsd8x50_surf() || machine_is_qsd8x50a_surf())
                        && !strcmp(name, "lcdc_external"))
                ret = 0;
-       else if (0 /*machine_is_qsd8x50_grapefruit() */) {
-               if (!strcmp(name, "lcdc_grapefruit_vga"))
-                       ret = 0;
-               else
-                       ret = -ENODEV;
-       } else if (machine_is_qsd8x50_st1()) {
-               if (!strcmp(name, "lcdc_st1_wxga"))
-                       ret = 0;
-               else
-                       ret = -ENODEV;
-       } else if (machine_is_qsd8x50a_st1_5()) {
+       else if (machine_is_qsd8x50a_st1_5()) {
                if (!strcmp(name, "lcdc_st15") ||
                    !strcmp(name, "hdmi_sii9022"))
                        ret = 0;