r3099 - branches/src/target/kernel/2.6.23.x/patches
shoragan at sita.openmoko.org
shoragan at sita.openmoko.org
Sun Oct 7 11:42:56 CEST 2007
Author: shoragan
Date: 2007-10-07 11:42:55 +0200 (Sun, 07 Oct 2007)
New Revision: 3099
Removed:
branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
Modified:
branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch
branches/src/target/kernel/2.6.23.x/patches/series
Log:
Remove gta01-vibrator patch
Ben Dooks recommends to reimplement it using the s3c24xx leds driver.
Deleted: 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-07 09:40:32 UTC (rev 3098)
+++ branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch 2007-10-07 09:42:55 UTC (rev 3099)
@@ -1,171 +0,0 @@
-This patch adds driver support for the FIC GTA01 vibrator device. The driver
-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.22/drivers/leds/leds-gta01.c
-===================================================================
---- /dev/null
-+++ linux-2.6.22/drivers/leds/leds-gta01.c
-@@ -0,0 +1,133 @@
-+/*
-+ * LED driver for the FIC GTA01 (Neo1973) GSM Phone Vibrator
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge at openmoko.org>
-+ * All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * 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/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <asm/hardware.h>
-+#include <asm/mach-types.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 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);
-+
-+ if (value)
-+ s3c2410_gpio_setpin(vp->gpio, 1);
-+ else
-+ s3c2410_gpio_setpin(vp->gpio, 0);
-+}
-+
-+static struct led_classdev gta01_vib_led = {
-+ .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);
-+ return 0;
-+}
-+
-+static int gta01vib_resume(struct platform_device *dev)
-+{
-+ led_classdev_resume(>a01_vib_led);
-+ return 0;
-+}
-+#endif
-+
-+static int gta01vib_probe(struct platform_device *pdev)
-+{
-+ struct gta01_vib_priv *vp;
-+ struct resource *r;
-+
-+ if (!machine_is_neo1973_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 gta01vib_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;
-+}
-+
-+static struct platform_driver gta01vib_driver = {
-+ .probe = gta01vib_probe,
-+ .remove = gta01vib_remove,
-+#ifdef CONFIG_PM
-+ .suspend = gta01vib_suspend,
-+ .resume = gta01vib_resume,
-+#endif
-+ .driver = {
-+ .name = "gta01-led",
-+ },
-+};
-+
-+static int __init gta01vib_init(void)
-+{
-+ return platform_driver_register(>a01vib_driver);
-+}
-+
-+static void __exit gta01vib_exit(void)
-+{
-+ platform_driver_unregister(>a01vib_driver);
-+}
-+
-+module_init(gta01vib_init);
-+module_exit(gta01vib_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
-+MODULE_DESCRIPTION("FIC GTA01 Vibrator driver");
-+MODULE_LICENSE("GPL");
-Index: linux-2.6.22/drivers/leds/Kconfig
-===================================================================
---- linux-2.6.22.orig/drivers/leds/Kconfig
-+++ linux-2.6.22/drivers/leds/Kconfig
-@@ -101,6 +101,12 @@
- outputs. To be useful the particular board must have LEDs
- and they must be connected to the GPIO lines.
-
-+config LEDS_GTA01
-+ tristate "Vibrator Support for the FIC Neo1973 (GTA01) Vibrator"
-+ depends on LEDS_CLASS && MACH_NEO1973_GTA01
-+ help
-+ This option enables support for the Vibrator on the FIC Neo1973.
-+
- comment "LED Triggers"
-
- config LEDS_TRIGGERS
-Index: linux-2.6.22/drivers/leds/Makefile
-===================================================================
---- linux-2.6.22.orig/drivers/leds/Makefile
-+++ linux-2.6.22/drivers/leds/Makefile
-@@ -17,6 +17,7 @@
- obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
- obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o
- obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
-+obj-$(CONFIG_LEDS_GTA01) += leds-gta01.o
-
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
Modified: branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch 2007-10-07 09:40:32 UTC (rev 3098)
+++ branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch 2007-10-07 09:42:55 UTC (rev 3099)
@@ -926,19 +926,6 @@
return sysfs_create_group(&pdev->dev.kobj, >a01_gsm_attr_group);
}
-Index: linux-2.6.22/drivers/leds/leds-gta01.c
-===================================================================
---- linux-2.6.22.orig/drivers/leds/leds-gta01.c
-+++ linux-2.6.22/drivers/leds/leds-gta01.c
-@@ -71,7 +71,7 @@
- struct gta01_vib_priv *vp;
- struct resource *r;
-
-- if (!machine_is_neo1973_gta01())
-+ if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02())
- return -EIO;
-
- r = platform_get_resource(pdev, 0, 0);
Index: linux-2.6.22/sound/soc/s3c24xx/neo1973_wm8753.c
===================================================================
--- linux-2.6.22.orig/sound/soc/s3c24xx/neo1973_wm8753.c
Modified: branches/src/target/kernel/2.6.23.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/series 2007-10-07 09:40:32 UTC (rev 3098)
+++ branches/src/target/kernel/2.6.23.x/patches/series 2007-10-07 09:42:55 UTC (rev 3099)
@@ -24,7 +24,6 @@
gta01-core.patch
gta01-jbt6k74.patch
gta01-backlight.patch
-gta01-vibrator.patch
gta01-inputdevice.patch
gta01-power_control.patch
gta01-no_nand_partitions.patch
More information about the commitlog
mailing list