1 files changed, 98 insertions, 12 deletions

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 15456a0773b..00973e0f8c6 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -39,7 +39,15 @@
  * SW41 : abxx xxxx  -> a = 0 : Analog  monitor
  *                          1 : Digital monitor
  *                      b = 0 : VGA
- *                          1 : SVGA
+ *                          1 : 720p
+ */
+
+/*
+ * about 720p
+ *
+ * When you use 1280 x 720 lcdc output,
+ * you should change OSC6 lcdc clock from 25.175MHz to 74.25MHz,
+ * and change SW41 to use 720p
  */
 
 /* Heartbeat */
@@ -158,7 +166,7 @@ static struct resource lcdc_resources[] = {
         [0] = {
                 .name   = "LCDC",
                 .start  = 0xfe940000,
-                .end    = 0xfe941fff,
+                .end    = 0xfe942fff,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -174,6 +182,9 @@ static struct platform_device lcdc_device = {
         .dev            = {
                 .platform_data  = &lcdc_info,
         },
+        .archdata = {
+                .hwblk_id = HWBLK_LCDC,
+        },
 };
 
 /* CEU0 */
@@ -205,6 +216,9 @@ static struct platform_device ceu0_device = {
         .dev    = {
                 .platform_data  = &sh_mobile_ceu0_info,
         },
+        .archdata = {
+                .hwblk_id = HWBLK_CEU0,
+        },
 };
 
 /* CEU1 */
@@ -236,6 +250,9 @@ static struct platform_device ceu1_device = {
         .dev    = {
                 .platform_data  = &sh_mobile_ceu1_info,
         },
+        .archdata = {
+                .hwblk_id = HWBLK_CEU1,
+        },
 };
 
 /* KEYSC in SoC (Needs SW33-2 set to ON) */
@@ -274,6 +291,9 @@ static struct platform_device keysc_device = {
         .dev    = {
                 .platform_data  = &keysc_info,
         },
+        .archdata = {
+                .hwblk_id = HWBLK_KEYSC,
+        },
 };
 
 /* SH Eth */
@@ -302,15 +322,19 @@ static struct platform_device sh_eth_device = {
         },
         .num_resources = ARRAY_SIZE(sh_eth_resources),
         .resource = sh_eth_resources,
+        .archdata = {
+                .hwblk_id = HWBLK_ETHER,
+        },
 };
 
 static struct r8a66597_platdata sh7724_usb0_host_data = {
+        .on_chip = 1,
 };
 
 static struct resource sh7724_usb0_host_resources[] = {
         [0] = {
                 .start  = 0xa4d80000,
-                .end    = 0xa4d800ff,
+                .end    = 0xa4d80124 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -330,6 +354,38 @@ static struct platform_device sh7724_usb0_host_device = {
         },
         .num_resources  = ARRAY_SIZE(sh7724_usb0_host_resources),
         .resource       = sh7724_usb0_host_resources,
+        .archdata = {
+                .hwblk_id = HWBLK_USB0,
+        },
+};
+
+static struct r8a66597_platdata sh7724_usb1_gadget_data = {
+        .on_chip = 1,
+};
+
+static struct resource sh7724_usb1_gadget_resources[] = {
+        [0] = {
+                .start  = 0xa4d90000,
+                .end    = 0xa4d90123,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 66,
+                .end    = 66,
+                .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
+        },
+};
+
+static struct platform_device sh7724_usb1_gadget_device = {
+        .name           = "r8a66597_udc",
+        .id             = 1, /* USB1 */
+        .dev = {
+                .dma_mask               = NULL,         /*  not use dma */
+                .coherent_dma_mask      = 0xffffffff,
+                .platform_data          = &sh7724_usb1_gadget_data,
+        },
+        .num_resources  = ARRAY_SIZE(sh7724_usb1_gadget_resources),
+        .resource       = sh7724_usb1_gadget_resources,
 };
 
 static struct platform_device *ms7724se_devices[] __initdata = {
@@ -342,6 +398,7 @@ static struct platform_device *ms7724se_devices[] __initdata = {
         &keysc_device,
         &sh_eth_device,
         &sh7724_usb0_host_device,
+        &sh7724_usb1_gadget_device,
 };
 
 #define EEPROM_OP   0xBA206000
@@ -421,9 +478,38 @@ static int __init devices_setup(void)
         /* turn on USB clocks, use external clock */
         ctrl_outw((ctrl_inw(PORT_MSELCRB) & ~0xc000) | 0x8000, PORT_MSELCRB);
 
+#ifdef CONFIG_PM
+        /* Let LED9 show STATUS2 */
+        gpio_request(GPIO_FN_STATUS2, NULL);
+
+        /* Lit LED10 show STATUS0 */
+        gpio_request(GPIO_FN_STATUS0, NULL);
+
+        /* Lit LED11 show PDSTATUS */
+        gpio_request(GPIO_FN_PDSTATUS, NULL);
+#else
+        /* Lit LED9 */
+        gpio_request(GPIO_PTJ6, NULL);
+        gpio_direction_output(GPIO_PTJ6, 1);
+        gpio_export(GPIO_PTJ6, 0);
+
+        /* Lit LED10 */
+        gpio_request(GPIO_PTJ5, NULL);
+        gpio_direction_output(GPIO_PTJ5, 1);
+        gpio_export(GPIO_PTJ5, 0);
+
+        /* Lit LED11 */
+        gpio_request(GPIO_PTJ7, NULL);
+        gpio_direction_output(GPIO_PTJ7, 1);
+        gpio_export(GPIO_PTJ7, 0);
+#endif
+
         /* enable USB0 port */
         ctrl_outw(0x0600, 0xa40501d4);
 
+        /* enable USB1 port */
+        ctrl_outw(0x0600, 0xa4050192);
+
         /* enable IRQ 0,1,2 */
         gpio_request(GPIO_FN_INTC_IRQ0, NULL);
         gpio_request(GPIO_FN_INTC_IRQ1, NULL);
@@ -546,15 +632,15 @@ static int __init devices_setup(void)
         sh_eth_init();
 
         if (sw & SW41_B) {
-                /* SVGA */
-                lcdc_info.ch[0].lcd_cfg.xres         = 800;
-                lcdc_info.ch[0].lcd_cfg.yres         = 600;
-                lcdc_info.ch[0].lcd_cfg.left_margin  = 142;
-                lcdc_info.ch[0].lcd_cfg.right_margin = 52;
-                lcdc_info.ch[0].lcd_cfg.hsync_len    = 96;
-                lcdc_info.ch[0].lcd_cfg.upper_margin = 24;
-                lcdc_info.ch[0].lcd_cfg.lower_margin = 2;
-                lcdc_info.ch[0].lcd_cfg.vsync_len    = 2;
+                /* 720p */
+                lcdc_info.ch[0].lcd_cfg.xres         = 1280;
+                lcdc_info.ch[0].lcd_cfg.yres         = 720;
+                lcdc_info.ch[0].lcd_cfg.left_margin  = 220;
+                lcdc_info.ch[0].lcd_cfg.right_margin = 110;
+                lcdc_info.ch[0].lcd_cfg.hsync_len    = 40;
+                lcdc_info.ch[0].lcd_cfg.upper_margin = 20;
+                lcdc_info.ch[0].lcd_cfg.lower_margin = 5;
+                lcdc_info.ch[0].lcd_cfg.vsync_len    = 5;
         } else {
                 /* VGA */
                 lcdc_info.ch[0].lcd_cfg.xres         = 640;