leds: leds-mc13783: Add MC34708 LED support

This patch adds support for two LEDs on MC34708 PMIC.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Bryan Wu <cooloney@gmail.com>

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 72156c1..93466d2 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -416,7 +416,7 @@ config LEDS_MC13783
        depends on MFD_MC13XXX
        help
          This option enable support for on-chip LED drivers found
-         on Freescale Semiconductor MC13783/MC13892 PMIC.
+         on Freescale Semiconductor MC13783/MC13892/MC34708 PMIC.
 
 config LEDS_NS2
        tristate "LED support for Network Space v2 GPIO LEDs"

diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index ca87a1b..68f2455 100644 (file)
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -1,5 +1,5 @@
 /*
- * LEDs driver for Freescale MC13783/MC13892
+ * LEDs driver for Freescale MC13783/MC13892/MC34708
  *
  * Copyright (C) 2010 Philippe Rétornaz
  *
@@ -23,23 +23,23 @@
 #include <linux/workqueue.h>
 #include <linux/mfd/mc13xxx.h>
 
-#define MC13XXX_REG_LED_CONTROL(x)     (51 + (x))
-
 struct mc13xxx_led_devtype {
        int     led_min;
        int     led_max;
        int     num_regs;
+       u32     ledctrl_base;
 };
 
 struct mc13xxx_led {
        struct led_classdev     cdev;
        struct work_struct      work;
-       struct mc13xxx          *master;
        enum led_brightness     new_brightness;
        int                     id;
+       struct mc13xxx_leds     *leds;
 };
 
 struct mc13xxx_leds {
+       struct mc13xxx                  *master;
        struct mc13xxx_led_devtype      *devtype;
        int                             num_leds;
        struct mc13xxx_led              led[0];
@@ -48,24 +48,15 @@ struct mc13xxx_leds {
 static void mc13xxx_led_work(struct work_struct *work)
 {
        struct mc13xxx_led *led = container_of(work, struct mc13xxx_led, work);
-       int reg, mask, value, bank, off, shift;
+       struct mc13xxx_leds *leds = led->leds;
+       unsigned int reg, mask, value, bank, off, shift;
 
        switch (led->id) {
        case MC13783_LED_MD:
-               reg = MC13XXX_REG_LED_CONTROL(2);
-               shift = 9;
-               mask = 0x0f;
-               value = led->new_brightness >> 4;
-               break;
        case MC13783_LED_AD:
-               reg = MC13XXX_REG_LED_CONTROL(2);
-               shift = 13;
-               mask = 0x0f;
-               value = led->new_brightness >> 4;
-               break;
        case MC13783_LED_KP:
-               reg = MC13XXX_REG_LED_CONTROL(2);
-               shift = 17;
+               reg = 2;
+               shift = 9 + (led->id - MC13783_LED_MD) * 4;
                mask = 0x0f;
                value = led->new_brightness >> 4;
                break;
@@ -80,26 +71,16 @@ static void mc13xxx_led_work(struct work_struct *work)
        case MC13783_LED_B3:
                off = led->id - MC13783_LED_R1;
                bank = off / 3;
-               reg = MC13XXX_REG_LED_CONTROL(3) + bank;
+               reg = 3 + bank;
                shift = (off - bank * 3) * 5 + 6;
                value = led->new_brightness >> 3;
                mask = 0x1f;
                break;
        case MC13892_LED_MD:
-               reg = MC13XXX_REG_LED_CONTROL(0);
-               shift = 3;
-               mask = 0x3f;
-               value = led->new_brightness >> 2;
-               break;
        case MC13892_LED_AD:
-               reg = MC13XXX_REG_LED_CONTROL(0);
-               shift = 15;
-               mask = 0x3f;
-               value = led->new_brightness >> 2;
-               break;
        case MC13892_LED_KP:
-               reg = MC13XXX_REG_LED_CONTROL(1);
-               shift = 3;
+               reg = (led->id - MC13892_LED_MD) / 2;
+               shift = 3 + (led->id - MC13892_LED_MD) * 12;
                mask = 0x3f;
                value = led->new_brightness >> 2;
                break;
@@ -108,16 +89,24 @@ static void mc13xxx_led_work(struct work_struct *work)
        case MC13892_LED_B:
                off = led->id - MC13892_LED_R;
                bank = off / 2;
-               reg = MC13XXX_REG_LED_CONTROL(2) + bank;
+               reg = 2 + bank;
                shift = (off - bank * 2) * 12 + 3;
                value = led->new_brightness >> 2;
                mask = 0x3f;
                break;
+       case MC34708_LED_R:
+       case MC34708_LED_G:
+               reg = 0;
+               shift = 3 + (led->id - MC34708_LED_R) * 12;
+               value = led->new_brightness >> 2;
+               mask = 0x3f;
+               break;
        default:
                BUG();
        }
 
-       mc13xxx_reg_rmw(led->master, reg, mask << shift, value << shift);
+       mc13xxx_reg_rmw(leds->master, leds->devtype->ledctrl_base + reg,
+                       mask << shift, value << shift);
 }
 
 static void mc13xxx_led_set(struct led_classdev *led_cdev,
@@ -132,16 +121,17 @@ static void mc13xxx_led_set(struct led_classdev *led_cdev,
 
 static int __init mc13xxx_led_probe(struct platform_device *pdev)
 {
-       struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
-       struct mc13xxx *mcdev = dev_get_drvdata(pdev->dev.parent);
+       struct device *dev = &pdev->dev;
+       struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(dev);
+       struct mc13xxx *mcdev = dev_get_drvdata(dev->parent);
        struct mc13xxx_led_devtype *devtype =
                (struct mc13xxx_led_devtype *)pdev->id_entry->driver_data;
        struct mc13xxx_leds *leds;
        int i, id, num_leds, ret = -ENODATA;
-       u32 reg, init_led = 0;
+       u32 init_led = 0;
 
        if (!pdata) {
-               dev_err(&pdev->dev, "Missing platform data\n");
+               dev_err(dev, "Missing platform data\n");
                return -ENODEV;
        }
 
@@ -149,23 +139,23 @@ static int __init mc13xxx_led_probe(struct platform_device *pdev)
 
        if ((num_leds < 1) ||
            (num_leds > (devtype->led_max - devtype->led_min + 1))) {
-               dev_err(&pdev->dev, "Invalid LED count %d\n", num_leds);
+               dev_err(dev, "Invalid LED count %d\n", num_leds);
                return -EINVAL;
        }
 
-       leds = devm_kzalloc(&pdev->dev, num_leds * sizeof(struct mc13xxx_led) +
+       leds = devm_kzalloc(dev, num_leds * sizeof(struct mc13xxx_led) +
                            sizeof(struct mc13xxx_leds), GFP_KERNEL);
        if (!leds)
                return -ENOMEM;
 
        leds->devtype = devtype;
        leds->num_leds = num_leds;
+       leds->master = mcdev;
        platform_set_drvdata(pdev, leds);
 
        for (i = 0; i < devtype->num_regs; i++) {
-               reg = pdata->led_control[i];
-               WARN_ON(reg >= (1 << 24));
-               ret = mc13xxx_reg_write(mcdev, MC13XXX_REG_LED_CONTROL(i), reg);
+               ret = mc13xxx_reg_write(mcdev, leds->devtype->ledctrl_base + i,
+                                       pdata->led_control[i]);
                if (ret)
                        return ret;
        }
@@ -180,19 +170,18 @@ static int __init mc13xxx_led_probe(struct platform_device *pdev)
                trig = pdata->led[i].default_trigger;
 
                if ((id > devtype->led_max) || (id < devtype->led_min)) {
-                       dev_err(&pdev->dev, "Invalid ID %i\n", id);
+                       dev_err(dev, "Invalid ID %i\n", id);
                        break;
                }
 
                if (init_led & (1 << id)) {
-                       dev_warn(&pdev->dev,
-                                "LED %i already initialized\n", id);
+                       dev_warn(dev, "LED %i already initialized\n", id);
                        break;
                }
 
                init_led |= 1 << id;
                leds->led[i].id = id;
-               leds->led[i].master = mcdev;
+               leds->led[i].leds = leds;
                leds->led[i].cdev.name = name;
                leds->led[i].cdev.default_trigger = trig;
                leds->led[i].cdev.brightness_set = mc13xxx_led_set;
@@ -200,10 +189,9 @@ static int __init mc13xxx_led_probe(struct platform_device *pdev)
 
                INIT_WORK(&leds->led[i].work, mc13xxx_led_work);
 
-               ret = led_classdev_register(pdev->dev.parent,
-                                           &leds->led[i].cdev);
+               ret = led_classdev_register(dev->parent, &leds->led[i].cdev);
                if (ret) {
-                       dev_err(&pdev->dev, "Failed to register LED %i\n", id);
+                       dev_err(dev, "Failed to register LED %i\n", id);
                        break;
                }
        }
@@ -219,8 +207,8 @@ static int __init mc13xxx_led_probe(struct platform_device *pdev)
 
 static int mc13xxx_led_remove(struct platform_device *pdev)
 {
-       struct mc13xxx *mcdev = dev_get_drvdata(pdev->dev.parent);
        struct mc13xxx_leds *leds = platform_get_drvdata(pdev);
+       struct mc13xxx *mcdev = leds->master;
        int i;
 
        for (i = 0; i < leds->num_leds; i++) {
@@ -229,7 +217,7 @@ static int mc13xxx_led_remove(struct platform_device *pdev)
        }
 
        for (i = 0; i < leds->devtype->num_regs; i++)
-               mc13xxx_reg_write(mcdev, MC13XXX_REG_LED_CONTROL(i), 0);
+               mc13xxx_reg_write(mcdev, leds->devtype->ledctrl_base + i, 0);
 
        return 0;
 }
@@ -238,17 +226,27 @@ static const struct mc13xxx_led_devtype mc13783_led_devtype = {
        .led_min        = MC13783_LED_MD,
        .led_max        = MC13783_LED_B3,
        .num_regs       = 6,
+       .ledctrl_base   = 51,
 };
 
 static const struct mc13xxx_led_devtype mc13892_led_devtype = {
        .led_min        = MC13892_LED_MD,
        .led_max        = MC13892_LED_B,
        .num_regs       = 4,
+       .ledctrl_base   = 51,
+};
+
+static const struct mc13xxx_led_devtype mc34708_led_devtype = {
+       .led_min        = MC34708_LED_R,
+       .led_max        = MC34708_LED_G,
+       .num_regs       = 1,
+       .ledctrl_base   = 54,
 };
 
 static const struct platform_device_id mc13xxx_led_id_table[] = {
        { "mc13783-led", (kernel_ulong_t)&mc13783_led_devtype, },
        { "mc13892-led", (kernel_ulong_t)&mc13892_led_devtype, },
+       { "mc34708-led", (kernel_ulong_t)&mc34708_led_devtype, },
        { }
 };
 MODULE_DEVICE_TABLE(platform, mc13xxx_led_id_table);

diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index ac39d91..a326c85 100644 (file)
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -104,6 +104,9 @@ enum {
        MC13892_LED_R,
        MC13892_LED_G,
        MC13892_LED_B,
+       /* MC34708 LED IDs */
+       MC34708_LED_R,
+       MC34708_LED_G,
 };
 
 struct mc13xxx_led_platform_data {
@@ -163,6 +166,9 @@ struct mc13xxx_leds_platform_data {
 #define MC13892_LED_C2_CURRENT_G(x)    (((x) & 0x7) << 21)
 /* MC13892 LED Control 3 */
 #define MC13892_LED_C3_CURRENT_B(x)    (((x) & 0x7) << 9)
+/* MC34708 LED Control 0 */
+#define MC34708_LED_C0_CURRENT_R(x)    (((x) & 0x3) << 9)
+#define MC34708_LED_C0_CURRENT_G(x)    (((x) & 0x3) << 21)
        u32 led_control[MAX_LED_CONTROL_REGS];
 };