Commit c16bfeb2 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem updates from Bryan Wu:
 - lp55xx device tree updates
 - mc13xxx driver updates
 - some clean up

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: mc13783: Fix "uninitialized variable" warning
  leds: Convert led class driver from legacy pm ops to dev_pm_ops
  leds: leds-mc13783: Add MC13892 LED support
  leds: leds-mc13783: Prepare driver to support MC13892 LEDs
  leds: renesas-tpu: cleanup a small type issue
  leds: use platform_{get,set}_drvdata()
  leds: leds-gpio: Let device core handle pinctrl
  leds: lp5562: Properly setup of_device_id table
  leds: lp5523: Properly setup of_device_id table
  leds: lp5521: Properly setup of_device_id table
  leds: lp5562: support the device tree feature
  leds: lp55xx: support dynamic channel settings in the device tree structure
  leds: leds-ns2: remove unnecessary platform_set_drvdata()
  leds: leds-mc13783: remove unnecessary platform_set_drvdata()
  leds: leds-gpio: remove unnecessary platform_set_drvdata()
  leds: atmel-pwm: remove unnecessary platform_set_drvdata()
  leds: lp55xx: add support for Device Tree bindings
parents 1286da8b cf3b1c2b
Binding for TI/National Semiconductor LP55xx Led Drivers
Required properties:
- compatible: "national,lp5521" or "national,lp5523" or "ti,lp5562"
- reg: I2C slave address
- clock-mode: Input clock mode, (0: automode, 1: internal, 2: external)
Each child has own specific current settings
- led-cur: Current setting at each led channel (mA x10, 0 if led is not connected)
- max-cur: Maximun current at each led channel.
Optional properties:
- label: Used for naming LEDs
Alternatively, each child can have specific channel name
- chan-name: Name of each channel name
example 1) LP5521
3 LED channels, external clock used. Channel names are 'lp5521_pri:channel0',
'lp5521_pri:channel1' and 'lp5521_pri:channel2'
lp5521@32 {
compatible = "national,lp5521";
reg = <0x32>;
label = "lp5521_pri";
clock-mode = /bits/ 8 <2>;
chan0 {
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
chan1 {
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
chan2 {
led-cur = /bits/ 8 <0x2f>;
max-cur = /bits/ 8 <0x5f>;
};
};
example 2) LP5523
9 LED channels with specific name. Internal clock used.
The I2C slave address is configurable with ASEL1 and ASEL0 pins.
Available addresses are 32/33/34/35h.
ASEL1 ASEL0 Address
-------------------------
GND GND 32h
GND VEN 33h
VEN GND 34h
VEN VEN 35h
lp5523@32 {
compatible = "national,lp5523";
reg = <0x32>;
clock-mode = /bits/ 8 <1>;
chan0 {
chan-name = "d1";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan1 {
chan-name = "d2";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan2 {
chan-name = "d3";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan3 {
chan-name = "d4";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan4 {
chan-name = "d5";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan5 {
chan-name = "d6";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan6 {
chan-name = "d7";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan7 {
chan-name = "d8";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
chan8 {
chan-name = "d9";
led-cur = /bits/ 8 <0x14>;
max-cur = /bits/ 8 <0x20>;
};
};
example 3) LP5562
4 channels are defined.
lp5562@30 {
compatible = "ti,lp5562";
reg = <0x30>;
clock-mode = /bits/8 <2>;
chan0 {
chan-name = "R";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
};
chan1 {
chan-name = "G";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
};
chan2 {
chan-name = "B";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
};
chan3 {
chan-name = "W";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
};
};
...@@ -268,10 +268,11 @@ static struct mc13xxx_led_platform_data moboard_led[] = { ...@@ -268,10 +268,11 @@ static struct mc13xxx_led_platform_data moboard_led[] = {
static struct mc13xxx_leds_platform_data moboard_leds = { static struct mc13xxx_leds_platform_data moboard_leds = {
.num_leds = ARRAY_SIZE(moboard_led), .num_leds = ARRAY_SIZE(moboard_led),
.led = moboard_led, .led = moboard_led,
.flags = MC13783_LED_SLEWLIMTC, .led_control[0] = MC13783_LED_C0_ENABLE | MC13783_LED_C0_ABMODE(0),
.abmode = MC13783_LED_AB_DISABLED, .led_control[1] = MC13783_LED_C1_SLEWLIM,
.tc1_period = MC13783_LED_PERIOD_10MS, .led_control[2] = MC13783_LED_C2_SLEWLIM,
.tc2_period = MC13783_LED_PERIOD_10MS, .led_control[3] = MC13783_LED_C3_PERIOD(0),
.led_control[4] = MC13783_LED_C3_PERIOD(0),
}; };
static struct mc13xxx_buttons_platform_data moboard_buttons = { static struct mc13xxx_buttons_platform_data moboard_buttons = {
......
...@@ -388,12 +388,12 @@ config LEDS_DELL_NETBOOKS ...@@ -388,12 +388,12 @@ config LEDS_DELL_NETBOOKS
notebooks that have an external LED. notebooks that have an external LED.
config LEDS_MC13783 config LEDS_MC13783
tristate "LED Support for MC13783 PMIC" tristate "LED Support for MC13XXX PMIC"
depends on LEDS_CLASS depends on LEDS_CLASS
depends on MFD_MC13783 depends on MFD_MC13XXX
help help
This option enable support for on-chip LED drivers found This option enable support for on-chip LED drivers found
on Freescale Semiconductor MC13783 PMIC. on Freescale Semiconductor MC13783/MC13892 PMIC.
config LEDS_NS2 config LEDS_NS2
tristate "LED support for Network Space v2 GPIO LEDs" tristate "LED support for Network Space v2 GPIO LEDs"
......
...@@ -156,7 +156,7 @@ void led_classdev_resume(struct led_classdev *led_cdev) ...@@ -156,7 +156,7 @@ void led_classdev_resume(struct led_classdev *led_cdev)
} }
EXPORT_SYMBOL_GPL(led_classdev_resume); EXPORT_SYMBOL_GPL(led_classdev_resume);
static int led_suspend(struct device *dev, pm_message_t state) static int led_suspend(struct device *dev)
{ {
struct led_classdev *led_cdev = dev_get_drvdata(dev); struct led_classdev *led_cdev = dev_get_drvdata(dev);
...@@ -176,6 +176,11 @@ static int led_resume(struct device *dev) ...@@ -176,6 +176,11 @@ static int led_resume(struct device *dev)
return 0; return 0;
} }
static const struct dev_pm_ops leds_class_dev_pm_ops = {
.suspend = led_suspend,
.resume = led_resume,
};
/** /**
* led_classdev_register - register a new object of led_classdev class. * led_classdev_register - register a new object of led_classdev class.
* @parent: The device to register. * @parent: The device to register.
...@@ -252,8 +257,7 @@ static int __init leds_init(void) ...@@ -252,8 +257,7 @@ static int __init leds_init(void)
leds_class = class_create(THIS_MODULE, "leds"); leds_class = class_create(THIS_MODULE, "leds");
if (IS_ERR(leds_class)) if (IS_ERR(leds_class))
return PTR_ERR(leds_class); return PTR_ERR(leds_class);
leds_class->suspend = led_suspend; leds_class->pm = &leds_class_dev_pm_ops;
leds_class->resume = led_resume;
leds_class->dev_attrs = led_class_attrs; leds_class->dev_attrs = led_class_attrs;
return 0; return 0;
} }
......
...@@ -204,7 +204,7 @@ static int pm860x_led_probe(struct platform_device *pdev) ...@@ -204,7 +204,7 @@ static int pm860x_led_probe(struct platform_device *pdev)
sprintf(data->name, "led1-blue"); sprintf(data->name, "led1-blue");
break; break;
} }
dev_set_drvdata(&pdev->dev, data); platform_set_drvdata(pdev, data);
data->chip = chip; data->chip = chip;
data->i2c = (chip->id == CHIP_PM8606) ? chip->client : chip->companion; data->i2c = (chip->id == CHIP_PM8606) ? chip->client : chip->companion;
data->port = pdev->id; data->port = pdev->id;
......
...@@ -129,7 +129,6 @@ static int pwmled_remove(struct platform_device *pdev) ...@@ -129,7 +129,6 @@ static int pwmled_remove(struct platform_device *pdev)
pwm_channel_free(&led->pwmc); pwm_channel_free(&led->pwmc);
} }
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pinctrl/consumer.h>
#include <linux/err.h> #include <linux/err.h>
struct gpio_led_data { struct gpio_led_data {
...@@ -236,13 +235,8 @@ static int gpio_led_probe(struct platform_device *pdev) ...@@ -236,13 +235,8 @@ static int gpio_led_probe(struct platform_device *pdev)
{ {
struct gpio_led_platform_data *pdata = pdev->dev.platform_data; struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
struct gpio_leds_priv *priv; struct gpio_leds_priv *priv;
struct pinctrl *pinctrl;
int i, ret = 0; int i, ret = 0;
pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
if (IS_ERR(pinctrl))
dev_warn(&pdev->dev,
"pins are not configured from the driver\n");
if (pdata && pdata->num_leds) { if (pdata && pdata->num_leds) {
priv = devm_kzalloc(&pdev->dev, priv = devm_kzalloc(&pdev->dev,
...@@ -282,8 +276,6 @@ static int gpio_led_remove(struct platform_device *pdev) ...@@ -282,8 +276,6 @@ static int gpio_led_remove(struct platform_device *pdev)
for (i = 0; i < priv->num_leds; i++) for (i = 0; i < priv->num_leds; i++)
delete_gpio_led(&priv->leds[i]); delete_gpio_led(&priv->leds[i]);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/platform_data/leds-lp55xx.h> #include <linux/platform_data/leds-lp55xx.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of.h>
#include "leds-lp55xx-common.h" #include "leds-lp55xx-common.h"
...@@ -416,12 +417,20 @@ static int lp5521_probe(struct i2c_client *client, ...@@ -416,12 +417,20 @@ static int lp5521_probe(struct i2c_client *client,
int ret; int ret;
struct lp55xx_chip *chip; struct lp55xx_chip *chip;
struct lp55xx_led *led; struct lp55xx_led *led;
struct lp55xx_platform_data *pdata = client->dev.platform_data; struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node;
if (!pdata) { if (!client->dev.platform_data) {
if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0)
return ret;
} else {
dev_err(&client->dev, "no platform data\n"); dev_err(&client->dev, "no platform data\n");
return -EINVAL; return -EINVAL;
} }
}
pdata = client->dev.platform_data;
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)
...@@ -485,9 +494,18 @@ static const struct i2c_device_id lp5521_id[] = { ...@@ -485,9 +494,18 @@ static const struct i2c_device_id lp5521_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, lp5521_id); MODULE_DEVICE_TABLE(i2c, lp5521_id);
#ifdef CONFIG_OF
static const struct of_device_id of_lp5521_leds_match[] = {
{ .compatible = "national,lp5521", },
{},
};
MODULE_DEVICE_TABLE(of, of_lp5521_leds_match);
#endif
static struct i2c_driver lp5521_driver = { static struct i2c_driver lp5521_driver = {
.driver = { .driver = {
.name = "lp5521", .name = "lp5521",
.of_match_table = of_match_ptr(of_lp5521_leds_match),
}, },
.probe = lp5521_probe, .probe = lp5521_probe,
.remove = lp5521_remove, .remove = lp5521_remove,
......
...@@ -429,12 +429,20 @@ static int lp5523_probe(struct i2c_client *client, ...@@ -429,12 +429,20 @@ static int lp5523_probe(struct i2c_client *client,
int ret; int ret;
struct lp55xx_chip *chip; struct lp55xx_chip *chip;
struct lp55xx_led *led; struct lp55xx_led *led;
struct lp55xx_platform_data *pdata = client->dev.platform_data; struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node;
if (!pdata) { if (!client->dev.platform_data) {
if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0)
return ret;
} else {
dev_err(&client->dev, "no platform data\n"); dev_err(&client->dev, "no platform data\n");
return -EINVAL; return -EINVAL;
} }
}
pdata = client->dev.platform_data;
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)
...@@ -500,9 +508,19 @@ static const struct i2c_device_id lp5523_id[] = { ...@@ -500,9 +508,19 @@ static const struct i2c_device_id lp5523_id[] = {
MODULE_DEVICE_TABLE(i2c, lp5523_id); MODULE_DEVICE_TABLE(i2c, lp5523_id);
#ifdef CONFIG_OF
static const struct of_device_id of_lp5523_leds_match[] = {
{ .compatible = "national,lp5523", },
{},
};
MODULE_DEVICE_TABLE(of, of_lp5523_leds_match);
#endif
static struct i2c_driver lp5523_driver = { static struct i2c_driver lp5523_driver = {
.driver = { .driver = {
.name = "lp5523x", .name = "lp5523x",
.of_match_table = of_match_ptr(of_lp5523_leds_match),
}, },
.probe = lp5523_probe, .probe = lp5523_probe,
.remove = lp5523_remove, .remove = lp5523_remove,
......
...@@ -515,12 +515,20 @@ static int lp5562_probe(struct i2c_client *client, ...@@ -515,12 +515,20 @@ static int lp5562_probe(struct i2c_client *client,
int ret; int ret;
struct lp55xx_chip *chip; struct lp55xx_chip *chip;
struct lp55xx_led *led; struct lp55xx_led *led;
struct lp55xx_platform_data *pdata = client->dev.platform_data; struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node;
if (!pdata) { if (!client->dev.platform_data) {
if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0)
return ret;
} else {
dev_err(&client->dev, "no platform data\n"); dev_err(&client->dev, "no platform data\n");
return -EINVAL; return -EINVAL;
} }
}
pdata = client->dev.platform_data;
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)
...@@ -583,9 +591,19 @@ static const struct i2c_device_id lp5562_id[] = { ...@@ -583,9 +591,19 @@ static const struct i2c_device_id lp5562_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, lp5562_id); MODULE_DEVICE_TABLE(i2c, lp5562_id);
#ifdef CONFIG_OF
static const struct of_device_id of_lp5562_leds_match[] = {
{ .compatible = "ti,lp5562", },
{},
};
MODULE_DEVICE_TABLE(of, of_lp5562_leds_match);
#endif
static struct i2c_driver lp5562_driver = { static struct i2c_driver lp5562_driver = {
.driver = { .driver = {
.name = "lp5562", .name = "lp5562",
.of_match_table = of_match_ptr(of_lp5562_leds_match),
}, },
.probe = lp5562_probe, .probe = lp5562_probe,
.remove = lp5562_remove, .remove = lp5562_remove,
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/leds-lp55xx.h> #include <linux/platform_data/leds-lp55xx.h>
#include <linux/slab.h>
#include "leds-lp55xx-common.h" #include "leds-lp55xx-common.h"
...@@ -554,6 +555,50 @@ void lp55xx_unregister_sysfs(struct lp55xx_chip *chip) ...@@ -554,6 +555,50 @@ void lp55xx_unregister_sysfs(struct lp55xx_chip *chip)
} }
EXPORT_SYMBOL_GPL(lp55xx_unregister_sysfs); EXPORT_SYMBOL_GPL(lp55xx_unregister_sysfs);
int lp55xx_of_populate_pdata(struct device *dev, struct device_node *np)
{
struct device_node *child;
struct lp55xx_platform_data *pdata;
struct lp55xx_led_config *cfg;
int num_channels;
int i = 0;
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata)
return -ENOMEM;
num_channels = of_get_child_count(np);
if (num_channels == 0) {
dev_err(dev, "no LED channels\n");
return -EINVAL;
}
cfg = devm_kzalloc(dev, sizeof(*cfg) * num_channels, GFP_KERNEL);
if (!cfg)
return -ENOMEM;
pdata->led_config = &cfg[0];
pdata->num_channels = num_channels;
for_each_child_of_node(np, child) {
cfg[i].chan_nr = i;
of_property_read_string(child, "chan-name", &cfg[i].name);
of_property_read_u8(child, "led-cur", &cfg[i].led_current);
of_property_read_u8(child, "max-cur", &cfg[i].max_current);
i++;
}
of_property_read_string(np, "label", &pdata->label);
of_property_read_u8(np, "clock-mode", &pdata->clock_mode);
dev->platform_data = pdata;
return 0;
}
EXPORT_SYMBOL_GPL(lp55xx_of_populate_pdata);
MODULE_AUTHOR("Milo Kim <milo.kim@ti.com>"); MODULE_AUTHOR("Milo Kim <milo.kim@ti.com>");
MODULE_DESCRIPTION("LP55xx Common Driver"); MODULE_DESCRIPTION("LP55xx Common Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -135,4 +135,8 @@ extern void lp55xx_unregister_leds(struct lp55xx_led *led, ...@@ -135,4 +135,8 @@ extern void lp55xx_unregister_leds(struct lp55xx_led *led,
extern int lp55xx_register_sysfs(struct lp55xx_chip *chip); extern int lp55xx_register_sysfs(struct lp55xx_chip *chip);
extern void lp55xx_unregister_sysfs(struct lp55xx_chip *chip); extern void lp55xx_unregister_sysfs(struct lp55xx_chip *chip);
/* common device tree population function */
extern int lp55xx_of_populate_pdata(struct device *dev,
struct device_node *np);
#endif /* _LEDS_LP55XX_COMMON_H */ #endif /* _LEDS_LP55XX_COMMON_H */
This diff is collapsed.
...@@ -374,8 +374,6 @@ static int ns2_led_remove(struct platform_device *pdev) ...@@ -374,8 +374,6 @@ static int ns2_led_remove(struct platform_device *pdev)
for (i = 0; i < priv->num_leds; i++) for (i = 0; i < priv->num_leds; i++)
delete_ns2_led(&priv->leds_data[i]); delete_ns2_led(&priv->leds_data[i]);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
...@@ -63,7 +63,7 @@ static DEFINE_SPINLOCK(r_tpu_lock); ...@@ -63,7 +63,7 @@ static DEFINE_SPINLOCK(r_tpu_lock);
#define TGRC 8 /* Timer general register C (+0x20) */ #define TGRC 8 /* Timer general register C (+0x20) */
#define TGRD 9 /* Timer general register D (+0x24) */ #define TGRD 9 /* Timer general register D (+0x24) */
static inline unsigned short r_tpu_read(struct r_tpu_priv *p, int reg_nr) static inline u16 r_tpu_read(struct r_tpu_priv *p, int reg_nr)
{ {
struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data; struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data;
void __iomem *base = p->mapbase; void __iomem *base = p->mapbase;
...@@ -75,8 +75,7 @@ static inline unsigned short r_tpu_read(struct r_tpu_priv *p, int reg_nr) ...@@ -75,8 +75,7 @@ static inline unsigned short r_tpu_read(struct r_tpu_priv *p, int reg_nr)
return ioread16(base + offs); return ioread16(base + offs);
} }
static inline void r_tpu_write(struct r_tpu_priv *p, int reg_nr, static inline void r_tpu_write(struct r_tpu_priv *p, int reg_nr, u16 value)
unsigned short value)
{ {
struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data; struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data;
void __iomem *base = p->mapbase; void __iomem *base = p->mapbase;
...@@ -93,7 +92,8 @@ static inline void r_tpu_write(struct r_tpu_priv *p, int reg_nr, ...@@ -93,7 +92,8 @@ static inline void r_tpu_write(struct r_tpu_priv *p, int reg_nr,
static void r_tpu_start_stop_ch(struct r_tpu_priv *p, int start) static void r_tpu_start_stop_ch(struct r_tpu_priv *p, int start)
{ {
struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data; struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data;
unsigned long flags, value; unsigned long flags;
u16 value;
/* start stop register shared by multiple timer channels */ /* start stop register shared by multiple timer channels */
spin_lock_irqsave(&r_tpu_lock, flags); spin_lock_irqsave(&r_tpu_lock, flags);
......
...@@ -159,14 +159,14 @@ static int sunfire_led_generic_probe(struct platform_device *pdev, ...@@ -159,14 +159,14 @@ static int sunfire_led_generic_probe(struct platform_device *pdev,
} }
} }
dev_set_drvdata(&pdev->dev, p); platform_set_drvdata(pdev, p);
return 0; return 0;
} }
static int sunfire_led_generic_remove(struct platform_device *pdev) static int sunfire_led_generic_remove(struct platform_device *pdev)
{ {
struct sunfire_drvdata *p = dev_get_drvdata(&pdev->dev); struct sunfire_drvdata *p = platform_get_drvdata(pdev);
int i; int i;
for (i = 0; i < NUM_LEDS_PER_BOARD; i++) for (i = 0; i < NUM_LEDS_PER_BOARD; i++)
......
...@@ -241,7 +241,7 @@ static int wm831x_status_probe(struct platform_device *pdev) ...@@ -241,7 +241,7 @@ static int wm831x_status_probe(struct platform_device *pdev)
GFP_KERNEL); GFP_KERNEL);
if (!drvdata) if (!drvdata)
return -ENOMEM; return -ENOMEM;
dev_set_drvdata(&pdev->dev, drvdata); platform_set_drvdata(pdev, drvdata);
drvdata->wm831x = wm831x; drvdata->wm831x = wm831x;
drvdata->reg = res->start; drvdata->reg = res->start;
......
...@@ -78,20 +78,30 @@ struct mc13xxx_regulator_platform_data { ...@@ -78,20 +78,30 @@ struct mc13xxx_regulator_platform_data {
struct mc13xxx_regulator_init_data *regulators; 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 { 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
#define MC13783_LED_MAX MC13783_LED_B3
int id; int id;
const char *name; const char *name;
const char *default_trigger; const char *default_trigger;
...@@ -100,46 +110,36 @@ struct mc13xxx_led_platform_data { ...@@ -100,46 +110,36 @@ struct mc13xxx_led_platform_data {
char max_current; char max_current;
}; };
#define MAX_LED_CONTROL_REGS 6
struct mc13xxx_leds_platform_data { struct mc13xxx_leds_platform_data {
int num_leds;
struct mc13xxx_led_platform_data *led; struct mc13xxx_led_platform_data *led;
int num_leds;
#define MC13783_LED_TRIODE_MD (1 << 0) /* LED Control 0 */
#define MC13783_LED_TRIODE_AD (1 << 1) #define MC13783_LED_C0_ENABLE (1 << 0)
#define MC13783_LED_TRIODE_KP (1 << 2) #define MC13783_LED_C0_TRIODE_MD (1 << 7)
#define MC13783_LED_BOOST_EN (1 << 3) #define MC13783_LED_C0_TRIODE_AD (1 << 8)
#define MC13783_LED_TC1HALF (1 << 4) #define MC13783_LED_C0_TRIODE_KP (1 << 9)
#define MC13783_LED_SLEWLIMTC (1 << 5) #define MC13783_LED_C0_BOOST (1 << 10)
#define MC13783_LED_SLEWLIMBL (1 << 6) #define MC13783_LED_C0_ABMODE(x) (((x) & 0x7) << 11)
#define MC13783_LED_TRIODE_TC1 (1 << 7) #define MC13783_LED_C0_ABREF(x) (((x) & 0x3) << 14)
#define MC13783_LED_TRIODE_TC2 (1 << 8) /* LED Control 1 */
#define MC13783_LED_TRIODE_TC3 (1 << 9) #define MC13783_LED_C1_TC1HALF (1 << 18)
int flags; #define MC13783_LED_C1_SLEWLIM (1 << 23)
/* LED Control 2 */
#define MC13783_LED_AB_DISABLED 0 #define MC13783_LED_C2_PERIOD(x) (((x) & 0x3) << 21)
#define MC13783_LED_AB_MD1 1 #define MC13783_LED_C2_SLEWLIM (1 << 23)
#define MC13783_LED_AB_MD12 2 /* LED Control 3 */
#define MC13783_LED_AB_MD123 3 #define MC13783_LED_C3_PERIOD(x) (((x) & 0x3) << 21)
#define MC13783_LED_AB_MD1234 4 #define MC13783_LED_C3_TRIODE_TC1 (1 << 23)
#define MC13783_LED_AB_MD1234_AD1 5 /* LED Control 4 */
#define MC13783_LED_AB_MD1234_AD12 6 #define MC13783_LED_C4_PERIOD(x) (((x) & 0x3) << 21)
#define MC13783_LED_AB_MD1_AD 7 #define MC13783_LED_C4_TRIODE_TC2 (1 << 23)
char abmode; /* LED Control 5 */
#define MC13783_LED_C5_PERIOD(x) (((x) & 0x3) << 21)
#define MC13783_LED_ABREF_200MV 0 #define MC13783_LED_C5_TRIODE_TC3 (1 << 23)
#define MC13783_LED_ABREF_400MV 1 u32 led_control[MAX_LED_CONTROL_REGS];
#define MC13783_LED_ABREF_600MV 2
#define MC13783_LED_ABREF_800MV 3
char abref;
#define MC13783_LED_PERIOD_10MS 0
#define MC13783_LED_PERIOD_100MS 1
#define MC13783_LED_PERIOD_500MS 2
#define MC13783_LED_PERIOD_2S 3
char bl_period;
char tc1_period;
char tc2_period;
char tc3_period;
}; };
struct mc13xxx_buttons_platform_data { struct mc13xxx_buttons_platform_data {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment