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. r1583 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
2. r1584 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
3. r1585 - trunk/oe/packages/uboot/files ([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-03-30 22:50:35 +0200 (Fri, 30 Mar 2007)
New Revision: 1583
Modified:
trunk/src/target/kernel/patches/gta01-core.patch
Log:
* add platform device for vibrator (via led driver api)
Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch 2007-03-30 20:41:54 UTC
(rev 1582)
+++ trunk/src/target/kernel/patches/gta01-core.patch 2007-03-30 20:50:35 UTC
(rev 1583)
@@ -4,7 +4,7 @@
Index: linux-2.6.20.4/arch/arm/mach-s3c2410/Kconfig
===================================================================
--- linux-2.6.20.4.orig/arch/arm/mach-s3c2410/Kconfig 2007-03-30
20:42:20.000000000 +0200
-+++ linux-2.6.20.4/arch/arm/mach-s3c2410/Kconfig 2007-03-30
21:32:43.000000000 +0200
++++ linux-2.6.20.4/arch/arm/mach-s3c2410/Kconfig 2007-03-30
22:46:27.000000000 +0200
@@ -86,6 +86,14 @@
help
Say Y here if you are using the Armzone QT2410
@@ -23,7 +23,7 @@
Index: linux-2.6.20.4/arch/arm/mach-s3c2410/Makefile
===================================================================
--- linux-2.6.20.4.orig/arch/arm/mach-s3c2410/Makefile 2007-03-30
20:42:20.000000000 +0200
-+++ linux-2.6.20.4/arch/arm/mach-s3c2410/Makefile 2007-03-30
21:32:42.000000000 +0200
++++ linux-2.6.20.4/arch/arm/mach-s3c2410/Makefile 2007-03-30
22:46:27.000000000 +0200
@@ -89,5 +89,6 @@
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o
@@ -34,8 +34,8 @@
Index: linux-2.6.20.4/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.4/arch/arm/mach-s3c2410/mach-gta01.c 2007-03-30
21:32:59.000000000 +0200
-@@ -0,0 +1,563 @@
++++ linux-2.6.20.4/arch/arm/mach-s3c2410/mach-gta01.c 2007-03-30
22:47:43.000000000 +0200
+@@ -0,0 +1,579 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
+ *
@@ -494,6 +494,19 @@
+ },
+};
+
++static struct resource gta01_led_resources[] = {
++ [0] = {
++ .start = GTA01_GPIO_VIBRATOR_ON,
++ .end = GTA01_GPIO_VIBRATOR_ON,
++ },
++};
++
++struct platform_device gta01_led_dev = {
++ .name = "gta01-led",
++ .num_resources = ARRAY_SIZE(gta01_led_resources),
++ .resource = gta01_led_resources,
++};
++
+static struct resource gta01_button_resources[] = {
+ [0] = {
+ .start = GTA01_GPIO_AUX_KEY,
@@ -581,9 +594,12 @@
+ case GTA01Bv4_SYSTEM_REV:
+ gta01_pmu_resources[0].start =
+ gta01_pmu_resources[0].end = GTA01Bv4_IRQ_PCF50606;
++ gta01_led_resources[0].start =
++ gta01_led_resources[0].end = GTA01Bv4_GPIO_VIBRATOR_ON;
+ break;
+ }
+ platform_device_register(>a01_pmu_dev);
++ platform_device_register(>a01_led_dev);
+
+ s3c2410_pm_init();
+}
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-30 23:00:43 +0200 (Fri, 30 Mar 2007)
New Revision: 1584
Modified:
trunk/src/target/kernel/patches/gta01-vibrator.patch
Log:
* make gta01-vibrator actually compile (missing Kconfig/Makefile hunks)
* use platform_device's resource to determine GPIO
Modified: trunk/src/target/kernel/patches/gta01-vibrator.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-vibrator.patch 2007-03-30
20:50:35 UTC (rev 1583)
+++ trunk/src/target/kernel/patches/gta01-vibrator.patch 2007-03-30
21:00:43 UTC (rev 1584)
@@ -2,15 +2,15 @@
uses the existing LED class driver framework, since there's a lot of
similarity between the LED and the vibrator function.
-Index: linux-2.6.17.14-fic4.test/drivers/leds/leds-gta01.c
+Index: linux-2.6.20.4/drivers/leds/leds-gta01.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.17.14-fic4.test/drivers/leds/leds-gta01.c 2007-01-08
22:51:15.000000000 +0100
-@@ -0,0 +1,95 @@
++++ linux-2.6.20.4/drivers/leds/leds-gta01.c 2007-03-30 22:58:37.000000000
+0200
+@@ -0,0 +1,133 @@
+/*
-+ * LED driver for the FIC GTA01 (Neo1973) GSM Phone
++ * LED driver for the FIC GTA01 (Neo1973) GSM Phone Vibrator
+ *
-+ * (C) 2006 by OpenMoko, Inc.
++ * (C) 2006-2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
+ * All rights reserved.
+ *
@@ -18,24 +18,42 @@
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
++ * TODO: Implement PWM support for GTA01Bv4 and later
+ */
+
-+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
-+#include <asm/hardware/scoop.h>
++#include <asm/hardware.h>
+#include <asm/mach-types.h>
-+#include <asm/arch/hardware.h>
+#include <asm/arch/gta01.h>
+
++struct gta01_vib_priv
++{
++ struct led_classdev cdev;
++ unsigned int gpio;
++ unsigned int has_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 container_of(led_cdev, struct gta01_vib_priv, cdev);
++}
++
+static void gta01led_vib_set(struct led_classdev *led_cdev, enum
led_brightness value)
+{
++ struct gta01_vib_priv *vp = to_vpriv(led_cdev);
++
+ if (value)
-+ s3c2410_gpio_setpin(GTA01_GPIO_VIBRATOR_ON, 1);
++ s3c2410_gpio_setpin(vp->gpio, 1);
+ else
-+ s3c2410_gpio_setpin(GTA01_GPIO_VIBRATOR_ON, 0);
++ s3c2410_gpio_setpin(vp->gpio, 0);
+}
+
+static struct led_classdev gta01_vib_led = {
@@ -59,17 +77,37 @@
+
+static int gta01led_probe(struct platform_device *pdev)
+{
-+ int ret;
++ struct gta01_vib_priv *vp;
++ struct resource *r;
+
+ if (!machine_is_gta01())
+ return -EIO;
+
++ r = platform_get_resource(pdev, 0, 0);
++ if (!r || !r->start)
++ return -EIO;
++
++ vp = kzalloc(sizeof(struct gta01_vib_priv), GFP_KERNEL);
++ if (!vp)
++ return -ENOMEM;
++
++ platform_set_drvdata(pdev, vp);
++
++ vp->gpio = r->start;
++
++ if (vp->gpio == S3C2410_GPB3)
++ vp->has_pwm = 1;
++
+ return led_classdev_register(&pdev->dev, >a01_vib_led);
+}
+
+static int gta01led_remove(struct platform_device *pdev)
+{
++ struct gta01_vib_priv *vp = pdev_to_vpriv(pdev);
++
+ led_classdev_unregister(>a01_vib_led);
++ platform_set_drvdata(pdev, NULL);
++ kfree(vp);
+
+ return 0;
+}
@@ -86,19 +124,48 @@
+ },
+};
+
-+static int __init spitzled_init(void)
++static int __init gta01led_init(void)
+{
+ return platform_driver_register(>a01led_driver);
+}
+
-+static void __exit spitzled_exit(void)
++static void __exit gta01led_exit(void)
+{
+ platform_driver_unregister(>a01led_driver);
+}
+
-+module_init(spitzled_init);
-+module_exit(spitzled_exit);
++module_init(gta01led_init);
++module_exit(gta01led_exit);
+
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 LED driver");
+MODULE_LICENSE("GPL");
+Index: linux-2.6.20.4/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.20.4.orig/drivers/leds/Kconfig 2007-03-30 22:55:57.000000000
+0200
++++ linux-2.6.20.4/drivers/leds/Kconfig 2007-03-30 22:56:03.000000000
+0200
+@@ -82,6 +82,12 @@
+ help
+ This option enables support for the PCEngines WRAP programmable LEDs.
+
++config LEDS_GTA01
++ tristate "LED Support for the FIC Neo1973 Vibrator"
++ depends on LEDS_CLASS && MACH_GTA01
++ help
++ This option enables support for the Vibrator on the FIC Neo1973.
++
+ comment "LED Triggers"
+
+ config LEDS_TRIGGERS
+Index: linux-2.6.20.4/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.20.4.orig/drivers/leds/Makefile 2007-03-30 22:55:59.000000000
+0200
++++ linux-2.6.20.4/drivers/leds/Makefile 2007-03-30 22:56:03.000000000
+0200
+@@ -14,6 +14,7 @@
+ obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o
+ obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o
+ obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
++obj-$(CONFIG_LEDS_GTA01) += leds-gta01.o
+
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-03-31 10:17:35 +0200 (Sat, 31 Mar 2007)
New Revision: 1585
Added:
trunk/oe/packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch
Log:
add uboot patch required for building (sorry for missing it)
Added: trunk/oe/packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch
===================================================================
--- trunk/oe/packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch
2007-03-30 21:00:43 UTC (rev 1584)
+++ trunk/oe/packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch
2007-03-31 08:17:35 UTC (rev 1585)
@@ -0,0 +1,19 @@
+--- a/tools/Makefile 2007-03-11 00:55:44.000000000 +0000
++++ b/tools/Makefile 2007-03-11 00:55:52.000000000 +0000
+@@ -194,14 +194,14 @@
+
+ $(obj)environment.c:
+ @rm -f $(obj)environment.c
+- ln -s $(src)../common/environment.c $(obj)environment.c
++ ln -sf $(src)../common/environment.c $(obj)environment.c
+
+ $(obj)environment.o: $(obj)environment.c
+ $(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
+ $(obj)crc32.c:
+ @rm -f $(obj)crc32.c
+- ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
++ ln -sf $(src)../lib_generic/crc32.c $(obj)crc32.c
+
+ $(LOGO_H): $(obj)bmp_logo $(LOGO_BMP)
+ $(obj)./bmp_logo $(LOGO_BMP) >$@
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
