You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: sound/core/memalloc.c
This commit is contained in:
David S. Miller
@@ -24,13 +24,6 @@ config LEDS_ATMEL_PWM
|
||||
This option enables support for LEDs driven using outputs
|
||||
of the dedicated PWM controller found on newer Atmel SOCs.
|
||||
|
||||
config LEDS_CORGI
|
||||
tristate "LED Support for the Sharp SL-C7x0 series"
|
||||
depends on LEDS_CLASS && PXA_SHARP_C7xx
|
||||
help
|
||||
This option enables support for the LEDs on Sharp Zaurus
|
||||
SL-C7x0 series (C700, C750, C760, C860).
|
||||
|
||||
config LEDS_LOCOMO
|
||||
tristate "LED Support for Locomo device"
|
||||
depends on LEDS_CLASS && SHARP_LOCOMO
|
||||
@@ -38,13 +31,6 @@ config LEDS_LOCOMO
|
||||
This option enables support for the LEDs on Sharp Locomo.
|
||||
Zaurus models SL-5500 and SL-5600.
|
||||
|
||||
config LEDS_SPITZ
|
||||
tristate "LED Support for the Sharp SL-Cxx00 series"
|
||||
depends on LEDS_CLASS && PXA_SHARP_Cxx00
|
||||
help
|
||||
This option enables support for the LEDs on Sharp Zaurus
|
||||
SL-Cxx00 series (C1000, C3000, C3100).
|
||||
|
||||
config LEDS_S3C24XX
|
||||
tristate "LED Support for Samsung S3C24XX GPIO LEDs"
|
||||
depends on LEDS_CLASS && ARCH_S3C2410
|
||||
|
||||
@@ -6,9 +6,7 @@ obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o
|
||||
|
||||
# LED Platform Drivers
|
||||
obj-$(CONFIG_LEDS_ATMEL_PWM) += leds-atmel-pwm.o
|
||||
obj-$(CONFIG_LEDS_CORGI) += leds-corgi.o
|
||||
obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o
|
||||
obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o
|
||||
obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o
|
||||
obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o
|
||||
obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o
|
||||
|
||||
@@ -1,124 +0,0 @@
|
||||
/*
|
||||
* LED Triggers Core
|
||||
*
|
||||
* Copyright 2005-2006 Openedhand Ltd.
|
||||
*
|
||||
* Author: Richard Purdie <rpurdie@openedhand.com>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/leds.h>
|
||||
#include <mach/corgi.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/pxa-regs.h>
|
||||
#include <asm/hardware/scoop.h>
|
||||
|
||||
static void corgiled_amber_set(struct led_classdev *led_cdev,
|
||||
enum led_brightness value)
|
||||
{
|
||||
if (value)
|
||||
GPSR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE);
|
||||
else
|
||||
GPCR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE);
|
||||
}
|
||||
|
||||
static void corgiled_green_set(struct led_classdev *led_cdev,
|
||||
enum led_brightness value)
|
||||
{
|
||||
if (value)
|
||||
set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);
|
||||
else
|
||||
reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);
|
||||
}
|
||||
|
||||
static struct led_classdev corgi_amber_led = {
|
||||
.name = "corgi:amber:charge",
|
||||
.default_trigger = "sharpsl-charge",
|
||||
.brightness_set = corgiled_amber_set,
|
||||
};
|
||||
|
||||
static struct led_classdev corgi_green_led = {
|
||||
.name = "corgi:green:mail",
|
||||
.default_trigger = "nand-disk",
|
||||
.brightness_set = corgiled_green_set,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int corgiled_suspend(struct platform_device *dev, pm_message_t state)
|
||||
{
|
||||
#ifdef CONFIG_LEDS_TRIGGERS
|
||||
if (corgi_amber_led.trigger &&
|
||||
strcmp(corgi_amber_led.trigger->name, "sharpsl-charge"))
|
||||
#endif
|
||||
led_classdev_suspend(&corgi_amber_led);
|
||||
led_classdev_suspend(&corgi_green_led);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int corgiled_resume(struct platform_device *dev)
|
||||
{
|
||||
led_classdev_resume(&corgi_amber_led);
|
||||
led_classdev_resume(&corgi_green_led);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int corgiled_probe(struct platform_device *pdev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = led_classdev_register(&pdev->dev, &corgi_amber_led);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = led_classdev_register(&pdev->dev, &corgi_green_led);
|
||||
if (ret < 0)
|
||||
led_classdev_unregister(&corgi_amber_led);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int corgiled_remove(struct platform_device *pdev)
|
||||
{
|
||||
led_classdev_unregister(&corgi_amber_led);
|
||||
led_classdev_unregister(&corgi_green_led);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver corgiled_driver = {
|
||||
.probe = corgiled_probe,
|
||||
.remove = corgiled_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = corgiled_suspend,
|
||||
.resume = corgiled_resume,
|
||||
#endif
|
||||
.driver = {
|
||||
.name = "corgi-led",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init corgiled_init(void)
|
||||
{
|
||||
return platform_driver_register(&corgiled_driver);
|
||||
}
|
||||
|
||||
static void __exit corgiled_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&corgiled_driver);
|
||||
}
|
||||
|
||||
module_init(corgiled_init);
|
||||
module_exit(corgiled_exit);
|
||||
|
||||
MODULE_AUTHOR("Richard Purdie <rpurdie@openedhand.com>");
|
||||
MODULE_DESCRIPTION("Corgi LED driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS("platform:corgi-led");
|
||||
+14
-14
@@ -161,6 +161,16 @@ static int fsg_led_probe(struct platform_device *pdev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
/* Map the LED chip select address space */
|
||||
latch_address = (unsigned short *) ioremap(IXP4XX_EXP_BUS_BASE(2), 512);
|
||||
if (!latch_address) {
|
||||
ret = -ENOMEM;
|
||||
goto failremap;
|
||||
}
|
||||
|
||||
latch_value = 0xffff;
|
||||
*latch_address = latch_value;
|
||||
|
||||
ret = led_classdev_register(&pdev->dev, &fsg_wlan_led);
|
||||
if (ret < 0)
|
||||
goto failwlan;
|
||||
@@ -185,20 +195,8 @@ static int fsg_led_probe(struct platform_device *pdev)
|
||||
if (ret < 0)
|
||||
goto failring;
|
||||
|
||||
/* Map the LED chip select address space */
|
||||
latch_address = (unsigned short *) ioremap(IXP4XX_EXP_BUS_BASE(2), 512);
|
||||
if (!latch_address) {
|
||||
ret = -ENOMEM;
|
||||
goto failremap;
|
||||
}
|
||||
|
||||
latch_value = 0xffff;
|
||||
*latch_address = latch_value;
|
||||
|
||||
return ret;
|
||||
|
||||
failremap:
|
||||
led_classdev_unregister(&fsg_ring_led);
|
||||
failring:
|
||||
led_classdev_unregister(&fsg_sync_led);
|
||||
failsync:
|
||||
@@ -210,14 +208,14 @@ static int fsg_led_probe(struct platform_device *pdev)
|
||||
failwan:
|
||||
led_classdev_unregister(&fsg_wlan_led);
|
||||
failwlan:
|
||||
iounmap(latch_address);
|
||||
failremap:
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int fsg_led_remove(struct platform_device *pdev)
|
||||
{
|
||||
iounmap(latch_address);
|
||||
|
||||
led_classdev_unregister(&fsg_wlan_led);
|
||||
led_classdev_unregister(&fsg_wan_led);
|
||||
led_classdev_unregister(&fsg_sata_led);
|
||||
@@ -225,6 +223,8 @@ static int fsg_led_remove(struct platform_device *pdev)
|
||||
led_classdev_unregister(&fsg_sync_led);
|
||||
led_classdev_unregister(&fsg_ring_led);
|
||||
|
||||
iounmap(latch_address);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+38
-32
@@ -248,11 +248,10 @@ static int __devinit pca955x_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct pca955x_led *pca955x;
|
||||
int i;
|
||||
int err = -ENODEV;
|
||||
struct pca955x_chipdef *chip;
|
||||
struct i2c_adapter *adapter;
|
||||
struct led_platform_data *pdata;
|
||||
int i, err;
|
||||
|
||||
chip = &pca955x_chipdefs[id->driver_data];
|
||||
adapter = to_i2c_adapter(client->dev.parent);
|
||||
@@ -282,43 +281,41 @@ static int __devinit pca955x_probe(struct i2c_client *client,
|
||||
}
|
||||
}
|
||||
|
||||
pca955x = kzalloc(sizeof(*pca955x) * chip->bits, GFP_KERNEL);
|
||||
if (!pca955x)
|
||||
return -ENOMEM;
|
||||
|
||||
i2c_set_clientdata(client, pca955x);
|
||||
|
||||
for (i = 0; i < chip->bits; i++) {
|
||||
pca955x = kzalloc(sizeof(struct pca955x_led), GFP_KERNEL);
|
||||
if (!pca955x) {
|
||||
err = -ENOMEM;
|
||||
goto exit;
|
||||
}
|
||||
pca955x[i].chipdef = chip;
|
||||
pca955x[i].client = client;
|
||||
pca955x[i].led_num = i;
|
||||
|
||||
pca955x->chipdef = chip;
|
||||
pca955x->client = client;
|
||||
pca955x->led_num = i;
|
||||
/* Platform data can specify LED names and default triggers */
|
||||
if (pdata) {
|
||||
if (pdata->leds[i].name)
|
||||
snprintf(pca955x->name, 32, "pca955x:%s",
|
||||
pdata->leds[i].name);
|
||||
snprintf(pca955x[i].name,
|
||||
sizeof(pca955x[i].name), "pca955x:%s",
|
||||
pdata->leds[i].name);
|
||||
if (pdata->leds[i].default_trigger)
|
||||
pca955x->led_cdev.default_trigger =
|
||||
pca955x[i].led_cdev.default_trigger =
|
||||
pdata->leds[i].default_trigger;
|
||||
} else {
|
||||
snprintf(pca955x->name, 32, "pca955x:%d", i);
|
||||
snprintf(pca955x[i].name, sizeof(pca955x[i].name),
|
||||
"pca955x:%d", i);
|
||||
}
|
||||
spin_lock_init(&pca955x->lock);
|
||||
|
||||
pca955x->led_cdev.name = pca955x->name;
|
||||
pca955x->led_cdev.brightness_set =
|
||||
pca955x_led_set;
|
||||
spin_lock_init(&pca955x[i].lock);
|
||||
|
||||
/*
|
||||
* Client data is a pointer to the _first_ pca955x_led
|
||||
* struct
|
||||
*/
|
||||
if (i == 0)
|
||||
i2c_set_clientdata(client, pca955x);
|
||||
pca955x[i].led_cdev.name = pca955x[i].name;
|
||||
pca955x[i].led_cdev.brightness_set = pca955x_led_set;
|
||||
|
||||
INIT_WORK(&(pca955x->work), pca955x_led_work);
|
||||
INIT_WORK(&pca955x[i].work, pca955x_led_work);
|
||||
|
||||
led_classdev_register(&client->dev, &(pca955x->led_cdev));
|
||||
err = led_classdev_register(&client->dev, &pca955x[i].led_cdev);
|
||||
if (err < 0)
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/* Turn off LEDs */
|
||||
@@ -336,23 +333,32 @@ static int __devinit pca955x_probe(struct i2c_client *client,
|
||||
pca955x_write_psc(client, 1, 0);
|
||||
|
||||
return 0;
|
||||
|
||||
exit:
|
||||
while (i--) {
|
||||
led_classdev_unregister(&pca955x[i].led_cdev);
|
||||
cancel_work_sync(&pca955x[i].work);
|
||||
}
|
||||
|
||||
kfree(pca955x);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit pca955x_remove(struct i2c_client *client)
|
||||
{
|
||||
struct pca955x_led *pca955x = i2c_get_clientdata(client);
|
||||
int leds = pca955x->chipdef->bits;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < leds; i++) {
|
||||
led_classdev_unregister(&(pca955x->led_cdev));
|
||||
cancel_work_sync(&(pca955x->work));
|
||||
kfree(pca955x);
|
||||
pca955x = pca955x + 1;
|
||||
for (i = 0; i < pca955x->chipdef->bits; i++) {
|
||||
led_classdev_unregister(&pca955x[i].led_cdev);
|
||||
cancel_work_sync(&pca955x[i].work);
|
||||
}
|
||||
|
||||
kfree(pca955x);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,131 +0,0 @@
|
||||
/*
|
||||
* LED Triggers Core
|
||||
*
|
||||
* Copyright 2005-2006 Openedhand Ltd.
|
||||
*
|
||||
* Author: Richard Purdie <rpurdie@openedhand.com>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/leds.h>
|
||||
#include <asm/hardware/scoop.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/pxa-regs.h>
|
||||
#include <mach/spitz.h>
|
||||
|
||||
static void spitzled_amber_set(struct led_classdev *led_cdev,
|
||||
enum led_brightness value)
|
||||
{
|
||||
if (value)
|
||||
set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE);
|
||||
else
|
||||
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE);
|
||||
}
|
||||
|
||||
static void spitzled_green_set(struct led_classdev *led_cdev,
|
||||
enum led_brightness value)
|
||||
{
|
||||
if (value)
|
||||
set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);
|
||||
else
|
||||
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_GREEN);
|
||||
}
|
||||
|
||||
static struct led_classdev spitz_amber_led = {
|
||||
.name = "spitz:amber:charge",
|
||||
.default_trigger = "sharpsl-charge",
|
||||
.brightness_set = spitzled_amber_set,
|
||||
};
|
||||
|
||||
static struct led_classdev spitz_green_led = {
|
||||
.name = "spitz:green:hddactivity",
|
||||
.default_trigger = "ide-disk",
|
||||
.brightness_set = spitzled_green_set,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int spitzled_suspend(struct platform_device *dev, pm_message_t state)
|
||||
{
|
||||
#ifdef CONFIG_LEDS_TRIGGERS
|
||||
if (spitz_amber_led.trigger &&
|
||||
strcmp(spitz_amber_led.trigger->name, "sharpsl-charge"))
|
||||
#endif
|
||||
led_classdev_suspend(&spitz_amber_led);
|
||||
led_classdev_suspend(&spitz_green_led);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int spitzled_resume(struct platform_device *dev)
|
||||
{
|
||||
led_classdev_resume(&spitz_amber_led);
|
||||
led_classdev_resume(&spitz_green_led);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int spitzled_probe(struct platform_device *pdev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (machine_is_akita()) {
|
||||
spitz_green_led.name = "spitz:green:mail";
|
||||
spitz_green_led.default_trigger = "nand-disk";
|
||||
}
|
||||
|
||||
ret = led_classdev_register(&pdev->dev, &spitz_amber_led);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = led_classdev_register(&pdev->dev, &spitz_green_led);
|
||||
if (ret < 0)
|
||||
led_classdev_unregister(&spitz_amber_led);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int spitzled_remove(struct platform_device *pdev)
|
||||
{
|
||||
led_classdev_unregister(&spitz_amber_led);
|
||||
led_classdev_unregister(&spitz_green_led);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver spitzled_driver = {
|
||||
.probe = spitzled_probe,
|
||||
.remove = spitzled_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = spitzled_suspend,
|
||||
.resume = spitzled_resume,
|
||||
#endif
|
||||
.driver = {
|
||||
.name = "spitz-led",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init spitzled_init(void)
|
||||
{
|
||||
return platform_driver_register(&spitzled_driver);
|
||||
}
|
||||
|
||||
static void __exit spitzled_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&spitzled_driver);
|
||||
}
|
||||
|
||||
module_init(spitzled_init);
|
||||
module_exit(spitzled_exit);
|
||||
|
||||
MODULE_AUTHOR("Richard Purdie <rpurdie@openedhand.com>");
|
||||
MODULE_DESCRIPTION("Spitz LED driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS("platform:spitz-led");
|
||||
Reference in New Issue
Block a user