Skip to contentSkip to conversation

staging: msm: remove video drivers for obsolete platforms

PATCH In review Neil Leeder 3 participants 5 messages Jul 26, 2010

Subsystems (2)
Arm Qualcomm mailing list Staging
lore
Share & tools
lore

Neil Leeder

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/staging/msm/Kconfig             |   10 -----
 drivers/staging/msm/Makefile            |    5 --
 drivers/staging/msm/lcdc_grapefruit.c   |   60 -----------------------------
 drivers/staging/msm/lcdc_st1_wxga.c     |   54 --------------------------
 drivers/staging/msm/lcdc_wxga.c         |   56 ---------------------------
 drivers/staging/msm/mddi_toshiba_wvga.c |   63 -------------------------------
 drivers/staging/msm/staging-devices.c   |   12 +-----
 7 files changed, 1 insertions(+), 259 deletions(-)
 delete mode 100644 drivers/staging/msm/lcdc_grapefruit.c
 delete mode 100644 drivers/staging/msm/lcdc_st1_wxga.c
 delete mode 100644 drivers/staging/msm/lcdc_wxga.c
 delete mode 100644 drivers/staging/msm/mddi_toshiba_wvga.c
drivers/staging/msm/Kconfig +0 -10
index c57039f..c5309ee 100644
@@ -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
drivers/staging/msm/Makefile +0 -5
index 98a0ce1..bb3606f 100644
@@ -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
drivers/staging/msm/lcdc_grapefruit.c deleted +0 -60

60 lines not on this page · raw message

drivers/staging/msm/lcdc_st1_wxga.c deleted +0 -54

54 lines not on this page · raw message

drivers/staging/msm/lcdc_wxga.c deleted +0 -56

56 lines not on this page · raw message

drivers/staging/msm/mddi_toshiba_wvga.c deleted +0 -63

63 lines not on this page · raw message

drivers/staging/msm/staging-devices.c +1 -11
index 0f8ec3e..7e6cd34 100644
@@ -115,17 +115,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;
Signature · 5 lines
1.7.0

--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#1 lore raw
Quoted 2 lines · Neil Leeder

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

What do you mean "unused"? Did no one ever use these platforms, or are they for platforms that never got merged?

confused,

greg k-h

author
#2 lore raw
Quoted 6 lines · Greg KH
Quoted 2 lines · Neil Leeder

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

What do you mean "unused"? Did no one ever use these platforms, or are they for platforms that never got merged?

These are drivers for platforms which were once used for development within QuIC, but have since been end-of-life'd and scrapped.

--
Neil

Signature · 2 lines
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#3 lore raw
Quoted 2 lines

These are drivers for platforms which were once used for development within QuIC, but have since been end-of-life'd and scrapped.

Ah, ok.
I was always a bit confused with the toshiba stuff.
I've never known, if its functional or not.
So the code will get much more readable, when these parts are gone.

regards
leviathan

#4 lore raw
In reply to Neil Leeder
Quoted 10 lines · Neil Leeder
Quoted 6 lines · Greg KH
Quoted 2 lines · Neil Leeder

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

What do you mean "unused"? Did no one ever use these platforms, or are they for platforms that never got merged?

These are drivers for platforms which were once used for development within QuIC, but have since been end-of-life'd and scrapped.

Ok, thanks, that makes more sense.

greg k-h