From: Paul Mundt <lethal@linux-sh.org>
Date: Sat, 15 Aug 2009 04:00:02 +0000 (+0900)
Subject: Merge branch 'master' into sh/hwblk
X-Git-Tag: v2.6.32-rc1~640^2~35^2~17^2~8^2~1
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=4b6b987969b076298485697bfb0d0e35502642a3

Merge branch 'master' into sh/hwblk
---

4b6b987969b076298485697bfb0d0e35502642a3
diff --cc arch/sh/boards/mach-kfr2r09/setup.c
index 0e9b390,bdb10c2..c965337
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@@ -95,14 -113,73 +113,76 @@@ static struct platform_device kfr2r09_s
  	.dev	= {
  		.platform_data	= &kfr2r09_sh_keysc_info,
  	},
 +	.archdata = {
 +		.hwblk_id = HWBLK_KEYSC,
 +	},
  };
  
+ 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
diff --cc arch/sh/boards/mach-se/7724/setup.c
index 8de5ebc,9162081..d922e1b
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@@ -242,12 -244,9 +250,12 @@@ static struct platform_device ceu1_devi
  	.dev	= {
  		.platform_data	= &sh_mobile_ceu1_info,
  	},
 +	.archdata = {
 +		.hwblk_id = HWBLK_CEU1,
 +	},
  };
  
- /* 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,