Merge branch 'master' into sh/hwblk

6 files changed, 501 insertions, 16 deletions

diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 07a54740d43e..19eea4ab1ccc 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -553,7 +553,7 @@ static int __init ap325rxa_devices_setup(void)
         return platform_add_devices(ap325rxa_devices,
                                 ARRAY_SIZE(ap325rxa_devices));
 }
-device_initcall(ap325rxa_devices_setup);
+arch_initcall(ap325rxa_devices_setup);
 
 /* Return the board specific boot mode pin configuration */
 static int ap325rxa_mode_pins(void)
diff --git a/arch/sh/boards/mach-kfr2r09/Makefile b/arch/sh/boards/mach-kfr2r09/Makefile
index 77037567633b..5d5867826e3b 100644
--- a/arch/sh/boards/mach-kfr2r09/Makefile
+++ b/arch/sh/boards/mach-kfr2r09/Makefile
@@ -1 +1,2 @@
 obj-y    := setup.o
+obj-$(CONFIG_FB_SH_MOBILE_LCDC) +=  lcd_wqvga.o
diff --git a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
new file mode 100644
index 000000000000..8ccb1cc8b589
--- /dev/null
+++ b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
@@ -0,0 +1,332 @@
+/*
+ * KFR2R09 LCD panel support
+ *
+ * Copyright (C) 2009 Magnus Damm
+ *
+ * Register settings based on the out-of-tree t33fb.c driver
+ * Copyright (C) 2008 Lineo Solutions, Inc.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ */
+
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/gpio.h>
+#include <video/sh_mobile_lcdc.h>
+#include <mach/kfr2r09.h>
+#include <cpu/sh7724.h>
+
+/* The on-board LCD module is a Hitachi TX07D34VM0AAA. This module is made
+ * up of a 240x400 LCD hooked up to a R61517 driver IC. The driver IC is
+ * communicating with the main port of the LCDC using an 18-bit SYS interface.
+ *
+ * The device code for this LCD module is 0x01221517.
+ */
+
+static const unsigned char data_frame_if[] = {
+        0x02, /* WEMODE: 1=cont, 0=one-shot */
+        0x00, 0x00,
+        0x00, /* EPF, DFM */
+        0x02, /* RIM[1] : 1 (18bpp) */
+};
+
+static const unsigned char data_panel[] = {
+        0x0b,
+        0x63, /* 400 lines */
+        0x04, 0x00, 0x00, 0x04, 0x11, 0x00, 0x00,
+};
+
+static const unsigned char data_timing[] = {
+        0x00, 0x00, 0x13, 0x08, 0x08,
+};
+
+static const unsigned char data_timing_src[] = {
+        0x11, 0x01, 0x00, 0x01,
+};
+
+static const unsigned char data_gamma[] = {
+        0x01, 0x02, 0x08, 0x23, 0x03, 0x0c, 0x00, 0x06, 0x00, 0x00,
+        0x01, 0x00, 0x0c, 0x23, 0x03, 0x08, 0x02, 0x06, 0x00, 0x00,
+};
+
+static const unsigned char data_power[] = {
+        0x07, 0xc5, 0xdc, 0x02, 0x33, 0x0a,
+};
+
+static unsigned long read_reg(void *sohandle,
+                              struct sh_mobile_lcdc_sys_bus_ops *so)
+{
+        return so->read_data(sohandle);
+}
+
+static void write_reg(void *sohandle,
+                      struct sh_mobile_lcdc_sys_bus_ops *so,
+                      int i, unsigned long v)
+{
+        if (i)
+                so->write_data(sohandle, v); /* PTH4/LCDRS High [param, 17:0] */
+        else
+                so->write_index(sohandle, v); /* PTH4/LCDRS Low [cmd, 7:0] */
+}
+
+static void write_data(void *sohandle,
+                       struct sh_mobile_lcdc_sys_bus_ops *so,
+                       unsigned char const *data, int no_data)
+{
+        int i;
+
+        for (i = 0; i < no_data; i++)
+                write_reg(sohandle, so, 1, data[i]);
+}
+
+static unsigned long read_device_code(void *sohandle,
+                                      struct sh_mobile_lcdc_sys_bus_ops *so)
+{
+        unsigned long device_code;
+
+        /* access protect OFF */
+        write_reg(sohandle, so, 0, 0xb0);
+        write_reg(sohandle, so, 1, 0x00);
+
+        /* deep standby OFF */
+        write_reg(sohandle, so, 0, 0xb1);
+        write_reg(sohandle, so, 1, 0x00);
+
+        /* device code command */
+        write_reg(sohandle, so, 0, 0xbf);
+        mdelay(50);
+
+        /* dummy read */
+        read_reg(sohandle, so);
+
+        /* read device code */
+        device_code = ((read_reg(sohandle, so) & 0xff) << 24);
+        device_code |= ((read_reg(sohandle, so) & 0xff) << 16);
+        device_code |= ((read_reg(sohandle, so) & 0xff) << 8);
+        device_code |= (read_reg(sohandle, so) & 0xff);
+
+        return device_code;
+}
+
+static void write_memory_start(void *sohandle,
+                               struct sh_mobile_lcdc_sys_bus_ops *so)
+{
+        write_reg(sohandle, so, 0, 0x2c);
+}
+
+static void clear_memory(void *sohandle,
+                         struct sh_mobile_lcdc_sys_bus_ops *so)
+{
+        int i;
+
+        /* write start */
+        write_memory_start(sohandle, so);
+
+        /* paint it black */
+        for (i = 0; i < (240 * 400); i++)
+                write_reg(sohandle, so, 1, 0x00);
+}
+
+static void display_on(void *sohandle,
+                       struct sh_mobile_lcdc_sys_bus_ops *so)
+{
+        /* access protect off */
+        write_reg(sohandle, so, 0, 0xb0);
+        write_reg(sohandle, so, 1, 0x00);
+
+        /* exit deep standby mode */
+        write_reg(sohandle, so, 0, 0xb1);
+        write_reg(sohandle, so, 1, 0x00);
+
+        /* frame memory I/F */
+        write_reg(sohandle, so, 0, 0xb3);
+        write_data(sohandle, so, data_frame_if, ARRAY_SIZE(data_frame_if));
+
+        /* display mode and frame memory write mode */
+        write_reg(sohandle, so, 0, 0xb4);
+        write_reg(sohandle, so, 1, 0x00); /* DBI, internal clock */
+
+        /* panel */
+        write_reg(sohandle, so, 0, 0xc0);
+        write_data(sohandle, so, data_panel, ARRAY_SIZE(data_panel));
+
+        /* timing (normal) */
+        write_reg(sohandle, so, 0, 0xc1);
+        write_data(sohandle, so, data_timing, ARRAY_SIZE(data_timing));
+
+        /* timing (partial) */
+        write_reg(sohandle, so, 0, 0xc2);
+        write_data(sohandle, so, data_timing, ARRAY_SIZE(data_timing));
+
+        /* timing (idle) */
+        write_reg(sohandle, so, 0, 0xc3);
+        write_data(sohandle, so, data_timing, ARRAY_SIZE(data_timing));
+
+        /* timing (source/VCOM/gate driving) */
+        write_reg(sohandle, so, 0, 0xc4);
+        write_data(sohandle, so, data_timing_src, ARRAY_SIZE(data_timing_src));
+
+        /* gamma (red) */
+        write_reg(sohandle, so, 0, 0xc8);
+        write_data(sohandle, so, data_gamma, ARRAY_SIZE(data_gamma));
+
+        /* gamma (green) */
+        write_reg(sohandle, so, 0, 0xc9);
+        write_data(sohandle, so, data_gamma, ARRAY_SIZE(data_gamma));
+
+        /* gamma (blue) */
+        write_reg(sohandle, so, 0, 0xca);
+        write_data(sohandle, so, data_gamma, ARRAY_SIZE(data_gamma));
+
+        /* power (common) */
+        write_reg(sohandle, so, 0, 0xd0);
+        write_data(sohandle, so, data_power, ARRAY_SIZE(data_power));
+
+        /* VCOM */
+        write_reg(sohandle, so, 0, 0xd1);
+        write_reg(sohandle, so, 1, 0x00);
+        write_reg(sohandle, so, 1, 0x0f);
+        write_reg(sohandle, so, 1, 0x02);
+
+        /* power (normal) */
+        write_reg(sohandle, so, 0, 0xd2);
+        write_reg(sohandle, so, 1, 0x63);
+        write_reg(sohandle, so, 1, 0x24);
+
+        /* power (partial) */
+        write_reg(sohandle, so, 0, 0xd3);
+        write_reg(sohandle, so, 1, 0x63);
+        write_reg(sohandle, so, 1, 0x24);
+
+        /* power (idle) */
+        write_reg(sohandle, so, 0, 0xd4);
+        write_reg(sohandle, so, 1, 0x63);
+        write_reg(sohandle, so, 1, 0x24);
+
+        write_reg(sohandle, so, 0, 0xd8);
+        write_reg(sohandle, so, 1, 0x77);
+        write_reg(sohandle, so, 1, 0x77);
+
+        /* TE signal */
+        write_reg(sohandle, so, 0, 0x35);
+        write_reg(sohandle, so, 1, 0x00);
+
+        /* TE signal line */
+        write_reg(sohandle, so, 0, 0x44);
+        write_reg(sohandle, so, 1, 0x00);
+        write_reg(sohandle, so, 1, 0x00);
+
+        /* column address */
+        write_reg(sohandle, so, 0, 0x2a);
+        write_reg(sohandle, so, 1, 0x00);
+        write_reg(sohandle, so, 1, 0x00);
+        write_reg(sohandle, so, 1, 0x00);
+        write_reg(sohandle, so, 1, 0xef);
+
+        /* page address */
+        write_reg(sohandle, so, 0, 0x2b);
+        write_reg(sohandle, so, 1, 0x00);
+        write_reg(sohandle, so, 1, 0x00);
+        write_reg(sohandle, so, 1, 0x01);
+        write_reg(sohandle, so, 1, 0x8f);
+
+        /* exit sleep mode */
+        write_reg(sohandle, so, 0, 0x11);
+
+        mdelay(120);
+
+        /* clear vram */
+        clear_memory(sohandle, so);
+
+        /* display ON */
+        write_reg(sohandle, so, 0, 0x29);
+        mdelay(1);
+
+        write_memory_start(sohandle, so);
+}
+
+int kfr2r09_lcd_setup(void *board_data, void *sohandle,
+                      struct sh_mobile_lcdc_sys_bus_ops *so)
+{
+        /* power on */
+        gpio_set_value(GPIO_PTF4, 0);  /* PROTECT/ -> L */
+        gpio_set_value(GPIO_PTE4, 0);  /* LCD_RST/ -> L */
+        gpio_set_value(GPIO_PTF4, 1);  /* PROTECT/ -> H */
+        udelay(1100);
+        gpio_set_value(GPIO_PTE4, 1);  /* LCD_RST/ -> H */
+        udelay(10);
+        gpio_set_value(GPIO_PTF4, 0);  /* PROTECT/ -> L */
+        mdelay(20);
+
+        if (read_device_code(sohandle, so) != 0x01221517)
+                return -ENODEV;
+
+        pr_info("KFR2R09 WQVGA LCD Module detected.\n");
+
+        display_on(sohandle, so);
+        return 0;
+}
+
+#define CTRL_CKSW       0x10
+#define CTRL_C10        0x20
+#define CTRL_CPSW       0x80
+#define MAIN_MLED4      0x40
+#define MAIN_MSW        0x80
+
+static int kfr2r09_lcd_backlight(int on)
+{
+        struct i2c_adapter *a;
+        struct i2c_msg msg;
+        unsigned char buf[2];
+        int ret;
+
+        a = i2c_get_adapter(0);
+        if (!a)
+                return -ENODEV;
+
+        buf[0] = 0x00;
+        if (on)
+                buf[1] = CTRL_CPSW | CTRL_C10 | CTRL_CKSW;
+        else
+                buf[1] = 0;
+
+        msg.addr = 0x75;
+        msg.buf = buf;
+        msg.len = 2;
+        msg.flags = 0;
+        ret = i2c_transfer(a, &msg, 1);
+        if (ret != 1)
+                return -ENODEV;
+
+        buf[0] = 0x01;
+        if (on)
+                buf[1] = MAIN_MSW | MAIN_MLED4 | 0x0c;
+        else
+                buf[1] = 0;
+
+        msg.addr = 0x75;
+        msg.buf = buf;
+        msg.len = 2;
+        msg.flags = 0;
+        ret = i2c_transfer(a, &msg, 1);
+        if (ret != 1)
+                return -ENODEV;
+
+        return 0;
+}
+
+void kfr2r09_lcd_on(void *board_data)
+{
+        kfr2r09_lcd_backlight(1);
+}
+
+void kfr2r09_lcd_off(void *board_data)
+{
+        kfr2r09_lcd_backlight(0);
+}
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 0e9b39034df3..c96533794c26 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -11,15 +11,18 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/physmap.h>
+#include <linux/mtd/onenand.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/input.h>
+#include <video/sh_mobile_lcdc.h>
 #include <asm/clock.h>
 #include <asm/machvec.h>
 #include <asm/io.h>
 #include <asm/sh_keysc.h>
 #include <cpu/sh7724.h>
