linux-openmoko-2.6.34: add rebased gdrm and qtmoko patches, use gta02_drm_defconfig again

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 162 insertions, 0 deletions

diff --git a/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch b/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
new file mode 100644
index 0000000000..c9afc89c96
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
@@ -0,0 +1,162 @@
+From 0c38c5d7bcce1b62534e76419ee04eea0fe50128 Mon Sep 17 00:00:00 2001
+From: Thomas White <taw@bitwiz.org.uk>
+Date: Tue, 17 Nov 2009 23:45:29 +0100
+Subject: [PATCH 03/13] Work on Glamo-core for DRM
+
+This adds modifications to the core of the Glamo driver to expose functionality
+to support DRM and KMS.
+
+Signed-off-by: Thomas White <taw@bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-core.c |   27 +++++++++++++++++++++------
+ drivers/mfd/glamo/glamo-core.h |   32 ++++++++++++++++++++++----------
+ drivers/mfd/glamo/glamo-regs.h |   24 ++++++++++++++++++++++++
+ include/linux/mfd/glamo.h      |    7 ++-----
+ 4 files changed, 69 insertions(+), 21 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
+index 23073fe..f894c91 100644
+--- a/drivers/mfd/glamo/glamo-core.c
++++ b/drivers/mfd/glamo/glamo-core.c
+@@ -222,10 +222,25 @@ static struct resource glamo_fb_resources[] = {
+ 		.flags	= IORESOURCE_MEM,
+ 	}, {
+ 		.name	= "glamo-fb-mem",
+-		.start	= GLAMO_OFFSET_FB,
+-		.end	= GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1,
++		.start	= GLAMO_MEM_BASE + GLAMO_OFFSET_FB,
++		.end	= GLAMO_MEM_BASE + GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1,
+ 		.flags	= IORESOURCE_MEM,
+-	},
++	}, {
++		.name	= "glamo-cmdq-regs",
++		.start  = GLAMO_REGOFS_CMDQUEUE,
++		.end    = GLAMO_REGOFS_RISC - 1,
++		.flags  = IORESOURCE_MEM,
++	}, {
++		.name	= "glamo-2d-regs",
++		.start  = GLAMO_REGOFS_2D,
++		.end    = GLAMO_REGOFS_3D- 1,
++		.flags  = IORESOURCE_MEM,
++	}, {
++		.name	= "glamo-2d-irq",
++		.start	= GLAMO_IRQ_2D,
++		.end	= GLAMO_IRQ_2D,
++		.flags	= IORESOURCE_IRQ,
++	}
+ };
+ 
+ static struct resource glamo_mmc_resources[] = {
+@@ -236,9 +251,9 @@ static struct resource glamo_mmc_resources[] = {
+ 		.flags	= IORESOURCE_MEM
+ 	}, {
+ 		.name	= "glamo-mmc-mem",
+-		.start	= GLAMO_OFFSET_FB + GLAMO_FB_SIZE,
+-		.end	= GLAMO_OFFSET_FB + GLAMO_FB_SIZE +
+-				  GLAMO_MMC_BUFFER_SIZE - 1,
++		.start	= GLAMO_MEM_BASE + GLAMO_OFFSET_MMC,
++		.end	= GLAMO_MEM_BASE + GLAMO_OFFSET_MMC
++		                         + GLAMO_MMC_BUFFER_SIZE - 1,
+ 		.flags	= IORESOURCE_MEM
+ 	}, {
+ 		.start	= GLAMO_IRQ_MMC,
+diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
+index 17017b0..0adba96 100644
+--- a/drivers/mfd/glamo/glamo-core.h
++++ b/drivers/mfd/glamo/glamo-core.h
+@@ -3,18 +3,30 @@
+ 
+ #include <linux/mfd/glamo.h>
+ 
++/* Amount of Glamo memory */
++#define GLAMO_INTERNAL_RAM_SIZE 0x800000
++
++/* Arbitrarily determined amount for the hardware cursor */
++#define GLAMO_CURSOR_SIZE (4096)
++#define GLAMO_MMC_BUFFER_SIZE (64 * 1024) /* 64k MMC buffer */
++/* Remaining memory will be used for 2D and 3D graphics */
++#define GLAMO_FB_SIZE (GLAMO_INTERNAL_RAM_SIZE     \
++			 - GLAMO_CURSOR_SIZE       \
++			 - GLAMO_MMC_BUFFER_SIZE)
++/* A 640x480, 16bpp, double-buffered framebuffer */
++#if (GLAMO_FB_SIZE < (640 * 480 * 4))	/* == 0x12c000 */
++#error Not enough Glamo VRAM for framebuffer!
++#endif
++
+ /* for the time being, we put the on-screen framebuffer into the lowest
+  * VRAM space.  This should make the code easily compatible with the various
+- * 2MB/4MB/8MB variants of the Smedia chips */
+-#define GLAMO_OFFSET_VRAM	0x800000
+-#define GLAMO_OFFSET_FB	(GLAMO_OFFSET_VRAM)
+-
+-/* we only allocate the minimum possible size for the framebuffer to make
+- * sure we have sufficient memory for other functions of the chip */
+-/*#define GLAMO_FB_SIZE	(640*480*4)	*//* == 0x12c000 */
+-#define GLAMO_INTERNAL_RAM_SIZE 0x800000
+-#define GLAMO_MMC_BUFFER_SIZE (64 * 1024)
+-#define GLAMO_FB_SIZE	(GLAMO_INTERNAL_RAM_SIZE - GLAMO_MMC_BUFFER_SIZE)
++ * 2MB/4MB/8MB variants of the Smedia chips
++ * glamo-fb.c assumes FB comes first, followed by cursor, so DON'T MOVE THEM
++ * (see glamo_regs[] in glamo-fb.c for more information) */
++#define GLAMO_MEM_BASE 		(0x800000)
++#define GLAMO_OFFSET_FB		(0x000000)
++#define GLAMO_OFFSET_CURSOR	(GLAMO_OFFSET_FB + GLAMO_FB_SIZE)
++#define GLAMO_OFFSET_MMC	(GLAMO_OFFSET_CURSOR + GLAMO_CURSOR_SIZE)
+ 
+ enum glamo_pll {
+     GLAMO_PLL1,
+diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
+index 59848e1..8b2fd47 100644
+--- a/drivers/mfd/glamo/glamo-regs.h
++++ b/drivers/mfd/glamo/glamo-regs.h
+@@ -627,4 +627,28 @@ enum glamo_core_revisions {
+ 	GLAMO_CORE_REV_A3		= 0x0003,
+ };
+ 
++enum glamo_register_cq {
++	GLAMO_REG_CMDQ_BASE_ADDRL     = 0x00,
++	GLAMO_REG_CMDQ_BASE_ADDRH     = 0x02,
++	GLAMO_REG_CMDQ_LEN            = 0x04,
++	GLAMO_REG_CMDQ_WRITE_ADDRL    = 0x06,
++	GLAMO_REG_CMDQ_WRITE_ADDRH    = 0x08,
++	GLAMO_REG_CMDQ_FLIP           = 0x0a,
++	GLAMO_REG_CMDQ_CONTROL        = 0x0c,
++	GLAMO_REG_CMDQ_READ_ADDRL     = 0x0e,
++	GLAMO_REG_CMDQ_READ_ADDRH     = 0x10,
++	GLAMO_REG_CMDQ_STATUS         = 0x12,
++};
++
++#define REG_2D(x)		(GLAMO_REGOFS_2D+(x))
++
++enum glamo_register_2d {
++	GLAMO_REG_2D_DST_X		= REG_2D(0x0a),
++	GLAMO_REG_2D_COMMAND1           = REG_2D(0x3a),
++	GLAMO_REG_2D_STATUS		= REG_2D(0x42),
++	GLAMO_REG_2D_ID1		= REG_2D(0x44),
++	GLAMO_REG_2D_ID2		= REG_2D(0x46),
++	GLAMO_REG_2D_ID3		= REG_2D(0x48),
++};
++
+ #endif /* _GLAMO_REGS_H */
+diff --git a/include/linux/mfd/glamo.h b/include/linux/mfd/glamo.h
+index 529d4f0..ea91a06 100644
+--- a/include/linux/mfd/glamo.h
++++ b/include/linux/mfd/glamo.h
+@@ -41,12 +41,9 @@ enum glamo_engine {
+ 	GLAMO_ENGINE_RISC = 11,
+ 	GLAMO_ENGINE_MICROP1_MPEG_ENC = 12,
+ 	GLAMO_ENGINE_MICROP1_MPEG_DEC = 13,
+-#if 0
+-	GLAMO_ENGINE_H264_DEC = 14,
+-	GLAMO_ENGINE_RISC1 = 15,
+-	GLAMO_ENGINE_SPI = 16,
+-#endif
+ 	__NUM_GLAMO_ENGINES
+ };
+ 
++#define GLAMO_ENGINE_ALL (__NUM_GLAMO_ENGINES)
++
+ #endif
+-- 
+1.7.1
+