Advertisement
Guest User

fb driver removal

a guest
Feb 21st, 2014
35
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.77 KB | None | 0 0
  1. diff --git a/arch/arm/mach-exynos/sec_debug.c b/arch/arm/mach-exynos/sec_debug.c
  2. index 78e2b4a..a612965 100644
  3. --- a/arch/arm/mach-exynos/sec_debug.c
  4. +++ b/arch/arm/mach-exynos/sec_debug.c
  5. @@ -723,7 +723,7 @@ void sec_debug_check_crash_key(unsigned int code, int value)
  6.                      __func__, ++loopcount);
  7.                 if (loopcount == 2) {
  8.  #ifdef CONFIG_FB_S5P
  9. -                   read_lcd_register();
  10. +                   //read_lcd_register();
  11.  #endif
  12.  #ifdef CONFIG_SEC_DEBUG_FUPLOAD_DUMP_MORE
  13.                     dump_state_and_upload();
  14. diff --git a/drivers/media/video/samsung/fimc/fimc_dev_u1.c b/drivers/media/video/samsung/fimc/fimc_dev_u1.c
  15. index 52246a1..11765b2 100644
  16. --- a/drivers/media/video/samsung/fimc/fimc_dev_u1.c
  17. +++ b/drivers/media/video/samsung/fimc/fimc_dev_u1.c
  18. @@ -1153,8 +1153,8 @@ static int fimc_open(struct file *filp)
  19.         /* Apply things to interface register */
  20.         fimc_hwset_reset(ctrl);
  21.  #endif
  22. -       ctrl->fb.open_fifo = s3cfb_open_fifo;
  23. -       ctrl->fb.close_fifo = s3cfb_close_fifo;
  24. +       //ctrl->fb.open_fifo = s3cfb_open_fifo;
  25. +       //ctrl->fb.close_fifo = s3cfb_close_fifo;
  26.  
  27.         ret = s3cfb_direct_ioctl(ctrl->id, S3CFB_GET_LCD_WIDTH,
  28.                     (unsigned long)&ctrl->fb.lcd_hres);
  29. diff --git a/drivers/video/samsung/Makefile b/drivers/video/samsung/Makefile
  30. index 085cefe..6665bb8 100644
  31. --- a/drivers/video/samsung/Makefile
  32. +++ b/drivers/video/samsung/Makefile
  33. @@ -2,10 +2,12 @@
  34.  # Makefile for the s3c framebuffer driver
  35.  #
  36.  ifeq ($(CONFIG_FB_S5P),y)
  37. +ifeq ($(CONFIG_FB_S5P),NOPE)
  38.  obj-y              += s3cfb.o
  39.  s3cfb-y                := s3cfb_main.o s3cfb_ops.o lcdfreq.o
  40.  obj-$(CONFIG_ARCH_S5PV210) += s3cfb_fimd6x.o
  41.  obj-$(CONFIG_ARCH_EXYNOS4) += s3cfb_fimd6x.o
  42. +endif
  43.  
  44.  obj-$(CONFIG_FB_S5P_S6C1372)   += s3cfb_s6c1372.o
  45.  obj-$(CONFIG_FB_S5P_S6F1202A)  += s3cfb_s6c1372.o
  46. diff --git a/drivers/video/samsung/s3cfb_s6e8aa0.c b/drivers/video/samsung/s3cfb_s6e8aa0.c
  47. index 4be6ee2..14c84a3 100644
  48. --- a/drivers/video/samsung/s3cfb_s6e8aa0.c
  49. +++ b/drivers/video/samsung/s3cfb_s6e8aa0.c
  50. @@ -189,8 +189,8 @@ static unsigned int elvss_offset_table[ELVSS_STATUS_MAX] = {
  51.  };
  52.  #endif
  53.  
  54. -extern void (*lcd_early_suspend)(void);
  55. -extern void (*lcd_late_resume)(void);
  56. +//extern void (*lcd_early_suspend)(void);
  57. +//extern void (*lcd_late_resume)(void);
  58.  
  59.  #if defined(GPIO_OLED_DET)
  60.  static void oled_detection_work(struct work_struct *work)
  61. @@ -1541,8 +1541,8 @@ static int s6e8ax0_probe(struct device *dev)
  62.     }
  63.  #endif
  64.  
  65. -   lcd_early_suspend = s6e8ax0_early_suspend;
  66. -   lcd_late_resume = s6e8ax0_late_resume;
  67. +   //lcd_early_suspend = s6e8ax0_early_suspend;
  68. +   //lcd_late_resume = s6e8ax0_late_resume;
  69.  
  70.     return 0;
  71.  
  72. @@ -1598,6 +1598,12 @@ static void s6e8ax0_exit(void)
  73.     return;
  74.  }
  75.  
  76. +int s3cfb_direct_ioctl(int id, unsigned int cmd, unsigned long arg)
  77. +{
  78. +    return -1;
  79. +}
  80. +EXPORT_SYMBOL(s3cfb_direct_ioctl);
  81. +
  82.  module_init(s6e8ax0_init);
  83.  module_exit(s6e8ax0_exit);
  84.  
  85. diff --git a/drivers/video/samsung/s5p-dsim.c b/drivers/video/samsung/s5p-dsim.c
  86. index 61cefab..a62e8c7 100644
  87. --- a/drivers/video/samsung/s5p-dsim.c
  88. +++ b/drivers/video/samsung/s5p-dsim.c
  89. @@ -577,7 +577,7 @@ static irqreturn_t s5p_dsim_isr(int irq, void *dev_id)
  90.                 /* printk("S5P_DSIM_INT_MSK_FRAME_DONE\n"); */
  91.                 if (dsim->dsim_lcd_info->lcd_enabled && dsim->mipi_ddi_pd->resume_complete) {
  92.                     if (completion_done(&dsim_wr_comp) && completion_done(&dsim_rd_comp)) {
  93. -                       if (s3cfb_vsync_status_check()) {
  94. +                       //if (s3cfb_vsync_status_check()) {
  95.                             s5p_dsim_toggle_hs_clock(dsim->reg_base);
  96.                             if (!dsim->dsim_toggle_per_frame_count) {
  97.                                 s5p_dsim_frame_done_interrupt_enable(dsim, 0);
  98. @@ -586,7 +586,7 @@ static irqreturn_t s5p_dsim_isr(int irq, void *dev_id)
  99.                             }
  100.                             if (dsim->dsim_toggle_per_frame_count)
  101.                                 dsim->dsim_toggle_per_frame_count--;
  102. -                       }
  103. +                       //}
  104.                     }
  105.                 }
  106.                 break;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement