r3961 - branches/src/target/kernel/2.6.24.x/patches
werner at sita.openmoko.org
werner at sita.openmoko.org
Sat Jan 26 19:17:21 CET 2008
Author: werner
Date: 2008-01-26 19:17:18 +0100 (Sat, 26 Jan 2008)
New Revision: 3961
Modified:
branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
Log:
adjust-glamo-intl-timings-back.patch
From: warmcat <andy at openmoko.com>
smedia-glamo.patch:
- drivers/mfd/glamo/glamo-core.c (glamo_init_script): restored timing values to
avoid frame buffer bitrot
Modified: branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch 2008-01-26 17:56:20 UTC (rev 3960)
+++ branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch 2008-01-26 18:17:18 UTC (rev 3961)
@@ -3,10 +3,10 @@
Signedo-off-by: Harald Welte <laforge at openmoko.org>
-Index: linux-2.6.24-rc7/drivers/mfd/Kconfig
+Index: linux-2.6.24/drivers/mfd/Kconfig
===================================================================
---- linux-2.6.24-rc7.orig/drivers/mfd/Kconfig
-+++ linux-2.6.24-rc7/drivers/mfd/Kconfig
+--- linux-2.6.24.orig/drivers/mfd/Kconfig
++++ linux-2.6.24/drivers/mfd/Kconfig
@@ -15,6 +15,8 @@
interface. The device may be connected by PCI or local bus with
varying functions enabled.
@@ -16,10 +16,10 @@
endmenu
menu "Multimedia Capabilities Port drivers"
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/Makefile
+Index: linux-2.6.24/drivers/mfd/glamo/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/Makefile
++++ linux-2.6.24/drivers/mfd/glamo/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the Smedia Glamo framebuffer driver
@@ -32,10 +32,10 @@
+obj-$(CONFIG_MFD_GLAMO_FB) += glamo-fb.o
+obj-$(CONFIG_MFD_GLAMO_SPI_FB) += glamo-lcm-spi.o
+
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-regs.h
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-regs.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-regs.h
++++ linux-2.6.24/drivers/mfd/glamo/glamo-regs.h
@@ -0,0 +1,477 @@
+#ifndef _GLAMO_REGS_H
+#define _GLAMO_REGS_H
@@ -514,10 +514,10 @@
+};
+
+#endif /* _GLAMO_REGS_H */
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-core.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-core.c
@@ -0,0 +1,1097 @@
+/* Smedia Glamo 336x/337x driver
+ *
@@ -1133,7 +1133,7 @@
+ { GLAMO_REG_CLOCK_RISC1, 0x1000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x3000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x3000 },
-+ { GLAMO_REG_CLOCK_MPROC, 0x1000 },
++ { GLAMO_REG_CLOCK_MPROC, 0x100f },
+ { 0xfffe, 1 },
+ { GLAMO_REG_CLOCK_HOST, 0x0000 },
+ { GLAMO_REG_CLOCK_MEMORY, 0x0000 },
@@ -1151,12 +1151,12 @@
+ { GLAMO_REG_CLOCK_RISC1, 0x0000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x0000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x0000 },
-+ { GLAMO_REG_CLOCK_MPROC, 0x0000 },
++#endif
++ { GLAMO_REG_CLOCK_MPROC, 0x000f },
+ { 0xfffe, 1 },
-+#endif
+ { GLAMO_REG_PLL_GEN1, 0x05db }, /* 48MHz */
+ { GLAMO_REG_PLL_GEN3, 0x09c3 }, /* 80MHz */
-+ { 0xfffe, 30 },
++ { 0xfffe, 50 },
+ /*
+ * b9 of this register MUST be zero to get any interrupts on INT#
+ * the other set bits enable all the engine interrupt sources
@@ -1166,29 +1166,29 @@
+ { GLAMO_REG_CLOCK_GEN7, 0x0101 },
+ { GLAMO_REG_CLOCK_GEN8, 0x0100 },
+ { GLAMO_REG_CLOCK_HOST, 0x000d },
-+ { 0x200, 0x0cf0 /* 0x0ef0 */ },
-+ { 0x202, 0x0298 /* 0x07ff */ },
++ { 0x200, 0x0ef0 },
++ { 0x202, 0x07ff },
+ { 0x212, 0x0000 },
+ { 0x214, 0x4000 },
+ { 0x216, 0xf00e },
+ { GLAMO_REG_MEM_TYPE, 0x0874 }, /* 8MB, 16 word pg wr+rd */
-+ { GLAMO_REG_MEM_GEN, 0xbfbf }, /* 63 grants min + max */
++ { GLAMO_REG_MEM_GEN, 0xafaf }, /* 63 grants min + max */
+ /*
+ * the register below originally 0x0108 makes unreliable Glamo MMC
+ * write operations. Cranked to 0x05ad to add a wait state, the
+ * unreliability is not seen after 4GB of write / read testing
+ */
-+ { GLAMO_REG_MEM_TIMING1, 0x05ad },
-+ { GLAMO_REG_MEM_TIMING2, 0x0011 }, /* Taa = 3 MCLK */
++ { GLAMO_REG_MEM_TIMING1, 0x0108 },
++ { GLAMO_REG_MEM_TIMING2, 0x0010 }, /* Taa = 3 MCLK */
+ { GLAMO_REG_MEM_TIMING3, 0x0000 },
+ { GLAMO_REG_MEM_TIMING4, 0x0000 }, /* CE1# delay fall/rise */
+ { GLAMO_REG_MEM_TIMING5, 0x0000 }, /* UB# LB# */
+ { GLAMO_REG_MEM_TIMING6, 0x0000 }, /* OE# */
+ { GLAMO_REG_MEM_TIMING7, 0x0000 }, /* WE# */
-+ { GLAMO_REG_MEM_TIMING8, 0x1008 }, /* MCLK delay, was 0x1000 */
-+ { GLAMO_REG_MEM_TIMING9, 0x6000 },
++ { GLAMO_REG_MEM_TIMING8, 0x1002 }, /* MCLK delay, was 0x1000 */
++ { GLAMO_REG_MEM_TIMING9, 0x6006 },
+ { GLAMO_REG_MEM_TIMING10, 0x00ff },
-+ { GLAMO_REG_MEM_TIMING11, 0x0000 },
++ { GLAMO_REG_MEM_TIMING11, 0x0001 },
+ { GLAMO_REG_MEM_POWER1, 0x0020 },
+ { GLAMO_REG_MEM_POWER2, 0x0000 },
+ { GLAMO_REG_MEM_DRAM1, 0x0000 },
@@ -1196,8 +1196,8 @@
+ { GLAMO_REG_MEM_DRAM1, 0xc100 },
+ { 0xfffe, 1 },
+ { GLAMO_REG_MEM_DRAM1, 0xe100 },
-+ { GLAMO_REG_MEM_DRAM2, 0x0155 },
-+ { GLAMO_REG_CLOCK_MEMORY, 0x000f },
++ { GLAMO_REG_MEM_DRAM2, 0x01d6 },
++ { GLAMO_REG_CLOCK_MEMORY, 0x000b },
+};
+
+
@@ -1616,10 +1616,10 @@
+MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x core/resource driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.24-rc7/include/asm-arm/arch-s3c2410/irqs.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/irqs.h
===================================================================
---- linux-2.6.24-rc7.orig/include/asm-arm/arch-s3c2410/irqs.h
-+++ linux-2.6.24-rc7/include/asm-arm/arch-s3c2410/irqs.h
+--- linux-2.6.24.orig/include/asm-arm/arch-s3c2410/irqs.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/irqs.h
@@ -155,9 +155,37 @@
#define IRQ_S3C2443_AC97 S3C2410_IRQSUB(28)
@@ -1660,10 +1660,10 @@
+#define IRQ_GLAMO_RISC IRQ_GLAMO(8)
+
#endif /* __ASM_ARCH_IRQ_H */
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-fb.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-fb.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-fb.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-fb.c
@@ -0,0 +1,822 @@
+/* Smedia Glamo 336x/337x driver
+ *
@@ -2487,10 +2487,10 @@
+MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x framebuffer driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.24-rc7/include/linux/glamofb.h
+Index: linux-2.6.24/include/linux/glamofb.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/glamofb.h
++++ linux-2.6.24/include/linux/glamofb.h
@@ -0,0 +1,39 @@
+#ifndef _LINUX_GLAMOFB_H
+#define _LINUX_GLAMOFB_H
@@ -2531,10 +2531,10 @@
+int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
+
+#endif
-Index: linux-2.6.24-rc7/include/linux/spi/glamo.h
+Index: linux-2.6.24/include/linux/spi/glamo.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/spi/glamo.h
++++ linux-2.6.24/include/linux/spi/glamo.h
@@ -0,0 +1,28 @@
+#ifndef __GLAMO_SPI_H
+#define __GLAMO_SPI_H
@@ -2564,10 +2564,10 @@
+
+
+#endif
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.h
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-core.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.h
++++ linux-2.6.24/drivers/mfd/glamo/glamo-core.h
@@ -0,0 +1,91 @@
+#ifndef __GLAMO_CORE_H
+#define __GLAMO_CORE_H
@@ -2660,10 +2660,10 @@
+ enum glamo_engine engine, int ps);
+
+#endif /* __GLAMO_CORE_H */
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-gpio.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-gpio.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-gpio.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-gpio.c
@@ -0,0 +1,62 @@
+
+#include <linux/kernel.h>
@@ -2727,10 +2727,10 @@
+}
+EXPORT_SYMBOL(glamo_gpio_cfgpin);
+
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-lcm-spi.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-lcm-spi.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-lcm-spi.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-lcm-spi.c
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2007 OpenMoko, Inc.
@@ -2973,10 +2973,10 @@
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
+MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>")
+MODULE_LICENSE("GPL");
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/glamo-spi-gpio.c
+Index: linux-2.6.24/drivers/mfd/glamo/glamo-spi-gpio.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-spi-gpio.c
++++ linux-2.6.24/drivers/mfd/glamo/glamo-spi-gpio.c
@@ -0,0 +1,256 @@
+/*
+ * Copyright (C) 2007 OpenMoko, Inc.
@@ -3234,10 +3234,10 @@
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
+MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>")
+MODULE_LICENSE("GPL");
-Index: linux-2.6.24-rc7/include/linux/glamo-gpio.h
+Index: linux-2.6.24/include/linux/glamo-gpio.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/glamo-gpio.h
++++ linux-2.6.24/include/linux/glamo-gpio.h
@@ -0,0 +1,99 @@
+#ifndef __GLAMO_GPIO_H
+#define __GLAMO_GPIO_H
@@ -3338,10 +3338,10 @@
+
+
+#endif /* _GLAMO_GPIO */
-Index: linux-2.6.24-rc7/drivers/mfd/glamo/Kconfig
+Index: linux-2.6.24/drivers/mfd/glamo/Kconfig
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/mfd/glamo/Kconfig
++++ linux-2.6.24/drivers/mfd/glamo/Kconfig
@@ -0,0 +1,35 @@
+config MFD_GLAMO
+ bool "Smedia Glamo 336x/337x support"
@@ -3378,10 +3378,10 @@
+ control channel. This SPI interface is frequently used to
+ interconnect the LCM control interface.
+
-Index: linux-2.6.24-rc7/drivers/mfd/Makefile
+Index: linux-2.6.24/drivers/mfd/Makefile
===================================================================
---- linux-2.6.24-rc7.orig/drivers/mfd/Makefile
-+++ linux-2.6.24-rc7/drivers/mfd/Makefile
+--- linux-2.6.24.orig/drivers/mfd/Makefile
++++ linux-2.6.24/drivers/mfd/Makefile
@@ -3,6 +3,7 @@
#
More information about the commitlog
mailing list
