r3843 - branches/src/target/kernel/2.6.24.x/patches
werner at sita.openmoko.org
werner at sita.openmoko.org
Tue Jan 15 21:16:01 CET 2008
Author: werner
Date: 2008-01-15 21:15:59 +0100 (Tue, 15 Jan 2008)
New Revision: 3843
Modified:
branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch
Log:
Applied "defeat-glamo-lcm-reset-since-uboot-does-it.patch",
http://git.openmoko.org/?p=kernel.git;a=commit;h=5fc5b83b6fcab7ed5c54f96990358e9b67c42083
We don't need to go around resetting the video and lcm so much
now that U-boot got there first
Signed-off-by: Andy Green <andy at warmcat.com>
smedia-glamo.patch:
- drivers/mfd/glamo/glamo-core.c (glamo_init_script): enable microprocessor
clocks (GLAMO_REG_CLOCK_MPROC)
- drivers/mfd/glamo/glamo-core.c (glamo_init_script): set memory type to 8MB
(GLAMO_REG_MEM_TYPE)
- drivers/mfd/glamo/glamo-fb.c (glamofb_probe): don't pull the LCM out of reset
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-15 20:01:51 UTC (rev 3842)
+++ branches/src/target/kernel/2.6.24.x/patches/smedia-glamo.patch 2008-01-15 20:15:59 UTC (rev 3843)
@@ -518,7 +518,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-core.c
-@@ -0,0 +1,1107 @@
+@@ -0,0 +1,1112 @@
+/* Smedia Glamo 336x/337x driver
+ *
+ * (C) 2007 by OpenMoko, Inc.
@@ -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 },
@@ -1150,7 +1150,7 @@
+ { GLAMO_REG_CLOCK_RISC1, 0x0000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x0000 },
+ { GLAMO_REG_CLOCK_MPEG, 0x0000 },
-+ { GLAMO_REG_CLOCK_MPROC, 0x0000 },
++ { GLAMO_REG_CLOCK_MPROC, 0x000f },
+ { 0xfffe, 1 },
+ { GLAMO_REG_PLL_GEN1, 0x05db }, /* 48MHz */
+ { GLAMO_REG_PLL_GEN3, 0x09c3 }, /* 80MHz */
@@ -1165,6 +1165,7 @@
+ { 0x212, 0x0000 },
+ { 0x214, 0x4000 },
+ { 0x216, 0xf00e },
++ { GLAMO_REG_MEM_TYPE, 0x0874 },
+ { GLAMO_REG_MEM_GEN, 0xafaf },
+ { GLAMO_REG_MEM_TIMING1, 0x0108 },
+ { GLAMO_REG_MEM_TIMING2, 0x0010 },
@@ -1179,10 +1180,14 @@
+ { GLAMO_REG_MEM_TIMING11, 0x0001 },
+ { GLAMO_REG_MEM_POWER1, 0x0020 },
+ { GLAMO_REG_MEM_POWER2, 0x0000 },
++ { GLAMO_REG_MEM_DRAM1, 0x0000 },
++ { 0xfffe, 1 },
++ { GLAMO_REG_MEM_DRAM1, 0xc100 },
++ { 0xfffe, 1 },
++ { GLAMO_REG_MEM_DRAM1, 0xe100 },
+ { GLAMO_REG_MEM_DRAM2, 0x01d6 },
+ { GLAMO_REG_CLOCK_MEMORY, 0x000a },
-+ { GLAMO_REG_CLOCK_MEMORY, 0x000b },
-+ { GLAMO_REG_MEM_TYPE, 0x0873 },
++// { GLAMO_REG_CLOCK_MEMORY, 0x000b },
+};
+
+#if 0 /* MM370 */
@@ -1674,7 +1679,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.24-rc7/drivers/mfd/glamo/glamo-fb.c
-@@ -0,0 +1,829 @@
+@@ -0,0 +1,823 @@
+/* Smedia Glamo 336x/337x driver
+ *
+ * (C) 2007 by OpenMoko, Inc.
@@ -2418,12 +2423,6 @@
+ goto out_unmap_fb;
+ }
+
-+ /* pull LCM out of reset (bootloader should have done this before!!) */
-+ /* FIXME: make this part of platform info */
-+ glamo_gpio_cfgpin(mach_info->glamo, GLAMO_GPIO4_OUTPUT);
-+ glamo_gpio_setpin(mach_info->glamo, GLAMO_GPIO4, 1);
-+ msleep(90);
-+
+ if (mach_info->spi_info) {
+ /* register the sibling spi device */
+ mach_info->spi_info->glamofb_handle = glamofb;
More information about the commitlog
mailing list