Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 9 insertions, 12 deletions

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 975281980299..cc1408119c24 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -89,6 +89,7 @@ static struct resource sh_keysc_resources[] = {
 
 static struct platform_device sh_keysc_device = {
         .name           = "sh_keysc",
+        .id             = 0, /* "keysc0" clock */
         .num_resources  = ARRAY_SIZE(sh_keysc_resources),
         .resource       = sh_keysc_resources,
         .dev    = {
@@ -261,6 +262,8 @@ static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
                 .sys_bus_cfg = {
                         .ldmt2r = 0x06000a09,
                         .ldmt3r = 0x180e3418,
+                        /* set 1s delay to encourage fsync() */
+                        .deferred_io_msec = 1000,
                 },
         }
 #endif
@@ -273,6 +276,10 @@ static struct resource migor_lcdc_resources[] = {
                 .end    = 0xfe941fff,
                 .flags  = IORESOURCE_MEM,
         },
+        [1] = {
+                .start  = 28,
+                .flags  = IORESOURCE_IRQ,
+        },
 };
 
 static struct platform_device migor_lcdc_device = {
@@ -300,6 +307,7 @@ static void camera_power_on(void)
         gpio_set_value(GPIO_PTT3, 0);
         mdelay(10);
         gpio_set_value(GPIO_PTT3, 1);
+        mdelay(10); /* wait to let chip come out of reset */
 }
 
 static void camera_power_off(void)
@@ -432,6 +440,7 @@ static struct resource migor_ceu_resources[] = {
 
 static struct platform_device migor_ceu_device = {
         .name           = "sh_mobile_ceu",
+        .id             = 0, /* "ceu0" clock */
         .num_resources  = ARRAY_SIZE(migor_ceu_resources),
         .resource       = migor_ceu_resources,
         .dev    = {
@@ -479,7 +488,6 @@ static int __init migor_devices_setup(void)
         ctrl_outl(0x00110080, BSC_CS4WCR);
 
         /* KEYSC */
-        clk_always_enable("mstp214"); /* KEYSC */
         gpio_request(GPIO_FN_KEYOUT0, NULL);
         gpio_request(GPIO_FN_KEYOUT1, NULL);
         gpio_request(GPIO_FN_KEYOUT2, NULL);
@@ -501,7 +509,6 @@ static int __init migor_devices_setup(void)
         gpio_request(GPIO_FN_IRQ6, NULL);
 
         /* LCD Panel */
-        clk_always_enable("mstp200"); /* LCDC */
 #ifdef CONFIG_SH_MIGOR_QVGA /* LCDC - QVGA - Enable SYS Interface signals */
         gpio_request(GPIO_FN_LCDD17, NULL);
         gpio_request(GPIO_FN_LCDD16, NULL);
@@ -554,7 +561,6 @@ static int __init migor_devices_setup(void)
 #endif
 
         /* CEU */
-        clk_always_enable("mstp203"); /* CEU */
         gpio_request(GPIO_FN_VIO_CLK2, NULL);
         gpio_request(GPIO_FN_VIO_VD2, NULL);
         gpio_request(GPIO_FN_VIO_HD2, NULL);
@@ -589,12 +595,3 @@ static int __init migor_devices_setup(void)
         return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices));
 }
 __initcall(migor_devices_setup);
-
-static void __init migor_setup(char **cmdline_p)
-{
-}
-
-static struct sh_machine_vector mv_migor __initmv = {
-        .mv_name                = "Migo-R",
-        .mv_setup               = migor_setup,
-};