Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3592 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
2. r3593 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3594 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
4. r3595 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
5. r3596 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-12-06 09:45:53 +0100 (Thu, 06 Dec 2007)
New Revision: 3592
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
Log:
* gta01: make sure upper/lower margin of LCM is set correct
* gta01: make sure we start with a default resolution of 640x480
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-06 07:05:30 UTC (rev 3591)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-06 08:45:53 UTC (rev 3592)
@@ -344,8 +344,8 @@
+ .left_margin = 104,
+ .right_margin = 8,
+ .hsync_len = 8,
-+ .upper_margin = 16,
-+ .lower_margin = 2,
++ .upper_margin = 2,
++ .lower_margin = 16,
+ .vsync_len = 2,
+ .lcdcon5 = S3C2410_LCDCON5_FRM565 |
+ S3C2410_LCDCON5_INVVCLK |
@@ -359,7 +359,7 @@
+static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = {
+ .displays = gta01_displays,
+ .num_displays = ARRAY_SIZE(gta01_displays),
-+ .default_display= 1,
++ .default_display= 0,
+
+ .lpcsel = ((0xCE6) & ~7) | 1<<4,
+};
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-06 11:42:10 +0100 (Thu, 06 Dec 2007)
New Revision: 3593
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-backlight.patch
Log:
sync commit 3212 from 2.6.22.x: remove dynamic pclk-dependent backlight pwm
counter calculation, sicne it no longer works with new pwm api
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-backlight.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-backlight.patch
2007-12-06 08:45:53 UTC (rev 3592)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-backlight.patch
2007-12-06 10:42:10 UTC (rev 3593)
@@ -35,7 +35,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.23/drivers/video/backlight/gta01_bl.c
-@@ -0,0 +1,257 @@
+@@ -0,0 +1,256 @@
+/*
+ * Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
+ *
@@ -97,14 +97,13 @@
+#define GTA01BL_SUSPENDED 0x01
+#define GTA01BL_BATTLOW 0x02
+
-+#define GTA01BL_FREQ 400
-+
+/* On the GTA01 / Neo1973, we use a 50 or 66MHz PCLK, which gives
+ * us a 6.25..8.25MHz DIV8 clock, which is further divided by a
+ * prescaler of 4, resulting in a 1.56..2.06MHz tick. This results in a
+ * minimum frequency of 24..31Hz. At 400Hz, we need to set the count
+ * to something like 3906..5156, providing us a way sufficient resolution
+ * for display brightness adjustment. */
++#define GTA01BL_COUNTER 5156
+
+static int gta01bl_send_intensity(struct backlight_device *bd)
+{
@@ -151,7 +150,7 @@
+ gta01bl.pwm.timerid = PWM0;
+ gta01bl.pwm.prescaler = (4 - 1);
+ gta01bl.pwm.divider = S3C2410_TCFG1_MUX0_DIV8;
-+ gta01bl.pwm.counter = (((gta01bl.pwm.pclk_rate) / 32) / GTA01BL_FREQ)
-1;
++ gta01bl.pwm.counter = GTA01BL_COUNTER;
+ gta01bl.pwm.comparer = gta01bl.pwm.counter;
+
+ rc = s3c2410_pwm_enable(>a01bl.pwm);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-06 11:50:42 +0100 (Thu, 06 Dec 2007)
New Revision: 3594
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
sync with svn commit r3213 from 2.6.22.x patchset:
* GTA02: work around a race condition between usb detection and pmu driver
* GTA02: add (untested) wifi power-up code statically at boot time
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-06 10:42:10 UTC (rev 3593)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-06 10:50:42 UTC (rev 3594)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,643 @@
+@@ -0,0 +1,663 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
+ *
@@ -33,6 +33,7 @@
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
++#include <linux/delay.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/workqueue.h>
@@ -391,6 +392,11 @@
+
+static void __gta02_udc_vbus_draw(struct work_struct *work)
+{
++ if (!pcf50633_global) {
++ printk(KERN_ERR, "pcf50633 not initialized yet, can't change "
++ "vbus_draw\n");
++ return;
++ }
+ pcf50633_usb_curlim_set(pcf50633_global, gta02_udc_vbus_drawer.ma);
+}
+
@@ -612,6 +618,19 @@
+ s3c24xx_udc_set_platdata(>a02_udc_cfg);
+ set_s3c2410ts_info(>a02_ts_cfg);
+
++ /* FIXME: hardcoded WLAN module power-up */
++ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
++ switch (system_rev) {
++ case GTA02v1_SYSTEM_REV:
++ break;
++ default:
++ s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
++ udelay(2000);
++ udelay(2000);
++ s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
++ break;
++ }
++
+ platform_device_register(>a01_button_dev);
+ platform_device_register(>a01_pm_gsm_dev);
+
@@ -631,6 +650,7 @@
+ s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
+ s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
+
++ /* Make sure the modem can wake us up */
+ set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
+ request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED, "modem",
+ NULL);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-06 11:52:46 +0100 (Thu, 06 Dec 2007)
New Revision: 3595
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
merge commit 3214 from 2.6.22.5 patchset:
fix GTA02 led definitions and resource names
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-06 10:50:42 UTC (rev 3594)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-06 10:52:46 UTC (rev 3595)
@@ -461,17 +461,17 @@
+
+static struct resource gta02_led_resources[] = {
+ {
-+ .name = "gta02-power:color",
-+ .start = GTA02_GPIO_PWR_LED,
-+ .end = GTA02_GPIO_PWR_LED,
++ .name = "gta02-power:orange",
++ .start = GTA02_GPIO_PWR_LED1,
++ .end = GTA02_GPIO_PWR_LED1,
+ }, {
-+ .name = "gta02-aux:foo",
-+ .start = GTA02_GPIO_AUX_LED1,
-+ .end = GTA02_GPIO_AUX_LED1,
++ .name = "gta02-power:blue",
++ .start = GTA02_GPIO_PWR_LED2,
++ .end = GTA02_GPIO_PWR_LED2,
+ }, {
-+ .name = "gta02-aux:bar",
-+ .start = GTA02_GPIO_AUX_LED2,
-+ .end = GTA02_GPIO_AUX_LED2,
++ .name = "gta02-aux:red",
++ .start = GTA02_GPIO_AUX_LED,
++ .end = GTA02_GPIO_AUX_LED,
+ },
+};
+
@@ -685,9 +685,9 @@
+
+#define GTA02_GPIO_n3DL_GSM S3C2410_GPA13 /* v1 + v2 + v3 only */
+
-+#define GTA02_GPIO_AUX_LED1 S3C2410_GPB0
-+#define GTA02_GPIO_AUX_LED2 S3C2410_GPB1
-+#define GTA02_GPIO_PWR_LED S3C2410_GPB2
++#define GTA02_GPIO_PWR_LED1 S3C2410_GPB0
++#define GTA02_GPIO_PWR_LED2 S3C2410_GPB1
++#define GTA02_GPIO_AUX_LED S3C2410_GPB2
+#define GTA02_GPIO_VIBRATOR_ON S3C2410_GPB3
+#define GTA02v1_GPIO_GPS_PWRON S3C2410_GPB4 /* v1 only */
+#define GTA02_GPIO_MODEM_RST S3C2410_GPB5
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-06 11:58:31 +0100 (Thu, 06 Dec 2007)
New Revision: 3596
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
Log:
merge commit 3233 from 2.6.22.x series: Make sure the display gets enabled
again after coming out of the deep-standby state (Stefan Schmidt)
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
2007-12-06 10:52:46 UTC (rev 3595)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
2007-12-06 10:58:31 UTC (rev 3596)
@@ -1,11 +1,11 @@
This driver adds support for LCM initialization of the JBT6K74 LCM
as found on the FIC GTA01 hardware
-Index: linux-2.6.21.3-moko/drivers/spi/Kconfig
+Index: linux-2.6/drivers/spi/Kconfig
===================================================================
---- linux-2.6.21.3-moko.orig/drivers/spi/Kconfig
-+++ linux-2.6.21.3-moko/drivers/spi/Kconfig
-@@ -160,5 +160,9 @@
+--- linux-2.6.orig/drivers/spi/Kconfig
++++ linux-2.6/drivers/spi/Kconfig
+@@ -237,5 +237,9 @@
# (slave support would go here)
@@ -15,21 +15,21 @@
+
endmenu # "SPI support"
-Index: linux-2.6.21.3-moko/drivers/spi/Makefile
+Index: linux-2.6/drivers/spi/Makefile
===================================================================
---- linux-2.6.21.3-moko.orig/drivers/spi/Makefile
-+++ linux-2.6.21.3-moko/drivers/spi/Makefile
-@@ -30,4 +30,5 @@
+--- linux-2.6.orig/drivers/spi/Makefile
++++ linux-2.6/drivers/spi/Makefile
+@@ -39,4 +39,5 @@
# ... add above this line ...
# SPI slave drivers (protocol for that link)
+obj-$(CONFIG_SPI_SLAVE_JBT6K74) += jbt6k74.o
# ... add above this line ...
-Index: linux-2.6.21.3-moko/drivers/spi/jbt6k74.c
+Index: linux-2.6/drivers/spi/jbt6k74.c
===================================================================
--- /dev/null
-+++ linux-2.6.21.3-moko/drivers/spi/jbt6k74.c
-@@ -0,0 +1,544 @@
++++ linux-2.6/drivers/spi/jbt6k74.c
+@@ -0,0 +1,548 @@
+/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
+ *
+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
@@ -397,7 +397,11 @@
+ for (i = 0; i < ARRAY_SIZE(jbt_state_names); i++) {
+ if (!strncmp(buf, jbt_state_names[i],
+ strlen(jbt_state_names[i]))) {
++ DEBUGP("Switch to state: %u\n", i);
+ jbt6k74_enter_state(jbt, i);
++ if (i == JBT_STATE_NORMAL)
++ /* Enable display again after deep-standby */
++ jbt6k74_display_onoff(jbt, 1);
+ return count;
+ }
+ }
@@ -574,11 +578,11 @@
+
+module_init(jbt_init);
+module_exit(jbt_exit);
-Index: linux-2.6.21.3-moko/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.21.3-moko.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.21.3-moko/arch/arm/mach-s3c2410/Kconfig
-@@ -106,6 +106,7 @@
+--- linux-2.6.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6/arch/arm/mach-s3c2410/Kconfig
+@@ -113,6 +113,7 @@
config MACH_QT2410
bool "QT2410"
select CPU_S3C2410
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
