*************** static int s3cfb_probe(struct platform_d
*** 1261,1267 ****
--- 1309,1317 ----
    }

    fbdev->dev = &pdev->dev;
+ #if defined(CONFIG_MACH_S5PC110_ARIES)
    s3cfb_set_lcd_info(fbdev);
+ #endif

    /* gpio */
    pdata = to_fb_plat(&pdev->dev);
*************** static int s3cfb_probe(struct platform_d
*** 1269,1278 ****
  #if defined(CONFIG_MACH_S5PC110_P1)
    fbdev->lcd = (struct s3cfb_lcd*)pdata->lcd;
  #endif
! //#if !defined(CONFIG_MACH_S5PC110_ARIES)
    if (pdata->cfg_gpio)
        pdata->cfg_gpio(pdev);
! //#endif  /* CONFIG_MACH_S5PC110_ARIES */
    if (pdata->clk_on)
        pdata->clk_on(pdev, &fbdev->clock);

--- 1319,1328 ----
  #if defined(CONFIG_MACH_S5PC110_P1)
    fbdev->lcd = (struct s3cfb_lcd*)pdata->lcd;
  #endif
! #if !defined(CONFIG_MACH_S5PC110_ARIES)
    if (pdata->cfg_gpio)
        pdata->cfg_gpio(pdev);
! #endif    /* CONFIG_MACH_S5PC110_ARIES */
    if (pdata->clk_on)
        pdata->clk_on(pdev, &fbdev->clock);

*************** static int s3cfb_probe(struct platform_d
*** 1301,1308 ****
--- 1351,1360 ----
        goto err_io;
    }

+ #ifdef CONFIG_FB_S3C_MDNIE
    fbdev->wq_count = 0;
    init_waitqueue_head(&fbdev->wq);
+ #endif

    /* irq */
    fbdev->irq = platform_get_irq(pdev, 0);
*************** static int s3cfb_probe(struct platform_d
*** 1312,1321 ****
--- 1364,1375 ----
        ret = -EINVAL;
        goto err_irq;
    }
+ #if 1
    // added by jamie (2009.08.18)
    // enable VSYNC
    s3cfb_set_vsync_interrupt(fbdev, 1);
    s3cfb_set_global_interrupt(fbdev, 1);
+ #endif

  #ifdef CONFIG_FB_S3C_TRACE_UNDERRUN
    if (request_irq(platform_get_irq(pdev, 1), s3cfb_irq_fifo,
*************** static int s3cfb_probe(struct platform_d
*** 1328,1334 ****
--- 1382,1390 ----
    s3cfb_set_fifo_interrupt(fbdev, 1);
    dev_info(fbdev->dev, "fifo underrun trace\n");
  #endif
+ #ifdef CONFIG_FB_S3C_MDNIE
    s3c_mdnie_setup();
+ #endif

    /* init global */
    s3cfb_init_global();
*************** static int s3cfb_probe(struct platform_d
*** 1341,1363 ****
        goto err_alloc;

    s3cfb_set_clock(fbdev);
     mDNIe_Mode_Set();
    s3cfb_enable_window(pdata->default_win);

    s3cfb_display_on(fbdev);

    /* panel control */

    fbdev->early_suspend.suspend = s3cfb_early_suspend;
    fbdev->early_suspend.resume = s3cfb_late_resume;
    fbdev->early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB;
    //if, is in USER_SLEEP status and no active auto expiring wake lock
    //if (has_wake_lock(WAKE_LOCK_SUSPEND) == 0 && get_suspend_state() == PM_SUSPEND_ON)
    register_early_suspend(&fbdev->early_suspend);
!           ret = device_create_file(&(pdev->dev), &dev_attr_lcd_power);
!   if (ret < 0)
!       printk(KERN_WARNING "s3cfb: failed to add dev_attr_lcd_power\n");
!

    ret = device_create_file(&(pdev->dev), &dev_attr_win_power);
    if (ret < 0)
--- 1397,1435 ----
        goto err_alloc;

    s3cfb_set_clock(fbdev);
+ #ifdef CONFIG_FB_S3C_MDNIE
     mDNIe_Mode_Set();
+ #endif
    s3cfb_enable_window(pdata->default_win);

    s3cfb_display_on(fbdev);

+ #ifdef CONFIG_FB_S3C_LCD_INIT
    /* panel control */

+ #if !defined(CONFIG_MACH_S5PC110_ARIES)
+ #if defined(CONFIG_FB_S3C_TL2796)
+   if (pdata->backlight_on)
+       pdata->backlight_on(pdev);
+ #elif defined(CONFIG_FB_S3C_LTE480WV)
+   if (pdata->backlight_onoff)
+       pdata->backlight_onoff(pdev, 1);
+ #endif
+
+   if (pdata->reset_lcd)
+       pdata->reset_lcd(pdev);
+ #endif
+ #endif    /* CONFIG_MACH_S5PC110_ARIES */
+ #ifdef CONFIG_HAS_WAKELOCK
+ #ifdef CONFIG_HAS_EARLYSUSPEND
    fbdev->early_suspend.suspend = s3cfb_early_suspend;
    fbdev->early_suspend.resume = s3cfb_late_resume;
    fbdev->early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB;
    //if, is in USER_SLEEP status and no active auto expiring wake lock
    //if (has_wake_lock(WAKE_LOCK_SUSPEND) == 0 && get_suspend_state() == PM_SUSPEND_ON)
    register_early_suspend(&fbdev->early_suspend);
! #endif
! #endif

    ret = device_create_file(&(pdev->dev), &dev_attr_win_power);
    if (ret < 0)
*************** static int s3cfb_probe(struct platform_d
*** 1365,1370 ****
--- 1437,1450 ----

    dev_info(fbdev->dev, "registered successfully\n");

+ #if 0 //def CONFIG_CPU_FREQ
+   fbdev->freq_transition.notifier_call = s3cfb_freq_transition;
+   fbdev->freq_policy.notifier_call = s3cfb_freq_policy;
+   cpufreq_register_notifier(&fbdev->freq_transition,
+                       CPUFREQ_TRANSITION_NOTIFIER);
+   cpufreq_register_notifier(&fbdev->freq_policy,
+                       CPUFREQ_POLICY_NOTIFIER);
+ #endif

    return 0;