* [PATCH v2 0/4] leds: leds-mc13xxx
@ 2013-06-05 8:34 Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 1/4] leds: leds-mc13783: Prepare driver to support MC13892 LEDs Alexander Shiyan
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Alexander Shiyan @ 2013-06-05 8:34 UTC (permalink / raw)
To: linux-arm-kernel
This is series for add MC13892 LED support into mc13783 (mc13xxx) LED driver.
Further development of drivers I see it as follows:
I think that we need to replace all the variables from the platform_data
to the default register values (reg0=xxx, reg1=xxx etc.).
It is not too complicate the use of platform_data and will add DT-support
for the driver.
Comments are welcome.
Alexander Shiyan (4):
leds: leds-mc13783: Prepare driver to support MC13892 LEDs
leds: leds-mc13783: Add MC13892 LED support
leds: leds-mc13783: Rename unit to indicate various MC13xxx chips
support
leds: leds-mc13xxx: Use module_platform_driver_probe for driver
arch/arm/configs/imx_v4_v5_defconfig | 2 +-
drivers/leds/Kconfig | 8 +-
drivers/leds/Makefile | 2 +-
drivers/leds/leds-mc13783.c | 391 -------------------------
drivers/leds/leds-mc13xxx.c | 545 +++++++++++++++++++++++++++++++++++
include/linux/mfd/mc13xxx.h | 49 +++-
6 files changed, 586 insertions(+), 411 deletions(-)
delete mode 100644 drivers/leds/leds-mc13783.c
create mode 100644 drivers/leds/leds-mc13xxx.c
--
1.8.1.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/4] leds: leds-mc13783: Prepare driver to support MC13892 LEDs
2013-06-05 8:34 [PATCH v2 0/4] leds: leds-mc13xxx Alexander Shiyan
@ 2013-06-05 8:34 ` Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 2/4] leds: leds-mc13783: Add MC13892 LED support Alexander Shiyan
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2013-06-05 8:34 UTC (permalink / raw)
To: linux-arm-kernel
This patch prepares driver code to support MC13892 LEDs.
Some stuff was optimized for support another PMIC, some
dependencies was moved into devdata calls.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/leds/leds-mc13783.c | 197 +++++++++++++++++++++++++-------------------
include/linux/mfd/mc13xxx.h | 1 -
2 files changed, 111 insertions(+), 87 deletions(-)
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index ea8fc5d..2203bc0 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -24,7 +24,14 @@
#include <linux/mfd/mc13xxx.h>
#include <linux/slab.h>
-struct mc13783_led {
+struct mc13xxx_led_devtype {
+ int led_min;
+ int led_max;
+ int (*leds_startup)(struct platform_device *);
+ void (*leds_shutdown)(struct platform_device *);
+};
+
+struct mc13xxx_led {
struct led_classdev cdev;
struct work_struct work;
struct mc13xxx *master;
@@ -32,7 +39,7 @@ struct mc13783_led {
int id;
};
-#define MC13783_REG_LED_CONTROL_0 51
+#define MC13XXX_REG_LED_CONTROL_0 51
#define MC13783_LED_C0_ENABLE_BIT (1 << 0)
#define MC13783_LED_C0_TRIODE_MD_BIT (1 << 7)
#define MC13783_LED_C0_TRIODE_AD_BIT (1 << 8)
@@ -43,10 +50,10 @@ struct mc13783_led {
#define MC13783_LED_C0_ABREF_MASK 0x3
#define MC13783_LED_C0_ABREF 14
-#define MC13783_REG_LED_CONTROL_1 52
+#define MC13XXX_REG_LED_CONTROL_1 52
#define MC13783_LED_C1_TC1HALF_BIT (1 << 18)
-#define MC13783_REG_LED_CONTROL_2 53
+#define MC13XXX_REG_LED_CONTROL_2 53
#define MC13783_LED_C2_BL_P_MASK 0xf
#define MC13783_LED_C2_MD_P 9
#define MC13783_LED_C2_AD_P 13
@@ -56,7 +63,7 @@ struct mc13783_led {
#define MC13783_LED_C2_AD_C 3
#define MC13783_LED_C2_KP_C 6
-#define MC13783_REG_LED_CONTROL_3 54
+#define MC13XXX_REG_LED_CONTROL_3 54
#define MC13783_LED_C3_TC_P 6
#define MC13783_LED_C3_TC_P_MASK 0x1f
@@ -69,29 +76,29 @@ struct mc13783_led {
#define MC13783_LED_Cx_TRIODE_TC_BIT (1 << 23)
#define MC13783_LED_Cx_TC_C_MASK 0x3
-static void mc13783_led_work(struct work_struct *work)
+static void mc13xxx_led_work(struct work_struct *work)
{
- struct mc13783_led *led = container_of(work, struct mc13783_led, work);
- int reg = 0;
- int mask = 0;
- int value = 0;
- int bank, off, shift;
+ struct mc13xxx_led *led = container_of(work, struct mc13xxx_led, work);
+ int reg, mask, value, bank, off, shift;
switch (led->id) {
case MC13783_LED_MD:
- reg = MC13783_REG_LED_CONTROL_2;
- mask = MC13783_LED_C2_BL_P_MASK << MC13783_LED_C2_MD_P;
- value = (led->new_brightness >> 4) << MC13783_LED_C2_MD_P;
+ reg = MC13XXX_REG_LED_CONTROL_2;
+ mask = MC13783_LED_C2_BL_P_MASK;
+ shift = MC13783_LED_C2_MD_P;
+ value = led->new_brightness >> 4;
break;
case MC13783_LED_AD:
- reg = MC13783_REG_LED_CONTROL_2;
- mask = MC13783_LED_C2_BL_P_MASK << MC13783_LED_C2_AD_P;
- value = (led->new_brightness >> 4) << MC13783_LED_C2_AD_P;
+ reg = MC13XXX_REG_LED_CONTROL_2;
+ mask = MC13783_LED_C2_BL_P_MASK;
+ shift = MC13783_LED_C2_AD_P;
+ value = led->new_brightness >> 4;
break;
case MC13783_LED_KP:
- reg = MC13783_REG_LED_CONTROL_2;
- mask = MC13783_LED_C2_BL_P_MASK << MC13783_LED_C2_KP_P;
- value = (led->new_brightness >> 4) << MC13783_LED_C2_KP_P;
+ reg = MC13XXX_REG_LED_CONTROL_2;
+ mask = MC13783_LED_C2_BL_P_MASK;
+ shift = MC13783_LED_C2_KP_P;
+ value = led->new_brightness >> 4;
break;
case MC13783_LED_R1:
case MC13783_LED_G1:
@@ -103,57 +110,51 @@ static void mc13783_led_work(struct work_struct *work)
case MC13783_LED_G3:
case MC13783_LED_B3:
off = led->id - MC13783_LED_R1;
- bank = off/3;
- reg = MC13783_REG_LED_CONTROL_3 + off/3;
- shift = (off - bank * 3) * 5 + MC13783_LED_C3_TC_P;
- value = (led->new_brightness >> 3) << shift;
- mask = MC13783_LED_C3_TC_P_MASK << shift;
+ bank = off / 3;
+ reg = MC13XXX_REG_LED_CONTROL_3 + bank;
+ shift = (off - bank * 3) * 5 + MC13783_LED_C3_TC_P;
+ value = led->new_brightness >> 3;
+ mask = MC13783_LED_C3_TC_P_MASK;
break;
+ default:
+ BUG();
}
mc13xxx_lock(led->master);
-
- mc13xxx_reg_rmw(led->master, reg, mask, value);
-
+ mc13xxx_reg_rmw(led->master, reg, mask << shift,
+ value << shift);
mc13xxx_unlock(led->master);
}
-static void mc13783_led_set(struct led_classdev *led_cdev,
- enum led_brightness value)
+static void mc13xxx_led_set(struct led_classdev *led_cdev,
+ enum led_brightness value)
{
- struct mc13783_led *led;
+ struct mc13xxx_led *led =
+ container_of(led_cdev, struct mc13xxx_led, cdev);
- led = container_of(led_cdev, struct mc13783_led, cdev);
led->new_brightness = value;
schedule_work(&led->work);
}
-static int mc13783_led_setup(struct mc13783_led *led, int max_current)
+static int mc13xxx_led_setup(struct mc13xxx_led *led, int max_current)
{
- int shift = 0;
- int mask = 0;
- int value = 0;
- int reg = 0;
- int ret, bank;
+ int shift, mask, reg, ret, bank;
switch (led->id) {
case MC13783_LED_MD:
shift = MC13783_LED_C2_MD_C;
mask = MC13783_LED_C2_BL_C_MASK;
- value = max_current & MC13783_LED_C2_BL_C_MASK;
- reg = MC13783_REG_LED_CONTROL_2;
+ reg = MC13XXX_REG_LED_CONTROL_2;
break;
case MC13783_LED_AD:
shift = MC13783_LED_C2_AD_C;
mask = MC13783_LED_C2_BL_C_MASK;
- value = max_current & MC13783_LED_C2_BL_C_MASK;
- reg = MC13783_REG_LED_CONTROL_2;
+ reg = MC13XXX_REG_LED_CONTROL_2;
break;
case MC13783_LED_KP:
shift = MC13783_LED_C2_KP_C;
mask = MC13783_LED_C2_BL_C_MASK;
- value = max_current & MC13783_LED_C2_BL_C_MASK;
- reg = MC13783_REG_LED_CONTROL_2;
+ reg = MC13XXX_REG_LED_CONTROL_2;
break;
case MC13783_LED_R1:
case MC13783_LED_G1:
@@ -164,29 +165,28 @@ static int mc13783_led_setup(struct mc13783_led *led, int max_current)
case MC13783_LED_R3:
case MC13783_LED_G3:
case MC13783_LED_B3:
- bank = (led->id - MC13783_LED_R1)/3;
- reg = MC13783_REG_LED_CONTROL_3 + bank;
+ bank = (led->id - MC13783_LED_R1) / 3;
+ reg = MC13XXX_REG_LED_CONTROL_3 + bank;
shift = ((led->id - MC13783_LED_R1) - bank * 3) * 2;
mask = MC13783_LED_Cx_TC_C_MASK;
- value = max_current & MC13783_LED_Cx_TC_C_MASK;
break;
+ default:
+ BUG();
}
mc13xxx_lock(led->master);
-
ret = mc13xxx_reg_rmw(led->master, reg, mask << shift,
- value << shift);
-
+ (max_current & mask) << shift);
mc13xxx_unlock(led->master);
+
return ret;
}
-static int mc13783_leds_prepare(struct platform_device *pdev)
+static int mc13783_leds_startup(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
- int ret = 0;
- int reg = 0;
+ int ret, reg = 0;
mc13xxx_lock(dev);
@@ -196,7 +196,7 @@ static int mc13783_leds_prepare(struct platform_device *pdev)
if (pdata->flags & MC13783_LED_SLEWLIMTC)
reg |= MC13783_LED_Cx_SLEWLIM_BIT;
- ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_1, reg);
+ ret = mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_1, reg);
if (ret)
goto out;
@@ -206,7 +206,7 @@ static int mc13783_leds_prepare(struct platform_device *pdev)
if (pdata->flags & MC13783_LED_SLEWLIMBL)
reg |= MC13783_LED_Cx_SLEWLIM_BIT;
- ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_2, reg);
+ ret = mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_2, reg);
if (ret)
goto out;
@@ -216,7 +216,7 @@ static int mc13783_leds_prepare(struct platform_device *pdev)
if (pdata->flags & MC13783_LED_TRIODE_TC1)
reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
- ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_3, reg);
+ ret = mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_3, reg);
if (ret)
goto out;
@@ -255,27 +255,47 @@ static int mc13783_leds_prepare(struct platform_device *pdev)
reg |= (pdata->abref & MC13783_LED_C0_ABREF_MASK) <<
MC13783_LED_C0_ABREF;
- ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_0, reg);
+ ret = mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_0, reg);
out:
mc13xxx_unlock(dev);
+
return ret;
}
-static int mc13783_led_probe(struct platform_device *pdev)
+static void mc13783_leds_shutdown(struct platform_device *pdev)
+{
+ struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
+
+ mc13xxx_lock(dev);
+
+ mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_0, 0);
+ mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_1, 0);
+ mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_2, 0);
+ mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_3, 0);
+ mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_4, 0);
+ mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_5, 0);
+
+ mc13xxx_unlock(dev);
+}
+
+static int mc13xxx_led_probe(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+ struct mc13xxx_led_devtype *devtype =
+ (struct mc13xxx_led_devtype *)pdev->id_entry->driver_data;
struct mc13xxx_led_platform_data *led_cur;
- struct mc13783_led *led, *led_dat;
+ struct mc13xxx_led *led, *led_dat;
+ unsigned int init_led = 0;
int ret, i;
- int init_led = 0;
if (pdata == NULL) {
dev_err(&pdev->dev, "missing platform data\n");
return -ENODEV;
}
- if (pdata->num_leds < 1 || pdata->num_leds > (MC13783_LED_MAX + 1)) {
+ if ((pdata->num_leds < 1) ||
+ (pdata->num_leds > (devtype->led_max - devtype->led_min + 1))) {
dev_err(&pdev->dev, "Invalid led count %d\n", pdata->num_leds);
return -EINVAL;
}
@@ -287,7 +307,7 @@ static int mc13783_led_probe(struct platform_device *pdev)
return -ENOMEM;
}
- ret = mc13783_leds_prepare(pdev);
+ ret = devtype->leds_startup(pdev);
if (ret) {
dev_err(&pdev->dev, "unable to init led driver\n");
return ret;
@@ -297,7 +317,8 @@ static int mc13783_led_probe(struct platform_device *pdev)
led_dat = &led[i];
led_cur = &pdata->led[i];
- if (led_cur->id > MC13783_LED_MAX || led_cur->id < 0) {
+ if ((led_cur->id > devtype->led_max) ||
+ (led_cur->id < devtype->led_min)) {
dev_err(&pdev->dev, "invalid id %d\n", led_cur->id);
ret = -EINVAL;
goto err_register;
@@ -313,12 +334,12 @@ static int mc13783_led_probe(struct platform_device *pdev)
init_led |= 1 << led_cur->id;
led_dat->cdev.name = led_cur->name;
led_dat->cdev.default_trigger = led_cur->default_trigger;
- led_dat->cdev.brightness_set = mc13783_led_set;
+ led_dat->cdev.brightness_set = mc13xxx_led_set;
led_dat->cdev.brightness = LED_OFF;
led_dat->id = led_cur->id;
led_dat->master = dev_get_drvdata(pdev->dev.parent);
- INIT_WORK(&led_dat->work, mc13783_led_work);
+ INIT_WORK(&led_dat->work, mc13xxx_led_work);
ret = led_classdev_register(pdev->dev.parent, &led_dat->cdev);
if (ret) {
@@ -327,7 +348,7 @@ static int mc13783_led_probe(struct platform_device *pdev)
goto err_register;
}
- ret = mc13783_led_setup(led_dat, led_cur->max_current);
+ ret = mc13xxx_led_setup(led_dat, led_cur->max_current);
if (ret) {
dev_err(&pdev->dev, "unable to init led %d\n",
led_dat->id);
@@ -348,11 +369,12 @@ err_register:
return ret;
}
-static int mc13783_led_remove(struct platform_device *pdev)
+static int mc13xxx_led_remove(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
- struct mc13783_led *led = platform_get_drvdata(pdev);
- struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
+ struct mc13xxx_led_devtype *devtype =
+ (struct mc13xxx_led_devtype *)pdev->id_entry->driver_data;
+ struct mc13xxx_led *led = platform_get_drvdata(pdev);
int i;
for (i = 0; i < pdata->num_leds; i++) {
@@ -360,32 +382,35 @@ static int mc13783_led_remove(struct platform_device *pdev)
cancel_work_sync(&led[i].work);
}
- mc13xxx_lock(dev);
-
- mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_0, 0);
- mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_1, 0);
- mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_2, 0);
- mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_3, 0);
- mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_4, 0);
- mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_5, 0);
-
- mc13xxx_unlock(dev);
+ devtype->leds_shutdown(pdev);
return 0;
}
-static struct platform_driver mc13783_led_driver = {
+static const struct mc13xxx_led_devtype mc13783_led_devtype = {
+ .led_min = MC13783_LED_MD,
+ .led_max = MC13783_LED_B3,
+ .leds_startup = mc13783_leds_startup,
+ .leds_shutdown = mc13783_leds_shutdown,
+};
+
+static const struct platform_device_id mc13xxx_led_id_table[] = {
+ { "mc13783-led", (kernel_ulong_t)&mc13783_led_devtype, },
+ { }
+};
+MODULE_DEVICE_TABLE(platform, mc13xxx_led_id_table);
+
+static struct platform_driver mc13xxx_led_driver = {
.driver = {
- .name = "mc13783-led",
+ .name = "mc13xxx-led",
.owner = THIS_MODULE,
},
- .probe = mc13783_led_probe,
- .remove = mc13783_led_remove,
+ .probe = mc13xxx_led_probe,
+ .remove = mc13xxx_led_remove,
+ .id_table = mc13xxx_led_id_table,
};
-
-module_platform_driver(mc13783_led_driver);
+module_platform_driver(mc13xxx_led_driver);
MODULE_DESCRIPTION("LEDs driver for Freescale MC13783 PMIC");
MODULE_AUTHOR("Philippe Retornaz <philippe.retornaz@epfl.ch>");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:mc13783-led");
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index bf07075..fe0e003 100644
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -91,7 +91,6 @@ struct mc13xxx_led_platform_data {
#define MC13783_LED_R3 9
#define MC13783_LED_G3 10
#define MC13783_LED_B3 11
-#define MC13783_LED_MAX MC13783_LED_B3
int id;
const char *name;
const char *default_trigger;
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/4] leds: leds-mc13783: Add MC13892 LED support
2013-06-05 8:34 [PATCH v2 0/4] leds: leds-mc13xxx Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 1/4] leds: leds-mc13783: Prepare driver to support MC13892 LEDs Alexander Shiyan
@ 2013-06-05 8:34 ` Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 3/4] leds: leds-mc13783: Rename unit to indicate various MC13xxx chips support Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 4/4] leds: leds-mc13xxx: Use module_platform_driver_probe for driver Alexander Shiyan
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2013-06-05 8:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/leds/leds-mc13783.c | 134 +++++++++++++++++++++++++++++++++++++++++++-
include/linux/mfd/mc13xxx.h | 48 +++++++++++-----
2 files changed, 167 insertions(+), 15 deletions(-)
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index 2203bc0..53d7afd 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -1,5 +1,5 @@
/*
- * LEDs driver for Freescale MC13783
+ * LEDs driver for Freescale MC13783/MC13982
*
* Copyright (C) 2010 Philippe R?tornaz
*
@@ -49,9 +49,15 @@ struct mc13xxx_led {
#define MC13783_LED_C0_ABMODE 11
#define MC13783_LED_C0_ABREF_MASK 0x3
#define MC13783_LED_C0_ABREF 14
+#define MC13892_LED_C0_MD_HI_CURRENT (1 << 1)
+#define MC13892_LED_C0_RAMPMD_ENABLE (1 << 2)
+#define MC13892_LED_C0_AD_HI_CURRENT (1 << 13)
+#define MC13892_LED_C0_RAMPAD_ENABLE (1 << 14)
#define MC13XXX_REG_LED_CONTROL_1 52
#define MC13783_LED_C1_TC1HALF_BIT (1 << 18)
+#define MC13892_LED_C1_KP_HI_CURRENT (1 << 1)
+#define MC13892_LED_C1_RAMPKP_ENABLE (1 << 2)
#define MC13XXX_REG_LED_CONTROL_2 53
#define MC13783_LED_C2_BL_P_MASK 0xf
@@ -62,10 +68,15 @@ struct mc13xxx_led {
#define MC13783_LED_C2_MD_C 0
#define MC13783_LED_C2_AD_C 3
#define MC13783_LED_C2_KP_C 6
+#define MC13892_LED_C2_RAMPR_ENABLE (1 << 2)
+#define MC13892_LED_CX_CURRENT_MASK 0x7
+#define MC13892_LED_CX_DUTY_MASK 0x3f
+#define MC13892_LED_C2_RAMPG_ENABLE (1 << 14)
#define MC13XXX_REG_LED_CONTROL_3 54
#define MC13783_LED_C3_TC_P 6
#define MC13783_LED_C3_TC_P_MASK 0x1f
+#define MC13892_LED_C3_RAMPB_ENABLE (1 << 2)
#define MC13783_REG_LED_CONTROL_4 55
#define MC13783_REG_LED_CONTROL_5 56
@@ -116,6 +127,34 @@ static void mc13xxx_led_work(struct work_struct *work)
value = led->new_brightness >> 3;
mask = MC13783_LED_C3_TC_P_MASK;
break;
+ case MC13892_LED_MD:
+ reg = MC13XXX_REG_LED_CONTROL_0;
+ mask = MC13892_LED_CX_DUTY_MASK;
+ shift = 3;
+ value = led->new_brightness >> 2;
+ break;
+ case MC13892_LED_AD:
+ reg = MC13XXX_REG_LED_CONTROL_0;
+ mask = MC13892_LED_CX_DUTY_MASK;
+ shift = 15;
+ value = led->new_brightness >> 2;
+ break;
+ case MC13892_LED_KP:
+ reg = MC13XXX_REG_LED_CONTROL_1;
+ mask = MC13892_LED_CX_DUTY_MASK;
+ shift = 3;
+ value = led->new_brightness >> 2;
+ break;
+ case MC13892_LED_R:
+ case MC13892_LED_G:
+ case MC13892_LED_B:
+ off = led->id - MC13892_LED_R;
+ bank = off / 2;
+ reg = MC13XXX_REG_LED_CONTROL_2 + bank;
+ shift = (off - bank * 2) * 12 + 3;
+ value = led->new_brightness >> 2;
+ mask = MC13892_LED_CX_DUTY_MASK;
+ break;
default:
BUG();
}
@@ -170,6 +209,29 @@ static int mc13xxx_led_setup(struct mc13xxx_led *led, int max_current)
shift = ((led->id - MC13783_LED_R1) - bank * 3) * 2;
mask = MC13783_LED_Cx_TC_C_MASK;
break;
+ case MC13892_LED_MD:
+ shift = 9;
+ mask = MC13892_LED_CX_CURRENT_MASK;
+ reg = MC13XXX_REG_LED_CONTROL_0;
+ break;
+ case MC13892_LED_AD:
+ shift = 21;
+ mask = MC13892_LED_CX_CURRENT_MASK;
+ reg = MC13XXX_REG_LED_CONTROL_0;
+ break;
+ case MC13892_LED_KP:
+ shift = 9;
+ mask = MC13892_LED_CX_CURRENT_MASK;
+ reg = MC13XXX_REG_LED_CONTROL_1;
+ break;
+ case MC13892_LED_R:
+ case MC13892_LED_G:
+ case MC13892_LED_B:
+ bank = (led->id - MC13892_LED_R) / 2;
+ reg = MC13XXX_REG_LED_CONTROL_2 + bank;
+ shift = ((led->id - MC13892_LED_R) - bank * 2) * 12 + 9;
+ mask = MC13892_LED_CX_CURRENT_MASK;
+ break;
default:
BUG();
}
@@ -279,6 +341,66 @@ static void mc13783_leds_shutdown(struct platform_device *pdev)
mc13xxx_unlock(dev);
}
+static int mc13892_leds_startup(struct platform_device *pdev)
+{
+ struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+ struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
+ int ret, reg;
+
+ mc13xxx_lock(dev);
+
+ reg = (pdata->flags & MC13892_LEDMD_HI_CURR) ?
+ MC13892_LED_C0_MD_HI_CURRENT : 0;
+ reg |= (pdata->flags & MC13892_LEDMD_RAMP_EN) ?
+ MC13892_LED_C0_RAMPMD_ENABLE : 0;
+ reg |= (pdata->flags & MC13892_LEDAD_HI_CURR) ?
+ MC13892_LED_C0_AD_HI_CURRENT : 0;
+ reg |= (pdata->flags & MC13892_LEDAD_RAMP_EN) ?
+ MC13892_LED_C0_RAMPAD_ENABLE : 0;
+ ret = mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_0, reg);
+ if (ret)
+ goto out;
+
+ reg = (pdata->flags & MC13892_LEDKP_HI_CURR) ?
+ MC13892_LED_C1_KP_HI_CURRENT : 0;
+ reg |= (pdata->flags & MC13892_LEDKP_RAMP_EN) ?
+ MC13892_LED_C1_RAMPKP_ENABLE : 0;
+ ret = mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_1, reg);
+ if (ret)
+ goto out;
+
+ reg = (pdata->flags & MC13892_LEDR_RAMP_EN) ?
+ MC13892_LED_C2_RAMPR_ENABLE : 0;
+ reg |= (pdata->flags & MC13892_LEDG_RAMP_EN) ?
+ MC13892_LED_C2_RAMPG_ENABLE : 0;
+ ret = mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_2, reg);
+ if (ret)
+ goto out;
+
+ reg = (pdata->flags & MC13892_LEDB_RAMP_EN) ?
+ MC13892_LED_C3_RAMPB_ENABLE : 0;
+ ret = mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_3, reg);
+
+out:
+ mc13xxx_unlock(dev);
+
+ return ret;
+}
+
+static void mc13892_leds_shutdown(struct platform_device *pdev)
+{
+ struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
+
+ mc13xxx_lock(dev);
+
+ mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_0, 0);
+ mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_1, 0);
+ mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_2, 0);
+ mc13xxx_reg_write(dev, MC13XXX_REG_LED_CONTROL_3, 0);
+
+ mc13xxx_unlock(dev);
+}
+
static int mc13xxx_led_probe(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
@@ -394,8 +516,16 @@ static const struct mc13xxx_led_devtype mc13783_led_devtype = {
.leds_shutdown = mc13783_leds_shutdown,
};
+static const struct mc13xxx_led_devtype mc13892_led_devtype = {
+ .led_min = MC13892_LED_MD,
+ .led_max = MC13892_LED_B,
+ .leds_startup = mc13892_leds_startup,
+ .leds_shutdown = mc13892_leds_shutdown,
+};
+
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, },
{ }
};
MODULE_DEVICE_TABLE(platform, mc13xxx_led_id_table);
@@ -411,6 +541,6 @@ static struct platform_driver mc13xxx_led_driver = {
};
module_platform_driver(mc13xxx_led_driver);
-MODULE_DESCRIPTION("LEDs driver for Freescale MC13783 PMIC");
+MODULE_DESCRIPTION("LEDs driver for Freescale MC13XXX PMIC");
MODULE_AUTHOR("Philippe Retornaz <philippe.retornaz@epfl.ch>");
MODULE_LICENSE("GPL");
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index fe0e003..8eba95d 100644
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -78,19 +78,30 @@ struct mc13xxx_regulator_platform_data {
struct mc13xxx_regulator_init_data *regulators;
};
+enum {
+ /* MC13783 LED IDs */
+ MC13783_LED_MD,
+ MC13783_LED_AD,
+ MC13783_LED_KP,
+ MC13783_LED_R1,
+ MC13783_LED_G1,
+ MC13783_LED_B1,
+ MC13783_LED_R2,
+ MC13783_LED_G2,
+ MC13783_LED_B2,
+ MC13783_LED_R3,
+ MC13783_LED_G3,
+ MC13783_LED_B3,
+ /* MC13892 LED IDs */
+ MC13892_LED_MD,
+ MC13892_LED_AD,
+ MC13892_LED_KP,
+ MC13892_LED_R,
+ MC13892_LED_G,
+ MC13892_LED_B
+};
+
struct mc13xxx_led_platform_data {
-#define MC13783_LED_MD 0
-#define MC13783_LED_AD 1
-#define MC13783_LED_KP 2
-#define MC13783_LED_R1 3
-#define MC13783_LED_G1 4
-#define MC13783_LED_B1 5
-#define MC13783_LED_R2 6
-#define MC13783_LED_G2 7
-#define MC13783_LED_B2 8
-#define MC13783_LED_R3 9
-#define MC13783_LED_G3 10
-#define MC13783_LED_B3 11
int id;
const char *name;
const char *default_trigger;
@@ -103,6 +114,7 @@ struct mc13xxx_leds_platform_data {
int num_leds;
struct mc13xxx_led_platform_data *led;
+/* MC13783 specific */
#define MC13783_LED_TRIODE_MD (1 << 0)
#define MC13783_LED_TRIODE_AD (1 << 1)
#define MC13783_LED_TRIODE_KP (1 << 2)
@@ -113,7 +125,17 @@ struct mc13xxx_leds_platform_data {
#define MC13783_LED_TRIODE_TC1 (1 << 7)
#define MC13783_LED_TRIODE_TC2 (1 << 8)
#define MC13783_LED_TRIODE_TC3 (1 << 9)
- int flags;
+/* MC13892 specific */
+#define MC13892_LEDMD_HI_CURR (1 << 10)
+#define MC13892_LEDMD_RAMP_EN (1 << 11)
+#define MC13892_LEDAD_HI_CURR (1 << 12)
+#define MC13892_LEDAD_RAMP_EN (1 << 13)
+#define MC13892_LEDKP_HI_CURR (1 << 14)
+#define MC13892_LEDKP_RAMP_EN (1 << 15)
+#define MC13892_LEDR_RAMP_EN (1 << 16)
+#define MC13892_LEDG_RAMP_EN (1 << 17)
+#define MC13892_LEDB_RAMP_EN (1 << 18)
+ unsigned int flags;
#define MC13783_LED_AB_DISABLED 0
#define MC13783_LED_AB_MD1 1
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/4] leds: leds-mc13783: Rename unit to indicate various MC13xxx chips support
2013-06-05 8:34 [PATCH v2 0/4] leds: leds-mc13xxx Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 1/4] leds: leds-mc13783: Prepare driver to support MC13892 LEDs Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 2/4] leds: leds-mc13783: Add MC13892 LED support Alexander Shiyan
@ 2013-06-05 8:34 ` Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 4/4] leds: leds-mc13xxx: Use module_platform_driver_probe for driver Alexander Shiyan
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2013-06-05 8:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/configs/imx_v4_v5_defconfig | 2 +-
drivers/leds/Kconfig | 8 ++++----
drivers/leds/Makefile | 2 +-
drivers/leds/{leds-mc13783.c => leds-mc13xxx.c} | 0
4 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/leds/{leds-mc13783.c => leds-mc13xxx.c} (100%)
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index f07a847..7fd9f9b 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -166,7 +166,7 @@ CONFIG_MMC_MXC=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_MC13783=y
+CONFIG_LEDS_MC13XXX=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index ef99229..c9a4eb2 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -387,13 +387,13 @@ config LEDS_DELL_NETBOOKS
This adds support for the Latitude 2100 and similar
notebooks that have an external LED.
-config LEDS_MC13783
- tristate "LED Support for MC13783 PMIC"
+config LEDS_MC13XXX
+ tristate "LED Support for MC13XXX PMIC"
depends on LEDS_CLASS
- depends on MFD_MC13783
+ depends on MFD_MC13XXX
help
This option enable support for on-chip LED drivers found
- on Freescale Semiconductor MC13783 PMIC.
+ on Freescale Semiconductor MC13783/MC13892 PMIC.
config LEDS_NS2
tristate "LED support for Network Space v2 GPIO LEDs"
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index ac28977..70329f7 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -45,7 +45,7 @@ obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o
obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o
obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o
obj-$(CONFIG_LEDS_DELL_NETBOOKS) += dell-led.o
-obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.o
+obj-$(CONFIG_LEDS_MC13XXX) += leds-mc13xxx.o
obj-$(CONFIG_LEDS_NS2) += leds-ns2.o
obj-$(CONFIG_LEDS_NETXBIG) += leds-netxbig.o
obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13xxx.c
similarity index 100%
rename from drivers/leds/leds-mc13783.c
rename to drivers/leds/leds-mc13xxx.c
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 4/4] leds: leds-mc13xxx: Use module_platform_driver_probe for driver
2013-06-05 8:34 [PATCH v2 0/4] leds: leds-mc13xxx Alexander Shiyan
` (2 preceding siblings ...)
2013-06-05 8:34 ` [PATCH v2 3/4] leds: leds-mc13783: Rename unit to indicate various MC13xxx chips support Alexander Shiyan
@ 2013-06-05 8:34 ` Alexander Shiyan
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2013-06-05 8:34 UTC (permalink / raw)
To: linux-arm-kernel
MC13XXX LEDs is a part of MC13XXX MFD and driver loaded from
parent MFD driver, so replace module_platform_driver with
module_platform_driver_probe.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/leds/leds-mc13xxx.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/leds/leds-mc13xxx.c b/drivers/leds/leds-mc13xxx.c
index 53d7afd..3b64cc9 100644
--- a/drivers/leds/leds-mc13xxx.c
+++ b/drivers/leds/leds-mc13xxx.c
@@ -175,7 +175,7 @@ static void mc13xxx_led_set(struct led_classdev *led_cdev,
schedule_work(&led->work);
}
-static int mc13xxx_led_setup(struct mc13xxx_led *led, int max_current)
+static int __init mc13xxx_led_setup(struct mc13xxx_led *led, int max_current)
{
int shift, mask, reg, ret, bank;
@@ -244,7 +244,7 @@ static int mc13xxx_led_setup(struct mc13xxx_led *led, int max_current)
return ret;
}
-static int mc13783_leds_startup(struct platform_device *pdev)
+static int __init mc13783_leds_startup(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
@@ -341,7 +341,7 @@ static void mc13783_leds_shutdown(struct platform_device *pdev)
mc13xxx_unlock(dev);
}
-static int mc13892_leds_startup(struct platform_device *pdev)
+static int __init mc13892_leds_startup(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
@@ -401,7 +401,7 @@ static void mc13892_leds_shutdown(struct platform_device *pdev)
mc13xxx_unlock(dev);
}
-static int mc13xxx_led_probe(struct platform_device *pdev)
+static int __init mc13xxx_led_probe(struct platform_device *pdev)
{
struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct mc13xxx_led_devtype *devtype =
@@ -535,11 +535,10 @@ static struct platform_driver mc13xxx_led_driver = {
.name = "mc13xxx-led",
.owner = THIS_MODULE,
},
- .probe = mc13xxx_led_probe,
.remove = mc13xxx_led_remove,
.id_table = mc13xxx_led_id_table,
};
-module_platform_driver(mc13xxx_led_driver);
+module_platform_driver_probe(mc13xxx_led_driver, mc13xxx_led_probe);
MODULE_DESCRIPTION("LEDs driver for Freescale MC13XXX PMIC");
MODULE_AUTHOR("Philippe Retornaz <philippe.retornaz@epfl.ch>");
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-05 8:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-05 8:34 [PATCH v2 0/4] leds: leds-mc13xxx Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 1/4] leds: leds-mc13783: Prepare driver to support MC13892 LEDs Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 2/4] leds: leds-mc13783: Add MC13892 LED support Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 3/4] leds: leds-mc13783: Rename unit to indicate various MC13xxx chips support Alexander Shiyan
2013-06-05 8:34 ` [PATCH v2 4/4] leds: leds-mc13xxx: Use module_platform_driver_probe for driver Alexander Shiyan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).