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. r3209 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
2. r3210 - in
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0:
. mokomediaplayer ([EMAIL PROTECTED])
3. r3211 - branches/src/target/kernel/2.6.23.x/patches
([EMAIL PROTECTED])
4. r3212 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
5. r3213 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
6. r3214 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
7. r3215 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-10-17 20:30:27 +0200 (Wed, 17 Oct 2007)
New Revision: 3209
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
make GTA02 pcf50633 changes compile again
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-17 14:46:20 UTC
(rev 3208)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-17 18:30:27 UTC
(rev 3209)
@@ -515,7 +515,7 @@
+const char *neo1973_get_charge_status(void)
+{
+ /* FIXME */
-+ return pcf50633_charger_state(void);
++ return pcf50633_charger_state();
+}
+
+int neo1973_set_charge_mode(enum neo1973_charger_cmd cmd)
@@ -1322,7 +1322,7 @@
+ return pcf50633_reg_set_bit_mask(PCF50633_REG_MBCC7, 0x03, val);
+}
+
-+static const char *charger_states = {
++static const char *charger_states[] = {
+ [0] = "play_only",
+ [1] = "usb_precharge",
+ [2] = "usb_precharge_wait",
--- End Message ---
--- Begin Message ---
Author: abraxa
Date: 2007-10-17 23:49:31 +0200 (Wed, 17 Oct 2007)
New Revision: 3210
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/mokomediaplayer/pgbar_background.png
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/mokomediaplayer/pgbar_bar.png
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-mediaplayer
Log:
Fix the GtkProgressBar theming
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/mokomediaplayer/pgbar_background.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/mokomediaplayer/pgbar_bar.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-mediaplayer
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-mediaplayer
2007-10-17 18:30:27 UTC (rev 3209)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-mediaplayer
2007-10-17 21:49:31 UTC (rev 3210)
@@ -90,25 +90,43 @@
style "omp-main-btm-progressbar"
{
- bg[NORMAL] = "#181818"
- bg[PRELIGHT] = "#d66900"
+ # This color must be the same as pgbar_bar.png
+ # The first couple pixels will be drawn with it
+ # Why, you ask? It's GTK...
+ bg[PRELIGHT] = "#b15400"
- xthickness = 5
- ythickness = 5
-# GtkProgressBar::xspacing = 1
-# GtkProgressBar::yspacing = 1
+ xthickness = 6
+ ythickness = 6
engine "pixmap"
{
- image
+ image
{
+ function = BOX
+ detail = "trough"
+ file = "mokomediaplayer/pgbar_background.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ orientation = HORIZONTAL
+ }
+ image
+ {
+ function = BOX
+ detail = "bar"
+ file = "mokomediaplayer/pgbar_bar.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ orientation = HORIZONTAL
+ }
+ image
+ {
function = SHADOW
shadow = IN
file = "mokomediaplayer/frame.png"
- border = { 2, 2, 2, 2 }
+ border = { 0, 0, 0, 0 }
stretch = TRUE
}
- image
+ image
{
function = SHADOW
shadow = OUT
@@ -118,7 +136,7 @@
}
}
}
-widget "*omp-main-btm-progressbar" style "omp-main-btm-progressbar"
+widget "*omp-main-btm-progressbar" style : highest "omp-main-btm-progressbar"
style "omp-main-btm-button-box"
--- End Message ---
--- Begin Message ---
Author: shoragan
Date: 2007-10-18 00:45:18 +0200 (Thu, 18 Oct 2007)
New Revision: 3211
Modified:
branches/src/target/kernel/2.6.23.x/patches/gta01-backlight.patch
branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
branches/src/target/kernel/2.6.23.x/patches/s3c2410-pwm.patch
Log:
Restructure gta01 backlight and vibrator for the new s3c2410-pwm.
Modified: branches/src/target/kernel/2.6.23.x/patches/gta01-backlight.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta01-backlight.patch
2007-10-17 21:49:31 UTC (rev 3210)
+++ branches/src/target/kernel/2.6.23.x/patches/gta01-backlight.patch
2007-10-17 22:45:18 UTC (rev 3211)
@@ -1,10 +1,10 @@
This is a backlight driver for FIC's Neo1973 Phone (codename GTA01)
-Index: linux-2.6.22.5-moko/drivers/video/backlight/Kconfig
+Index: linux-2.6.23/drivers/video/backlight/Kconfig
===================================================================
---- linux-2.6.22.5-moko.orig/drivers/video/backlight/Kconfig
-+++ linux-2.6.22.5-moko/drivers/video/backlight/Kconfig
-@@ -48,6 +48,14 @@
+--- linux-2.6.23.orig/drivers/video/backlight/Kconfig
++++ linux-2.6.23/drivers/video/backlight/Kconfig
+@@ -54,6 +54,14 @@
If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y
to
enable the LCD/backlight driver.
@@ -19,10 +19,10 @@
config BACKLIGHT_HP680
tristate "HP Jornada 680 Backlight Driver"
depends on BACKLIGHT_CLASS_DEVICE && SH_HP6XX
-Index: linux-2.6.22.5-moko/drivers/video/backlight/Makefile
+Index: linux-2.6.23/drivers/video/backlight/Makefile
===================================================================
---- linux-2.6.22.5-moko.orig/drivers/video/backlight/Makefile
-+++ linux-2.6.22.5-moko/drivers/video/backlight/Makefile
+--- linux-2.6.23.orig/drivers/video/backlight/Makefile
++++ linux-2.6.23/drivers/video/backlight/Makefile
@@ -3,6 +3,7 @@
obj-$(CONFIG_LCD_CLASS_DEVICE) += lcd.o
obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
@@ -31,11 +31,11 @@
obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o
obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
-Index: linux-2.6.22.5-moko/drivers/video/backlight/gta01_bl.c
+Index: linux-2.6.23/drivers/video/backlight/gta01_bl.c
===================================================================
--- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/backlight/gta01_bl.c
-@@ -0,0 +1,253 @@
++++ linux-2.6.23/drivers/video/backlight/gta01_bl.c
+@@ -0,0 +1,257 @@
+/*
+ * Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
+ *
@@ -144,6 +144,10 @@
+{
+ int rc;
+
++ rc = s3c2410_pwm_init(>a01bl.pwm);
++ if (rc)
++ return rc;
++
+ gta01bl.pwm.timerid = PWM0;
+ gta01bl.pwm.prescaler = (4 - 1);
+ gta01bl.pwm.divider = S3C2410_TCFG1_MUX0_DIV8;
@@ -289,4 +293,3 @@
+
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) Backlight Driver");
-+MODULE_LICENSE("GPL");
Modified: branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
2007-10-17 21:49:31 UTC (rev 3210)
+++ branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
2007-10-17 22:45:18 UTC (rev 3211)
@@ -5,8 +5,8 @@
Index: linux-2.6.23/drivers/leds/leds-gta01.c
===================================================================
--- /dev/null
-+++ linux-2.6.22.5-moko/drivers/leds/leds-gta01.c
-@@ -0,0 +1,189 @@
++++ linux-2.6.23/drivers/leds/leds-gta01.c
+@@ -0,0 +1,177 @@
+/*
+ * LED driver for the FIC GTA01 (Neo1973) GSM Phone Vibrator
+ *
@@ -43,20 +43,11 @@
+ struct s3c2410_pwm pwm;
+};
+
-+static inline struct gta01_vib_priv *pdev_to_vpriv(struct platform_device
*dev)
-+{
-+ return platform_get_drvdata(dev);
-+}
-+
-+static inline struct gta01_vib_priv *to_vpriv(struct led_classdev *led_cdev)
-+{
-+ return dev_get_drvdata(led_cdev->dev);
-+}
-+
+static void gta01vib_vib_set(struct led_classdev *led_cdev,
+ enum led_brightness value)
+{
-+ struct gta01_vib_priv *vp = to_vpriv(led_cdev);
++ struct gta01_vib_priv *vp =
++ container_of(led_cdev, struct gta01_vib_priv, cdev);
+
+ /*
+ * value == 255 -> 99% duty cycle (full power)
@@ -76,21 +67,23 @@
+ mutex_unlock(&vp->mutex);
+}
+
-+static struct led_classdev gta01_vib_led = {
-+ .name = "gta01:vibrator",
-+ .brightness_set = gta01vib_vib_set,
++static struct gta01_vib_priv gta01_vib_led = {
++ .cdev = {
++ .name = "gta01:vibrator",
++ .brightness_set = gta01vib_vib_set,
++ },
+};
+
+#ifdef CONFIG_PM
+static int gta01vib_suspend(struct platform_device *dev, pm_message_t state)
+{
-+ led_classdev_suspend(>a01_vib_led);
++ led_classdev_suspend(>a01_vib_led.cdev);
+ return 0;
+}
+
+static int gta01vib_resume(struct platform_device *dev)
+{
-+ led_classdev_resume(>a01_vib_led);
++ led_classdev_resume(>a01_vib_led.cdev);
+ return 0;
+}
+#endif
@@ -99,7 +92,12 @@
+{
+ int rc;
+
-+ vp->pwm.timerid= PWM3;
++ rc = s3c2410_pwm_init(&vp->pwm);
++ if (rc) {
++ return rc;
++ }
++
++ vp->pwm.timerid = PWM3;
+ /* use same prescaler as arch/arm/plat-s3c24xx/time.c */
+ vp->pwm.prescaler = (6 - 1) / 2;
+ vp->pwm.divider = S3C2410_TCFG1_MUX3_DIV2;
@@ -107,8 +105,9 @@
+ vp->pwm.comparer = COUNTER;
+
+ rc = s3c2410_pwm_enable(&vp->pwm);
-+ if (rc)
++ if (rc) {
+ return rc;
++ }
+
+ s3c2410_pwm_start(&vp->pwm);
+
@@ -117,8 +116,8 @@
+
+static int __init gta01vib_probe(struct platform_device *pdev)
+{
-+ struct gta01_vib_priv *vp;
+ struct resource *r;
++ int rc;
+
+ if (!machine_is_neo1973_gta01())
+ return -EIO;
@@ -127,45 +126,34 @@
+ if (!r || !r->start)
+ return -EIO;
+
-+ vp = kzalloc(sizeof(struct gta01_vib_priv), GFP_KERNEL);
-+ if (!vp)
-+ return -ENOMEM;
++ gta01_vib_led.gpio = r->start;
+
-+ vp->gpio = r->start;
-+
+ /* TOUT3 */
-+ if (vp->gpio == S3C2410_GPB3) {
-+ int rc;
-+
-+ rc = gta01vib_init_hw(vp);
++ if (gta01_vib_led.gpio == S3C2410_GPB3) {
++ rc = gta01vib_init_hw(>a01_vib_led);
+ if (rc) {
-+ kfree(vp);
+ return rc;
+ }
+
-+ s3c2410_gpio_cfgpin(vp->gpio, S3C2410_GPB3_TOUT3);
-+ vp->has_pwm = 1;
++ s3c2410_pwm_duty_cycle(0, >a01_vib_led.pwm);
++ s3c2410_gpio_cfgpin(gta01_vib_led.gpio, S3C2410_GPB3_TOUT3);
++ gta01_vib_led.has_pwm = 1;
+ }
+
-+ mutex_init(&vp->mutex);
-+ platform_set_drvdata(pdev, vp);
++ mutex_init(>a01_vib_led.mutex);
+
-+ return led_classdev_register(&pdev->dev, >a01_vib_led);
++ return led_classdev_register(&pdev->dev, >a01_vib_led.cdev);
+}
+
+static int gta01vib_remove(struct platform_device *pdev)
+{
-+ struct gta01_vib_priv *vp = pdev_to_vpriv(pdev);
++ if (gta01_vib_led.has_pwm)
++ s3c2410_pwm_disable(>a01_vib_led.pwm);
+
-+ if (vp->has_pwm)
-+ s3c2410_pwm_disable(&vp->pwm);
++ led_classdev_unregister(>a01_vib_led.cdev);
+
-+ led_classdev_unregister(>a01_vib_led);
-+ platform_set_drvdata(pdev, NULL);
-+ kfree(vp);
++ mutex_destroy(>a01_vib_led.mutex);
+
-+ mutex_destroy(&vp->mutex);
-+
+ return 0;
+}
+
@@ -196,7 +184,6 @@
+
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 Vibrator driver");
-+MODULE_LICENSE("GPL");
Index: linux-2.6.23/drivers/leds/Kconfig
===================================================================
--- linux-2.6.23.orig/drivers/leds/Kconfig
Modified: branches/src/target/kernel/2.6.23.x/patches/s3c2410-pwm.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/s3c2410-pwm.patch
2007-10-17 21:49:31 UTC (rev 3210)
+++ branches/src/target/kernel/2.6.23.x/patches/s3c2410-pwm.patch
2007-10-17 22:45:18 UTC (rev 3211)
@@ -38,7 +38,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.23/arch/arm/mach-s3c2410/pwm.c
-@@ -0,0 +1,210 @@
+@@ -0,0 +1,214 @@
+/*
+ * arch/arm/mach-s3c2410/3c2410-pwm.c
+ *
@@ -70,29 +70,33 @@
+ unsigned long tcon;
+
+ /* stop timer */
-+ tcon = __raw_readl(S3C2410_TCON);
-+ tcon &= 0xffffff00;
-+ __raw_writel(tcon, S3C2410_TCON);
++ tcon = __raw_readl(S3C2410_TCON);
++ tcon &= 0xffffff00;
++ __raw_writel(tcon, S3C2410_TCON);
+
+ clk_disable(pwm->pclk);
+ clk_put(pwm->pclk);
+
-+ kfree(pwm);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(s3c2410_pwm_disable);
+
-+int s3c2410_pwm_enable(struct s3c2410_pwm *pwm)
++int s3c2410_pwm_init(struct s3c2410_pwm *pwm)
+{
-+ unsigned long tcfg0, tcfg1, tcnt, tcmp;
-+
+ pwm->pclk = clk_get(NULL, "timers");
+ if (IS_ERR(pwm->pclk))
+ return PTR_ERR(pwm->pclk);
+
+ clk_enable(pwm->pclk);
+ pwm->pclk_rate = clk_get_rate(pwm->pclk);
++ return 0;
++}
++EXPORT_SYMBOL_GPL(s3c2410_pwm_init);
+
++int s3c2410_pwm_enable(struct s3c2410_pwm *pwm)
++{
++ unsigned long tcfg0, tcfg1, tcnt, tcmp;
++
+ /* control registers bits */
+ tcfg1 = __raw_readl(S3C2410_TCFG1);
+ tcfg0 = __raw_readl(S3C2410_TCFG0);
@@ -253,7 +257,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.23/include/asm-arm/arch-s3c2410/pwm.h
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,40 @@
+#ifndef __S3C2410_PWM_H
+#define __S3C2410_PWM_H
+
@@ -264,6 +268,7 @@
+#include <asm-arm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/mach-types.h>
++#include <asm/plat-s3c/regs-timer.h>
+#include <asm/arch/gta01.h>
+
+enum pwm_timer {
@@ -284,6 +289,7 @@
+ unsigned long comparer;
+};
+
++int s3c2410_pwm_init(struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_enable(struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_disable(struct s3c2410_pwm *s3c2410_pwm);
+int s3c2410_pwm_start(struct s3c2410_pwm *s3c2410_pwm);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-18 07:09:14 +0200 (Thu, 18 Oct 2007)
New Revision: 3212
Modified:
trunk/src/target/kernel/patches/gta01-backlight.patch
Log:
remove dynamic pclk-dependent backlight pwm counter calculation, sicne it no
longer works with new pwm api
Modified: trunk/src/target/kernel/patches/gta01-backlight.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-backlight.patch 2007-10-17
22:45:18 UTC (rev 3211)
+++ trunk/src/target/kernel/patches/gta01-backlight.patch 2007-10-18
05:09:14 UTC (rev 3212)
@@ -35,7 +35,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/drivers/video/backlight/gta01_bl.c
-@@ -0,0 +1,253 @@
+@@ -0,0 +1,252 @@
+/*
+ * Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
+ *
@@ -96,14 +96,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)
+{
@@ -146,7 +145,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-10-18 07:10:20 +0200 (Thu, 18 Oct 2007)
New Revision: 3213
Modified:
trunk/src/target/kernel/patches/gta02-core.patch
Log:
* GTA02: work around a race condition between usb detection and pmu driver
* GTA02: add (untested) wifi power-up code statically at boot time
Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch 2007-10-18 05:09:14 UTC
(rev 3212)
+++ trunk/src/target/kernel/patches/gta02-core.patch 2007-10-18 05:10:20 UTC
(rev 3213)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,636 @@
+@@ -0,0 +1,657 @@
+/*
+ * 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);
+}
+
@@ -605,6 +611,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);
+
@@ -624,10 +643,12 @@
+ 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,
+ SA_INTERRUPT, "modem", NULL);
+ enable_irq_wake(GTA02_IRQ_MODEM);
++
+}
+
+MACHINE_START(NEO1973_GTA02, "GTA02")
@@ -1005,7 +1026,7 @@
===================================================================
--- linux-2.6.22.5-moko.orig/drivers/leds/leds-gta01.c
+++ linux-2.6.22.5-moko/drivers/leds/leds-gta01.c
-@@ -111,7 +110,7 @@
+@@ -110,7 +110,7 @@
struct gta01_vib_priv *vp;
struct resource *r;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-18 08:04:30 +0200 (Thu, 18 Oct 2007)
New Revision: 3214
Modified:
trunk/src/target/kernel/patches/gta02-core.patch
Log:
fix GTA02 led definitions and resource names
Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch 2007-10-18 05:10:20 UTC
(rev 3213)
+++ trunk/src/target/kernel/patches/gta02-core.patch 2007-10-18 06:04:30 UTC
(rev 3214)
@@ -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,
+ },
+};
+
@@ -679,9 +679,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-10-18 08:06:17 +0200 (Thu, 18 Oct 2007)
New Revision: 3215
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
Add GTA02 LED switching code to u-boot
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-10-18 06:04:30 UTC (rev 3214)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-10-18 06:06:17 UTC (rev 3215)
@@ -8,7 +8,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2174,6 +2174,14 @@
+@@ -2175,6 +2175,14 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -504,7 +504,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/common/cmd_neo1973.c
-@@ -0,0 +1,115 @@
+@@ -0,0 +1,124 @@
+/*
+ * (C) Copyright 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -572,6 +572,14 @@
+ neo1973_backlight(1);
+ else
+ neo1973_backlight(0);
++ } else if (!strcmp(argv[1], "led")) {
++ long led = simple_strtol(argv[2], NULL, 10);
++ if (argc < 4)
++ goto out_help;
++ if (!strcmp(argv[3], "on"))
++ neo1973_led(led, 1);
++ else
++ neo1973_led(led, 0);
+ } else if (!strcmp(argv[1], "vibrator")) {
+ if (argc < 3)
+ goto out_help;
@@ -615,6 +623,7 @@
+ "neo1973 charger fast - enable fast (500mA) charging\n"
+ "neo1973 charger off - disable charging\n"
+ "neo1973 backlight (on|off) - switch backlight on or off\n"
++ "neo1973 led num (on|off) - switch LED number 'num' on or off\n"
+ "neo1973 vibrator (on|off) - switch vibrator on or off\n"
+ "neo1973 gsm (on|off) - switch GSM Modem on or off\n"
+ "neo1973 gps (on|off) - switch GPS system on or off\n"
@@ -1351,7 +1360,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta01/gta01.c
-@@ -0,0 +1,485 @@
+@@ -0,0 +1,491 @@
+/*
+ * (C) 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -1837,6 +1846,12 @@
+ return 0;
+}
+
++void neo1973_led(int led, int on)
++{
++ printf("No LED's in this Neo1973 hardware revision\n");
++}
++
++
Index: u-boot/board/neo1973/gta01/pcf50606.c
===================================================================
--- /dev/null
@@ -2331,7 +2346,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/common/neo1973.h
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,35 @@
+#ifndef _NEO1973_H
+#define _NEO1973_H
+
@@ -2359,6 +2374,7 @@
+void neo1973_vibrator(int on);
+void neo1973_gsm(int on);
+void neo1973_gps(int on);
++void neo1973_led(int led, int on);
+
+int neo1973_911_key_pressed(void);
+
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-18 06:04:30 UTC
(rev 3214)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-18 06:06:17 UTC
(rev 3215)
@@ -91,7 +91,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/gta02.c
-@@ -0,0 +1,432 @@
+@@ -0,0 +1,455 @@
+/*
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -167,6 +167,12 @@
+ "bne 1b":"=r" (loops):"0" (loops));
+}
+
++enum gta02_led {
++ GTA02_LED_PWR_ORANGE = 0,
++ GTA02_LED_PWR_BLUE = 1,
++ GTA02_LED_AUX_RED = 2,
++};
++
+/*
+ * Miscellaneous platform dependent initialisations
+ */
@@ -302,6 +308,14 @@
+ /* Initialize the Power Management Unit with a safe register set */
+ pcf50633_init();
+
++ /* switch on one of the power led's */
++ neo1973_led(GTA02_LED_PWR_ORANGE, 1);
++
++ /* issue a short pulse with the vibrator */
++ neo1973_vibrator(1);
++ udelay(50000);
++ neo1973_vibrator(0);
++
+#if defined(CONFIG_ARCH_GTA02_v1)
+ /* Glamo3362 reset and power cycle */
+ gpio->GPJDAT &= ~0x000000001; /* GTA02v1_GPIO_3D_RESET */
@@ -370,11 +384,6 @@
+ jbt6k74_display_onoff(1);
+#endif
+
-+ /* issue a short pulse with the vibrator */
-+ neo1973_vibrator(1);
-+ udelay(50000);
-+ neo1973_vibrator(0);
-+
+ /* switch on the backlight */
+ neo1973_backlight(1);
+
@@ -524,6 +533,21 @@
+ puts("not implemented yet\n");
+ return -1;
+}
++
++void neo1973_led(int led, int on)
++{
++ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
++
++ printf("switching led %u %u\n", led, on);
++ if (led > 2)
++ return;
++
++ if (on)
++ gpio->GPBDAT |= (1 << led);
++ else
++ gpio->GPBDAT &= ~(1 << led);
++}
++
Index: u-boot/board/neo1973/gta02/u-boot.lds
===================================================================
--- /dev/null
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
