]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'leds/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 04:39:42 +0000 (14:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 04:39:42 +0000 (14:39 +1000)
Documentation/devicetree/bindings/leds/leds-pwm.txt
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/leds/dell-led.c
drivers/leds/leds-88pm860x.c
drivers/leds/leds-pca9685.c [deleted file]
drivers/leds/leds-pwm.c
include/linux/dell-led.h [new file with mode: 0644]
include/linux/platform_data/leds-pca9685.h [deleted file]

index 7297107cf83285d5fe7b6d8254eafc7c64cc2c85..6c6583c35f2ff6bfe41ca3e9747dc720d6d72d84 100644 (file)
@@ -13,6 +13,8 @@ LED sub-node properties:
   For the pwms and pwm-names property please refer to:
   Documentation/devicetree/bindings/pwm/pwm.txt
 - max-brightness : Maximum brightness possible for the LED
+- active-low : (optional) For PWMs where the LED is wired to supply
+  rather than ground.
 - label :  (optional)
   see Documentation/devicetree/bindings/leds/common.txt
 - linux,default-trigger :  (optional)
index 83af5f42b743dd25a73d312e4741fed680ea3153..c71122f9c8e81497e968f8e3826f7afbea3e21c6 100644 (file)
@@ -300,16 +300,6 @@ config LEDS_PCA963X
          LED driver chip accessed via the I2C bus. Supported
          devices include PCA9633 and PCA9634
 
-config LEDS_PCA9685
-       tristate "LED support for PCA9685 I2C chip"
-       depends on LEDS_CLASS
-       depends on I2C
-       help
-         This option enables support for LEDs connected to the PCA9685
-         LED driver chip accessed via the I2C bus.
-         The PCA9685 offers 12-bit PWM (4095 levels of brightness) on
-         16 individual channels.
-
 config LEDS_WM831X_STATUS
        tristate "LED support for status LEDs on WM831x PMICs"
        depends on LEDS_CLASS
index 8b4c956e11bad78162fe20c254e4f8f6d58566bd..79c5155199a7d409489d13633349d460123daa9f 100644 (file)
@@ -36,7 +36,6 @@ obj-$(CONFIG_LEDS_OT200)              += leds-ot200.o
 obj-$(CONFIG_LEDS_FSG)                 += leds-fsg.o
 obj-$(CONFIG_LEDS_PCA955X)             += leds-pca955x.o
 obj-$(CONFIG_LEDS_PCA963X)             += leds-pca963x.o
-obj-$(CONFIG_LEDS_PCA9685)             += leds-pca9685.o
 obj-$(CONFIG_LEDS_DA903X)              += leds-da903x.o
 obj-$(CONFIG_LEDS_DA9052)              += leds-da9052.o
 obj-$(CONFIG_LEDS_WM831X_STATUS)       += leds-wm831x-status.o
index e5c57389efd63680af4b028910f8152667844692..c36acaf566a6e4d113e6c4a2314f1eaed60d3263 100644 (file)
 #include <linux/leds.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/dmi.h>
+#include <linux/dell-led.h>
 
 MODULE_AUTHOR("Louis Davis/Jim Dailey");
 MODULE_DESCRIPTION("Dell LED Control Driver");
 MODULE_LICENSE("GPL");
 
 #define DELL_LED_BIOS_GUID "F6E4FE6E-909D-47cb-8BAB-C9F6F2F8D396"
+#define DELL_APP_GUID "A80593CE-A997-11DA-B012-B622A1EF5492"
 MODULE_ALIAS("wmi:" DELL_LED_BIOS_GUID);
 
 /* Error Result Codes: */
@@ -39,6 +42,149 @@ MODULE_ALIAS("wmi:" DELL_LED_BIOS_GUID);
 #define CMD_LED_OFF    17
 #define CMD_LED_BLINK  18
 