+#include <mach/kfr2r09.h>
 
 static struct mtd_partition kfr2r09_nor_flash_partitions[] =
 {
@@ -60,6 +63,21 @@ static struct platform_device kfr2r09_nor_flash_device = {
         },
 };
 
+static struct resource kfr2r09_nand_flash_resources[] = {
+        [0] = {
+                .name           = "NAND Flash",
+                .start          = 0x10000000,
+                .end            = 0x1001ffff,
+                .flags          = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device kfr2r09_nand_flash_device = {
+        .name           = "onenand-flash",
+        .resource       = kfr2r09_nand_flash_resources,
+        .num_resources  = ARRAY_SIZE(kfr2r09_nand_flash_resources),
+};
+
 static struct sh_keysc_info kfr2r09_sh_keysc_info = {
         .mode = SH_KEYSC_MODE_1, /* KEYOUT0->4, KEYIN0->4 */
         .scan_timing = 3,
@@ -100,13 +118,77 @@ static struct platform_device kfr2r09_sh_keysc_device = {
         },
 };
 
+static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
+        .clock_source = LCDC_CLK_BUS,
+        .ch[0] = {
+                .chan = LCDC_CHAN_MAINLCD,
+                .bpp = 16,
+                .interface_type = SYS18,
+                .clock_divider = 6,
+                .flags = LCDC_FLAGS_DWPOL,
+                .lcd_cfg = {
+                        .name = "TX07D34VM0AAA",
+                        .xres = 240,
+                        .yres = 400,
+                        .left_margin = 0,
+                        .right_margin = 16,
+                        .hsync_len = 8,
+                        .upper_margin = 0,
+                        .lower_margin = 1,
+                        .vsync_len = 1,
+                        .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                },
+                .lcd_size_cfg = {
+                        .width = 35,
+                        .height = 58,
+                },
+                .board_cfg = {
+                        .setup_sys = kfr2r09_lcd_setup,
+                        .display_on = kfr2r09_lcd_on,
+                        .display_off = kfr2r09_lcd_off,
+                },
+                .sys_bus_cfg = {
+                        .ldmt2r = 0x07010904,
+                        .ldmt3r = 0x14012914,
+                        /* set 1s delay to encourage fsync() */
+                        .deferred_io_msec = 1000,
+                },
+        }
+};
+
+static struct resource kfr2r09_sh_lcdc_resources[] = {
+        [0] = {
+                .name   = "LCDC",
+                .start  = 0xfe940000, /* P4-only space */
+                .end    = 0xfe941fff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 106,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device kfr2r09_sh_lcdc_device = {
+        .name           = "sh_mobile_lcdc_fb",
+        .num_resources  = ARRAY_SIZE(kfr2r09_sh_lcdc_resources),
+        .resource       = kfr2r09_sh_lcdc_resources,
+        .dev    = {
+                .platform_data  = &kfr2r09_sh_lcdc_info,
+        },
+};
+
 static struct platform_device *kfr2r09_devices[] __initdata = {
         &kfr2r09_nor_flash_device,
+        &kfr2r09_nand_flash_device,
         &kfr2r09_sh_keysc_device,
+        &kfr2r09_sh_lcdc_device,
 };
 
 #define BSC_CS0BCR 0xfec10004
 #define BSC_CS0WCR 0xfec10024
+#define BSC_CS4BCR 0xfec10010
+#define BSC_CS4WCR 0xfec10030
 
 static int __init kfr2r09_devices_setup(void)
 {
@@ -118,6 +200,10 @@ static int __init kfr2r09_devices_setup(void)
         ctrl_outl(0x36db0400, BSC_CS0BCR);
         ctrl_outl(0x00000500, BSC_CS0WCR);
 
+        /* setup NAND flash at CS4 */
+        ctrl_outl(0x36db0400, BSC_CS4BCR);
+        ctrl_outl(0x00000500, BSC_CS4WCR);
+
         /* setup KEYSC pins */
         gpio_request(GPIO_FN_KEYOUT0, NULL);
         gpio_request(GPIO_FN_KEYOUT1, NULL);
@@ -131,6 +217,37 @@ static int __init kfr2r09_devices_setup(void)
         gpio_request(GPIO_FN_KEYIN4, NULL);
         gpio_request(GPIO_FN_KEYOUT5_IN5, NULL);
 
+        /* setup LCDC pins for SYS panel */
+        gpio_request(GPIO_FN_LCDD17, NULL);
+        gpio_request(GPIO_FN_LCDD16, NULL);
+        gpio_request(GPIO_FN_LCDD15, NULL);
+        gpio_request(GPIO_FN_LCDD14, NULL);
+        gpio_request(GPIO_FN_LCDD13, NULL);
+        gpio_request(GPIO_FN_LCDD12, NULL);
+        gpio_request(GPIO_FN_LCDD11, NULL);
+        gpio_request(GPIO_FN_LCDD10, NULL);
+        gpio_request(GPIO_FN_LCDD9, NULL);
+        gpio_request(GPIO_FN_LCDD8, NULL);
+        gpio_request(GPIO_FN_LCDD7, NULL);
+        gpio_request(GPIO_FN_LCDD6, NULL);
+        gpio_request(GPIO_FN_LCDD5, NULL);
+        gpio_request(GPIO_FN_LCDD4, NULL);
+        gpio_request(GPIO_FN_LCDD3, NULL);
+        gpio_request(GPIO_FN_LCDD2, NULL);
+        gpio_request(GPIO_FN_LCDD1, NULL);
+        gpio_request(GPIO_FN_LCDD0, NULL);
+        gpio_request(GPIO_FN_LCDRS, NULL); /* LCD_RS */
+        gpio_request(GPIO_FN_LCDCS, NULL); /* LCD_CS/ */
+        gpio_request(GPIO_FN_LCDRD, NULL); /* LCD_RD/ */
+        gpio_request(GPIO_FN_LCDWR, NULL); /* LCD_WR/ */
+        gpio_request(GPIO_FN_LCDVSYN, NULL); /* LCD_VSYNC */
+        gpio_request(GPIO_PTE4, NULL); /* LCD_RST/ */
+        gpio_direction_output(GPIO_PTE4, 1);
+        gpio_request(GPIO_PTF4, NULL); /* PROTECT/ */
+        gpio_direction_output(GPIO_PTF4, 1);
+        gpio_request(GPIO_PTU0, NULL); /* LEDSTDBY/ */
+        gpio_direction_output(GPIO_PTU0, 1);
+
         return platform_add_devices(kfr2r09_devices,
                                     ARRAY_SIZE(kfr2r09_devices));
 }
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index a508a0fa7315..be8f0d94f6f1 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -617,7 +617,7 @@ static int __init migor_devices_setup(void)
 
         return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices));
 }
-__initcall(migor_devices_setup);
+arch_initcall(migor_devices_setup);
 
 /* Return the board specific boot mode pin configuration */
 static int migor_mode_pins(void)
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 8de5ebc36b67..d922e1b71410 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 */
@@ -247,7 +255,7 @@ static struct platform_device ceu1_device = {
         },
 };
 
-/* KEYSC */
+/* KEYSC in SoC (Needs SW33-2 set to ON) */
 static struct sh_keysc_info keysc_info = {
         .mode = SH_KEYSC_MODE_1,
         .scan_timing = 10,
@@ -264,12 +272,13 @@ static struct sh_keysc_info keysc_info = {
 
 static struct resource keysc_resources[] = {
         [0] = {
-                .start  = 0x1a204000,
-                .end    = 0x1a20400f,
+                .name   = "KEYSC",
+                .start  = 0x044b0000,
+                .end    = 0x044b000f,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = IRQ0_KEY,
+                .start  = 79,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -439,6 +448,32 @@ 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);
 
@@ -564,15 +599,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;