Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d74c86f authored by Neil Leeder's avatar Neil Leeder Committed by Greg Kroah-Hartman
Browse files

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: default avatarNeil Leeder <nleeder@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5d92fe33

drivers/staging/msm/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/* 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);

drivers/staging/msm/lcdc_st1_wxga.c

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/* 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);

drivers/staging/msm/lcdc_wxga.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/* 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);