Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

3 files changed, 174 insertions, 0 deletions

diff --git a/packages/linux/linux-2.6.28/tosa/commit-31c9b28 b/packages/linux/linux-2.6.28/tosa/commit-31c9b28
new file mode 100644
index 0000000000..0ae09c91ce
--- /dev/null
+++ b/packages/linux/linux-2.6.28/tosa/commit-31c9b28
@@ -0,0 +1,67 @@
+commit 31c9b284ae49093fdd9d1e9a347e458c7ebc37a9
+Author: Dmitry Baryshkov <dbaryshkov@gmail.com>
+Date:   Tue Oct 28 18:40:37 2008 +0300
+
+    [ARM] pxa/tosa: support tc6393xb/tmiofb.
+    
+    Add platform data necessary to support tmiofb on tosa.
+    
+    Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
+    Signed-off-by: Eric Miao <eric.miao@marvell.com>
+
+diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
+index 224897a..366a533 100644
+--- a/arch/arm/mach-pxa/tosa.c
++++ b/arch/arm/mach-pxa/tosa.c
+@@ -733,6 +733,43 @@ static void tosa_tc6393xb_teardown(struct platform_device *dev)
+ 	gpio_free(TOSA_GPIO_CARD_VCC_ON);
+ }
+ 
++static struct fb_videomode tosa_tc6393xb_lcd_mode[] = {
++	{
++		.xres = 480,
++		.yres = 640,
++		.pixclock = 0x002cdf00,/* PLL divisor */
++		.left_margin = 0x004c,
++		.right_margin = 0x005b,
++		.upper_margin = 0x0001,
++		.lower_margin = 0x000d,
++		.hsync_len = 0x0002,
++		.vsync_len = 0x0001,
++		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
++		.vmode = FB_VMODE_NONINTERLACED,
++	},{
++		.xres = 240,
++		.yres = 320,
++		.pixclock = 0x00e7f203,/* PLL divisor */
++		.left_margin = 0x0024,
++		.right_margin = 0x002f,
++		.upper_margin = 0x0001,
++		.lower_margin = 0x000d,
++		.hsync_len = 0x0002,
++		.vsync_len = 0x0001,
++		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
++		.vmode = FB_VMODE_NONINTERLACED,
++	}
++};
++
++static struct tmio_fb_data tosa_tc6393xb_fb_config = {
++	.lcd_set_power	= tc6393xb_lcd_set_power,
++	.lcd_mode	= tc6393xb_lcd_mode,
++	.num_modes	= ARRAY_SIZE(tosa_tc6393xb_lcd_mode),
++	.modes		= &tosa_tc6393xb_lcd_mode[0],
++	.height		= 82,
++	.width		= 60,
++};
++
+ static struct tc6393xb_platform_data tosa_tc6393xb_data = {
+ 	.scr_pll2cr	= 0x0cc1,
+ 	.scr_gper	= 0x3300,
+@@ -748,6 +785,7 @@ static struct tc6393xb_platform_data tosa_tc6393xb_data = {
+ 	.resume		= tosa_tc6393xb_resume,
+ 
+ 	.nand_data	= &tosa_tc6393xb_nand_config,
++	.fb_data	= &tosa_tc6393xb_fb_config,
+ 
+ 	.resume_restore = 1,
+ };
diff --git a/packages/linux/linux-2.6.28/tosa/commit-ddfb33c b/packages/linux/linux-2.6.28/tosa/commit-ddfb33c
new file mode 100644
index 0000000000..4f3278afe3
--- /dev/null
+++ b/packages/linux/linux-2.6.28/tosa/commit-ddfb33c
@@ -0,0 +1,39 @@
+commit ddfb33c0ffbd8b8f5984de5a8f9513b88cd28b67
+Author: Dmitry Baryshkov <dbaryshkov@gmail.com>
+Date:   Thu Nov 27 01:25:09 2008 +0300
+
+    [ARM] pxa/tosa: fix building w/o TC6393XB driver
+    
+    Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
+    Signed-off-by: Eric Miao <eric.miao@marvell.com>
+
+diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
+index 366a533..c46b640 100644
+--- a/arch/arm/mach-pxa/tosa.c
++++ b/arch/arm/mach-pxa/tosa.c
+@@ -733,6 +733,7 @@ static void tosa_tc6393xb_teardown(struct platform_device *dev)
+ 	gpio_free(TOSA_GPIO_CARD_VCC_ON);
+ }
+ 
++#ifdef CONFIG_MFD_TC6393XB
+ static struct fb_videomode tosa_tc6393xb_lcd_mode[] = {
+ 	{
+ 		.xres = 480,
+@@ -769,6 +770,7 @@ static struct tmio_fb_data tosa_tc6393xb_fb_config = {
+ 	.height		= 82,
+ 	.width		= 60,
+ };
++#endif
+ 
+ static struct tc6393xb_platform_data tosa_tc6393xb_data = {
+ 	.scr_pll2cr	= 0x0cc1,
+@@ -785,7 +787,9 @@ static struct tc6393xb_platform_data tosa_tc6393xb_data = {
+ 	.resume		= tosa_tc6393xb_resume,
+ 
+ 	.nand_data	= &tosa_tc6393xb_nand_config,
++#ifdef CONFIG_MFD_TC6393XB
+ 	.fb_data	= &tosa_tc6393xb_fb_config,
++#endif
+ 
+ 	.resume_restore = 1,
+ };
diff --git a/packages/linux/linux-2.6.28/tosa/commit-f34ee79 b/packages/linux/linux-2.6.28/tosa/commit-f34ee79
new file mode 100644
index 0000000000..37522d8aa2
--- /dev/null
+++ b/packages/linux/linux-2.6.28/tosa/commit-f34ee79
@@ -0,0 +1,68 @@
+commit f34ee79a5307e9a4c68c978840cf7e7e10236362
+Author: Dmitry Baryshkov <dbaryshkov@gmail.com>
+Date:   Tue Nov 25 00:57:27 2008 +0300
+
+    [ARM] pxa/tosa: add physmap mapping for ROM
+    
+    Add mapping for system ROM using physmap-flash mapping.
+    
+    Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
+    Signed-off-by: Eric Miao <eric.miao@marvell.com>
+
+diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
+index c46b640..3332e5d 100644
+--- a/arch/arm/mach-pxa/tosa.c
++++ b/arch/arm/mach-pxa/tosa.c
+@@ -25,6 +25,7 @@
+ #include <linux/mfd/tmio.h>
+ #include <linux/mtd/nand.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/mtd/physmap.h>
+ #include <linux/pm.h>
+ #include <linux/gpio_keys.h>
+ #include <linux/input.h>
+@@ -831,6 +832,36 @@ static struct spi_board_info spi_board_info[] __initdata = {
+ 	},
+ };
+ 
++static struct mtd_partition sharpsl_rom_parts[] = {
++	{
++		.name	="Boot PROM Filesystem",
++		.offset	= 0x00160000,
++		.size	= MTDPART_SIZ_FULL,
++	},
++};
++
++static struct physmap_flash_data sharpsl_rom_data = {
++	.width		= 2,
++	.nr_parts	= ARRAY_SIZE(sharpsl_rom_parts),
++	.parts		= sharpsl_rom_parts,
++};
++
++static struct resource sharpsl_rom_resources[] = {
++	{
++		.start	= 0x00000000,
++		.end	= 0x007fffff,
++		.flags	= IORESOURCE_MEM,
++	},
++};
++
++static struct platform_device sharpsl_rom_device = {
++	.name	= "physmap-flash",
++	.id	= -1,
++	.resource = sharpsl_rom_resources,
++	.num_resources = ARRAY_SIZE(sharpsl_rom_resources),
++	.dev.platform_data = &sharpsl_rom_data,
++};
++
+ static struct platform_device *devices[] __initdata = {
+ 	&tosascoop_device,
+ 	&tosascoop_jc_device,
+@@ -840,6 +871,7 @@ static struct platform_device *devices[] __initdata = {
+ 	&tosa_gpio_keys_device,
+ 	&tosaled_device,
+ 	&tosa_bt_device,
++	&sharpsl_rom_device,
+ };
+ 
+ static void tosa_poweroff(void)