+struct app_wmi_args {
+       u16 class;
+       u16 selector;
+       u32 arg1;
+       u32 arg2;
+       u32 arg3;
+       u32 arg4;
+       u32 res1;
+       u32 res2;
+       u32 res3;
+       u32 res4;
+       char dummy[92];
+};
+
+#define GLOBAL_MIC_MUTE_ENABLE 0x364
+#define GLOBAL_MIC_MUTE_DISABLE        0x365
+
+struct dell_bios_data_token {
+       u16 tokenid;
+       u16 location;
+       u16 value;
+};
+
+struct __attribute__ ((__packed__)) dell_bios_calling_interface {
+       struct  dmi_header header;
+       u16     cmd_io_addr;
+       u8      cmd_io_code;
+       u32     supported_cmds;
+       struct  dell_bios_data_token damap[];
+};
+
+static struct dell_bios_data_token dell_mic_tokens[2];
+
+static int dell_wmi_perform_query(struct app_wmi_args *args)
+{
+       struct app_wmi_args *bios_return;
+       union acpi_object *obj;
+       struct acpi_buffer input;
+       struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
+       acpi_status status;
+       u32 rc = -EINVAL;
+
+       input.length = 128;
+       input.pointer = args;
+
+       status = wmi_evaluate_method(DELL_APP_GUID, 0, 1, &input, &output);
+       if (!ACPI_SUCCESS(status))
+               goto err_out0;
+
+       obj = output.pointer;
+       if (!obj)
+               goto err_out0;
+
+       if (obj->type != ACPI_TYPE_BUFFER)
+               goto err_out1;
+
+       bios_return = (struct app_wmi_args *)obj->buffer.pointer;
+       rc = bios_return->res1;
+       if (rc)
+               goto err_out1;
+
+       memcpy(args, bios_return, sizeof(struct app_wmi_args));
+       rc = 0;
+
+ err_out1:
+       kfree(obj);
+ err_out0:
+       return rc;
+}
+
+static void __init find_micmute_tokens(const struct dmi_header *dm, void *dummy)
+{
+       struct dell_bios_calling_interface *calling_interface;
+       struct dell_bios_data_token *token;
+       int token_size = sizeof(struct dell_bios_data_token);
+       int i = 0;
+
+       if (dm->type == 0xda && dm->length > 17) {
+               calling_interface = container_of(dm,
+                               struct dell_bios_calling_interface, header);
+
+               token = &calling_interface->damap[i];
+               while (token->tokenid != 0xffff) {
+                       if (token->tokenid == GLOBAL_MIC_MUTE_DISABLE)
+                               memcpy(&dell_mic_tokens[0], token, token_size);
+                       else if (token->tokenid == GLOBAL_MIC_MUTE_ENABLE)
+                               memcpy(&dell_mic_tokens[1], token, token_size);
+
+                       i++;
+                       token = &calling_interface->damap[i];
+               }
+       }
+}
+
+static int dell_micmute_led_set(int state)
+{
+       struct app_wmi_args args;
+       struct dell_bios_data_token *token;
+
+       if (!wmi_has_guid(DELL_APP_GUID))
+               return -ENODEV;
+
+       if (state == 0 || state == 1)
+               token = &dell_mic_tokens[state];
+       else
+               return -EINVAL;
+
+       memset(&args, 0, sizeof(struct app_wmi_args));
+
+       args.class = 1;
+       args.arg1 = token->location;
+       args.arg2 = token->value;
+
+       dell_wmi_perform_query(&args);
+
+       return state;
+}
+
+int dell_app_wmi_led_set(int whichled, int on)
+{
+       int state = 0;
+
+       switch (whichled) {
+       case DELL_LED_MICMUTE:
+               state = dell_micmute_led_set(on);
+               break;
+       default:
+               pr_warn("led type %x is not supported\n", whichled);
+               break;
+       }
+
+       return state;
+}
+EXPORT_SYMBOL_GPL(dell_app_wmi_led_set);
+
+static int __init dell_micmute_led_init(void)
+{
+       memset(dell_mic_tokens, 0, sizeof(struct dell_bios_data_token) * 2);
+       dmi_walk(find_micmute_tokens, NULL);
+
+       return 0;
+}
+
 struct bios_args {
        unsigned char length;
        unsigned char result_code;
@@ -181,21 +327,32 @@ static int __init dell_led_init(void)
 {
        int error = 0;
 
-       if (!wmi_has_guid(DELL_LED_BIOS_GUID))
+       if (!wmi_has_guid(DELL_LED_BIOS_GUID) && !wmi_has_guid(DELL_APP_GUID))
                return -ENODEV;
 
-       error = led_off();
-       if (error != 0)
-               return -ENODEV;
+       if (wmi_has_guid(DELL_APP_GUID))
+               error = dell_micmute_led_init();
 
-       return led_classdev_register(NULL, &dell_led);
+       if (wmi_has_guid(DELL_LED_BIOS_GUID)) {
+               error = led_off();
+               if (error != 0)
+                       return -ENODEV;
+
+               error = led_classdev_register(NULL, &dell_led);
+       }
+
+       return error;
 }
 
 static void __exit dell_led_exit(void)
 {
-       led_classdev_unregister(&dell_led);
+       int error = 0;
 
-       led_off();
+       if (wmi_has_guid(DELL_LED_BIOS_GUID)) {
+               error = led_off();
+               if (error == 0)
+                       led_classdev_unregister(&dell_led);
+       }
 }
 
 module_init(dell_led_init);
index d1e1bca90d11e74599a54b89a358ebd0162c3934..c2def5551ce1bdd8c81caabbbee5dc0dbb39975d 100644 (file)
@@ -130,10 +130,9 @@ static int pm860x_led_dt_init(struct platform_device *pdev,
        struct device_node *nproot, *np;
        int iset = 0;
 
-       nproot = of_node_get(pdev->dev.parent->of_node);
-       if (!nproot)
+       if (!pdev->dev.parent->of_node)
                return -ENODEV;
-       nproot = of_find_node_by_name(nproot, "leds");
+       nproot = of_get_child_by_name(pdev->dev.parent->of_node, "leds");
        if (!nproot) {
                dev_err(&pdev->dev, "failed to find leds node\n");
                return -ENODEV;
diff --git a/drivers/leds/leds-pca9685.c b/drivers/leds/leds-pca9685.c
deleted file mode 100644 (file)
index 6e1ef3a..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright 2013 Maximilian Güntner <maximilian.guentner@gmail.com>
- *
- * This file is subject to the terms and conditions of version 2 of
- * the GNU General Public License.  See the file COPYING in the main
- * directory of this archive for more details.
- *
- * Based on leds-pca963x.c driver by
- * Peter Meerwald <p.meerwald@bct-electronic.com>
- *
- * Driver for the NXP PCA9685 12-Bit PWM LED driver chip.
- *
- */
-
-#include <linux/ctype.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/i2c.h>
-#include <linux/leds.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/workqueue.h>
-
-#include <linux/platform_data/leds-pca9685.h>
-
-/* Register Addresses */
-#define PCA9685_MODE1 0x00
-#define PCA9685_MODE2 0x01
-#define PCA9685_LED0_ON_L 0x06
-#define PCA9685_ALL_LED_ON_L 0xFA
-
-/* MODE1 Register */
-#define PCA9685_ALLCALL 0x00
-#define PCA9685_SLEEP   0x04
-#define PCA9685_AI      0x05
-
-/* MODE2 Register */
-#define PCA9685_INVRT   0x04
-#define PCA9685_OUTDRV  0x02
-
-static const struct i2c_device_id pca9685_id[] = {
-       { "pca9685", 0 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, pca9685_id);
-
-struct pca9685_led {
-       struct i2c_client *client;
-       struct work_struct work;
-       u16 brightness;
-       struct led_classdev led_cdev;
-       int led_num; /* 0-15 */
-       char name[32];
-};
-
-static void pca9685_write_msg(struct i2c_client *client, u8 *buf, u8 len)
-{
-       struct i2c_msg msg = {
-               .addr = client->addr,
-               .flags = 0x00,
-               .len = len,
-               .buf = buf
-       };
-       i2c_transfer(client->adapter, &msg, 1);
-}
-
-static void pca9685_all_off(struct i2c_client *client)
-{
-       u8 i2c_buffer[5] = {PCA9685_ALL_LED_ON_L, 0x00, 0x00, 0x00, 0x10};
-       pca9685_write_msg(client, i2c_buffer, 5);
-}
-
-static void pca9685_led_work(struct work_struct *work)
-{
-       struct pca9685_led *pca9685;
-       u8 i2c_buffer[5];
-
-       pca9685 = container_of(work, struct pca9685_led, work);
-       i2c_buffer[0] = PCA9685_LED0_ON_L + 4 * pca9685->led_num;
-       /*
-        * 4095 is the maximum brightness, so we set the ON time to 0x1000
-        * which disables the PWM generator for that LED
-        */
-       if (pca9685->brightness == 4095)
-               *((__le16 *)(i2c_buffer+1)) = cpu_to_le16(0x1000);
-       else
-               *((__le16 *)(i2c_buffer+1)) = 0x0000;
-
-       if (pca9685->brightness == 0)
-               *((__le16 *)(i2c_buffer+3)) = cpu_to_le16(0x1000);
-       else if (pca9685->brightness == 4095)
-               *((__le16 *)(i2c_buffer+3)) = 0x0000;
-       else
-               *((__le16 *)(i2c_buffer+3)) = cpu_to_le16(pca9685->brightness);
-
-       pca9685_write_msg(pca9685->client, i2c_buffer, 5);
-}
-
-static void pca9685_led_set(struct led_classdev *led_cdev,
-               enum led_brightness value)
-{
-       struct pca9685_led *pca9685;
-       pca9685 = container_of(led_cdev, struct pca9685_led, led_cdev);
-       pca9685->brightness = value;
-
-       schedule_work(&pca9685->work);
-}
-
-static int pca9685_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
-{
-       struct pca9685_led *pca9685;
-       struct pca9685_platform_data *pdata;
-       int err;
-       u8 i;
-
-       pdata = dev_get_platdata(&client->dev);
-       if (pdata) {
-               if (pdata->leds.num_leds < 1 || pdata->leds.num_leds > 15) {
-                       dev_err(&client->dev, "board info must claim 1-16 LEDs");
-                       return -EINVAL;
-               }
-       }
-
-       pca9685 = devm_kzalloc(&client->dev, 16 * sizeof(*pca9685), GFP_KERNEL);
-       if (!pca9685)
-               return -ENOMEM;
-
-       i2c_set_clientdata(client, pca9685);
-       pca9685_all_off(client);
-
-       for (i = 0; i < 16; i++) {
-               pca9685[i].client = client;
-               pca9685[i].led_num = i;
-               pca9685[i].name[0] = '\0';
-               if (pdata && i < pdata->leds.num_leds) {
-                       if (pdata->leds.leds[i].name)
-                               strncpy(pca9685[i].name,
-                                       pdata->leds.leds[i].name,
-                                       sizeof(pca9685[i].name)-1);
-                       if (pdata->leds.leds[i].default_trigger)
-                               pca9685[i].led_cdev.default_trigger =
-                                       pdata->leds.leds[i].default_trigger;
-               }
-               if (strlen(pca9685[i].name) == 0) {
-                       /*
-                        * Write adapter and address to the name as well.
-                        * Otherwise multiple chips attached to one host would
-                        * not work.
-                        */
-                       snprintf(pca9685[i].name, sizeof(pca9685[i].name),
-                                       "pca9685:%d:x%.2x:%d",
-                                       client->adapter->nr, client->addr, i);
-               }
-               pca9685[i].led_cdev.name = pca9685[i].name;
-               pca9685[i].led_cdev.max_brightness = 0xfff;
-               pca9685[i].led_cdev.brightness_set = pca9685_led_set;
-
-               INIT_WORK(&pca9685[i].work, pca9685_led_work);
-               err = led_classdev_register(&client->dev, &pca9685[i].led_cdev);
-               if (err < 0)
-                       goto exit;
-       }
-
-       if (pdata)
-               i2c_smbus_write_byte_data(client, PCA9685_MODE2,
-                       pdata->outdrv << PCA9685_OUTDRV |
-                       pdata->inverted << PCA9685_INVRT);
-       else
-               i2c_smbus_write_byte_data(client, PCA9685_MODE2,
-                       PCA9685_TOTEM_POLE << PCA9685_OUTDRV);
-       /* Enable Auto-Increment, enable oscillator, ALLCALL/SUBADDR disabled */
-       i2c_smbus_write_byte_data(client, PCA9685_MODE1, BIT(PCA9685_AI));
-
-       return 0;
-
-exit:
-       while (i--) {
-               led_classdev_unregister(&pca9685[i].led_cdev);
-               cancel_work_sync(&pca9685[i].work);
-       }
-       return err;
-}
-
-static int pca9685_remove(struct i2c_client *client)
-{
-       struct pca9685_led *pca9685 = i2c_get_clientdata(client);
-       u8 i;
-
-       for (i = 0; i < 16; i++) {
-               led_classdev_unregister(&pca9685[i].led_cdev);
-               cancel_work_sync(&pca9685[i].work);
-       }
-       pca9685_all_off(client);
-       return 0;
-}
-
-static struct i2c_driver pca9685_driver = {
-       .driver = {
-               .name = "leds-pca9685",
-               .owner = THIS_MODULE,
-       },
-       .probe = pca9685_probe,
-       .remove = pca9685_remove,
-       .id_table = pca9685_id,
-};
-
-module_i2c_driver(pca9685_driver);
-
-MODULE_AUTHOR("Maximilian Güntner <maximilian.guentner@gmail.com>");
-MODULE_DESCRIPTION("PCA9685 LED Driver");
-MODULE_LICENSE("GPL v2");
index 7d0aaed1e23a881ab28997b09df13e372d538c36..f5cf1b0f274873d9142a008dff9e024b6da3251d 100644 (file)
@@ -69,6 +69,10 @@ static void led_pwm_set(struct led_classdev *led_cdev,
 
        duty *= brightness;
        do_div(duty, max);
+
+       if (led_dat->active_low)
+               duty = led_dat->period - duty;
+
        led_dat->duty = duty;
 
        if (led_dat->can_sleep)
@@ -92,55 +96,75 @@ static void led_pwm_cleanup(struct led_pwm_priv *priv)
        }
 }
 
-static int led_pwm_create_of(struct platform_device *pdev,
-                            struct led_pwm_priv *priv)
+static int led_pwm_add(struct device *dev, struct led_pwm_priv *priv,
+                      struct led_pwm *led, struct device_node *child)
 {
-       struct device_node *child;
+       struct led_pwm_data *led_data = &priv->leds[priv->num_leds];
        int ret;
 
-       for_each_child_of_node(pdev->dev.of_node, child) {
-               struct led_pwm_data *led_dat = &priv->leds[priv->num_leds];
+       led_data->active_low = led->active_low;
+       led_data->period = led->pwm_period_ns;
+       led_data->cdev.name = led->name;
+       led_data->cdev.default_trigger = led->default_trigger;
+       led_data->cdev.brightness_set = led_pwm_set;
+       led_data->cdev.brightness = LED_OFF;
+       led_data->cdev.max_brightness = led->max_brightness;
+       led_data->cdev.flags = LED_CORE_SUSPENDRESUME;
+
+       if (child)
+               led_data->pwm = devm_of_pwm_get(dev, child, NULL);
+       else
+               led_data->pwm = devm_pwm_get(dev, led->name);
+       if (IS_ERR(led_data->pwm)) {
+               ret = PTR_ERR(led_data->pwm);
+               dev_err(dev, "unable to request PWM for %s: %d\n",
+                       led->name, ret);
+               return ret;
+       }
 
-               led_dat->cdev.name = of_get_property(child, "label",
-                                                    NULL) ? : child->name;
+       if (child)
+               led_data->period = pwm_get_period(led_data->pwm);
 
-               led_dat->pwm = devm_of_pwm_get(&pdev->dev, child, NULL);
-               if (IS_ERR(led_dat->pwm)) {
-                       dev_err(&pdev->dev, "unable to request PWM for %s\n",
-                               led_dat->cdev.name);
-                       ret = PTR_ERR(led_dat->pwm);
-                       goto err;
-               }
-               /* Get the period from PWM core when n*/
-               led_dat->period = pwm_get_period(led_dat->pwm);
+       led_data->can_sleep = pwm_can_sleep(led_data->pwm);
+       if (led_data->can_sleep)
+               INIT_WORK(&led_data->work, led_pwm_work);
 
-               led_dat->cdev.default_trigger = of_get_property(child,
-                                               "linux,default-trigger", NULL);
-               of_property_read_u32(child, "max-brightness",
-                                    &led_dat->cdev.max_brightness);
+       ret = led_classdev_register(dev, &led_data->cdev);
+       if (ret == 0) {
+               priv->num_leds++;
+       } else {
+               dev_err(dev, "failed to register PWM led for %s: %d\n",
+                       led->name, ret);
+       }
 
-               led_dat->cdev.brightness_set = led_pwm_set;
-               led_dat->cdev.brightness = LED_OFF;
-               led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
+       return ret;
+}
 
-               led_dat->can_sleep = pwm_can_sleep(led_dat->pwm);
-               if (led_dat->can_sleep)
-                       INIT_WORK(&led_dat->work, led_pwm_work);
+static int led_pwm_create_of(struct device *dev, struct led_pwm_priv *priv)
+{
+       struct device_node *child;
+       struct led_pwm led;
+       int ret = 0;
 
-               ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "failed to register for %s\n",
-                               led_dat->cdev.name);
+       memset(&led, 0, sizeof(led));
+
+       for_each_child_of_node(dev->of_node, child) {
+               led.name = of_get_property(child, "label", NULL) ? :
+                          child->name;
+
+               led.default_trigger = of_get_property(child,
+                                               "linux,default-trigger", NULL);
+               led.active_low = of_property_read_bool(child, "active-low");
+               of_property_read_u32(child, "max-brightness",
+                                    &led.max_brightness);
+
+               ret = led_pwm_add(dev, priv, &led, child);
+               if (ret) {
                        of_node_put(child);
-                       goto err;
+                       break;
                }
-               priv->num_leds++;
        }
 
-       return 0;
-err:
-       led_pwm_cleanup(priv);
-
        return ret;
 }
 
@@ -166,51 +190,23 @@ static int led_pwm_probe(struct platform_device *pdev)
 
        if (pdata) {
                for (i = 0; i < count; i++) {
-                       struct led_pwm *cur_led = &pdata->leds[i];
-                       struct led_pwm_data *led_dat = &priv->leds[i];
-
-                       led_dat->pwm = devm_pwm_get(&pdev->dev, cur_led->name);
-                       if (IS_ERR(led_dat->pwm)) {
-                               ret = PTR_ERR(led_dat->pwm);
-                               dev_err(&pdev->dev,
-                                       "unable to request PWM for %s\n",
-                                       cur_led->name);
-                               goto err;
-                       }
-
-                       led_dat->cdev.name = cur_led->name;
-                       led_dat->cdev.default_trigger = cur_led->default_trigger;
-                       led_dat->active_low = cur_led->active_low;
-                       led_dat->period = cur_led->pwm_period_ns;
-                       led_dat->cdev.brightness_set = led_pwm_set;
-                       led_dat->cdev.brightness = LED_OFF;
-                       led_dat->cdev.max_brightness = cur_led->max_brightness;
-                       led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
-
-                       led_dat->can_sleep = pwm_can_sleep(led_dat->pwm);
-                       if (led_dat->can_sleep)
-                               INIT_WORK(&led_dat->work, led_pwm_work);
-
-                       ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
-                       if (ret < 0)
-                               goto err;
+                       ret = led_pwm_add(&pdev->dev, priv, &pdata->leds[i],
+                                         NULL);
+                       if (ret)
+                               break;
                }
-               priv->num_leds = count;
        } else {
-               ret = led_pwm_create_of(pdev, priv);
-               if (ret)
-                       return ret;
+               ret = led_pwm_create_of(&pdev->dev, priv);
+       }
+
+       if (ret) {
+               led_pwm_cleanup(priv);
+               return ret;
        }
 
        platform_set_drvdata(pdev, priv);
 
        return 0;
-
-err:
-       priv->num_leds = i;
-       led_pwm_cleanup(priv);
-
-       return ret;
 }
 
 static int led_pwm_remove(struct platform_device *pdev)
diff --git a/include/linux/dell-led.h b/include/linux/dell-led.h
new file mode 100644 (file)
index 0000000..7009b8b
--- /dev/null
@@ -0,0 +1,10 @@
+#ifndef __DELL_LED_H__
+#define __DELL_LED_H__
+
+enum {
+       DELL_LED_MICMUTE,
+};
+
+int dell_app_wmi_led_set(int whichled, int on);
+
+#endif
diff --git a/include/linux/platform_data/leds-pca9685.h b/include/linux/platform_data/leds-pca9685.h
deleted file mode 100644 (file)
index 778e9e4..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2013 Maximilian Güntner <maximilian.guentner@gmail.com>
- *
- * This file is subject to the terms and conditions of version 2 of
- * the GNU General Public License.  See the file COPYING in the main
- * directory of this archive for more details.
- *
- * Based on leds-pca963x.h by Peter Meerwald <p.meerwald@bct-electronic.com>
- *
- * LED driver for the NXP PCA9685 PWM chip
- *
- */
-
-#ifndef __LINUX_PCA9685_H
-#define __LINUX_PCA9685_H
-
-#include <linux/leds.h>
-
-enum pca9685_outdrv {
-       PCA9685_OPEN_DRAIN,
-       PCA9685_TOTEM_POLE,
-};
-
-enum pca9685_inverted {
-       PCA9685_NOT_INVERTED,
-       PCA9685_INVERTED,
-};
-
-struct pca9685_platform_data {
-       struct led_platform_data leds;
-       enum pca9685_outdrv outdrv;
-       enum pca9685_inverted inverted;
-};
-
-#endif /* __LINUX_PCA9685_H */