diff options
Diffstat (limited to 'drivers/staging/msm')
| -rw-r--r-- | drivers/staging/msm/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/staging/msm/Makefile | 5 | ||||
| -rw-r--r-- | drivers/staging/msm/lcdc_grapefruit.c | 60 | ||||
| -rw-r--r-- | drivers/staging/msm/lcdc_st1_wxga.c | 54 | ||||
| -rw-r--r-- | drivers/staging/msm/lcdc_wxga.c | 56 | ||||
| -rw-r--r-- | drivers/staging/msm/mddi_toshiba_wvga.c | 63 | ||||
| -rw-r--r-- | drivers/staging/msm/mddihost.h | 2 | ||||
| -rw-r--r-- | drivers/staging/msm/mdp4_debugfs.c | 10 | ||||
| -rw-r--r-- | drivers/staging/msm/mdp4_overlay.c | 8 | ||||
| -rw-r--r-- | drivers/staging/msm/msm_fb_def.h | 4 | ||||
| -rw-r--r-- | drivers/staging/msm/staging-devices.c | 13 |
11 files changed, 7 insertions, 278 deletions
diff --git a/drivers/staging/msm/Kconfig b/drivers/staging/msm/Kconfig index c57039f2060b..c5309eec58fa 100644 --- 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 98a0ce177cb2..bb3606faf20e 100644 --- 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 index 7284649ea0ae..000000000000 --- 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 index 73760019cf2e..000000000000 --- 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 index 202c92c0ef54..000000000000 --- 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 index 557b0f08faf8..000000000000 --- 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/mddihost.h b/drivers/staging/msm/mddihost.h index 20b817841c4a..c46f24aea250 100644 --- a/drivers/staging/msm/mddihost.h +++ b/drivers/staging/msm/mddihost.h @@ -44,8 +44,6 @@ #include <asm/system.h> #include <asm/mach-types.h> -#include <linux/types.h> -#include <linux/dma-mapping.h> #include "msm_fb_panel.h" diff --git a/drivers/staging/msm/mdp4_debugfs.c b/drivers/staging/msm/mdp4_debugfs.c index 844d46775ecd..36954e89478c 100644 --- a/drivers/staging/msm/mdp4_debugfs.c +++ b/drivers/staging/msm/mdp4_debugfs.c @@ -63,13 +63,6 @@ DEFINE_SIMPLE_ATTRIBUTE( "%llx\n"); -static int mdp4_debugfs_open(struct inode *inode, struct file *file) -{ - /* non-seekable */ - file->f_mode &= ~(FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE); - return 0; -} - static int mdp4_debugfs_release(struct inode *inode, struct file *file) { return 0; @@ -144,10 +137,11 @@ static ssize_t mdp4_debugfs_read( } static const struct file_operations mdp4_debugfs_fops = { - .open = mdp4_debugfs_open, + .open = nonseekable_open, .release = mdp4_debugfs_release, .read = mdp4_debugfs_read, .write = mdp4_debugfs_write, + .llseek = no_llseek, }; int mdp4_debugfs_init(void) diff --git a/drivers/staging/msm/mdp4_overlay.c b/drivers/staging/msm/mdp4_overlay.c index 304bb8297635..de284c28faa1 100644 --- a/drivers/staging/msm/mdp4_overlay.c +++ b/drivers/staging/msm/mdp4_overlay.c @@ -874,8 +874,8 @@ struct mdp4_overlay_pipe *mdp4_overlay_pipe_alloc(void) if (pipe->pipe_ndx == 0) { pipe->pipe_ndx = i + 1; /* start from 1 */ init_completion(&pipe->comp); - printk(KERN_INFO "mdp4_overlay_pipe_alloc: pipe=%x ndx=%d\n", - (int)pipe, pipe->pipe_ndx); + printk(KERN_INFO "mdp4_overlay_pipe_alloc: pipe=%p ndx=%d\n", + pipe, pipe->pipe_ndx); return pipe; } pipe++; @@ -887,8 +887,8 @@ struct mdp4_overlay_pipe *mdp4_overlay_pipe_alloc(void) void mdp4_overlay_pipe_free(struct mdp4_overlay_pipe *pipe) { - printk(KERN_INFO "mdp4_overlay_pipe_free: pipe=%x ndx=%d\n", - (int)pipe, pipe->pipe_ndx); + printk(KERN_INFO "mdp4_overlay_pipe_free: pipe=%p ndx=%d\n", + pipe, pipe->pipe_ndx); memset(pipe, 0, sizeof(*pipe)); } diff --git a/drivers/staging/msm/msm_fb_def.h b/drivers/staging/msm/msm_fb_def.h index 6de440937422..c5f9e9e670fb 100644 --- a/drivers/staging/msm/msm_fb_def.h +++ b/drivers/staging/msm/msm_fb_def.h @@ -50,15 +50,11 @@ #include <linux/debugfs.h> #include <linux/console.h> -#include <linux/kernel.h> #include <linux/sched.h> #include <linux/time.h> -#include <linux/init.h> #include <linux/interrupt.h> -#include "linux/proc_fs.h" #include <mach/hardware.h> #include <linux/io.h> -#include <linux/fb.h> #include <asm/system.h> #include <asm/mach-types.h> #include <linux/platform_device.h> diff --git a/drivers/staging/msm/staging-devices.c b/drivers/staging/msm/staging-devices.c index 0f8ec3e26013..861f33072314 100644 --- a/drivers/staging/msm/staging-devices.c +++ b/drivers/staging/msm/staging-devices.c @@ -18,7 +18,6 @@ #include "msm_mdp.h" #include "memory_ll.h" //#include "android_pmem.h" -#include <mach/board.h> #ifdef CONFIG_MSM_SOC_REV_A #define MSM_SMI_BASE 0xE0000000 @@ -115,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; |