Skip to content

Commit

Permalink
leds-lp55xx: provide common LED current setting
Browse files Browse the repository at this point in the history 
 LED current is configurable via the sysfs.
 Max current is a read-only attribute.
 These attributes code can be shared in lp55xx common driver.

 Device attributes: 'led_current' and 'max_current'
 move to lp55xx common driver

 Replaced functions:
 show_max_current()  => lp55xx_show_max_current()
 show_current()      => lp55xx_show_current()
 store_current()     => lp55xx_store_current()

 LED setting function: set_led_current()
 Current registers are device specific, so configurable function is added
 in each driver.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
  • Loading branch information
Milo(Woogyom) Kim authored and Bryan Wu committed Feb 6, 2013
1 parent a6e4679 commit a96bfa1
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 127 deletions.
74 changes: 8 additions & 66 deletions drivers/leds/leds-lp5521.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@ static inline void lp5521_wait_enable_done(void)
usleep_range(500, 600);
}

static void lp5521_set_led_current(struct lp55xx_led *led, u8 led_current)
{
led->led_current = led_current;
lp55xx_write(led->chip, LP5521_REG_LED_CURRENT_BASE + led->chan_nr,
led_current);
}

static inline struct lp5521_led *cdev_to_led(struct led_classdev *cdev)
{
return container_of(cdev, struct lp5521_led, cdev);
Expand Down Expand Up @@ -229,13 +236,6 @@ static int lp5521_load_program(struct lp5521_engine *eng, const u8 *pattern)
return lp5521_write(client, LP5521_REG_OP_MODE, mode);
}

static int lp5521_set_led_current(struct lp5521_chip *chip, int led, u8 curr)
{
return lp5521_write(chip->client,
LP5521_REG_LED_CURRENT_BASE + chip->leds[led].chan_nr,
curr);
}

static int lp5521_post_init_device(struct lp55xx_chip *chip)
{
int ret;
Expand Down Expand Up @@ -462,54 +462,6 @@ store_mode(1)
store_mode(2)
store_mode(3)

static ssize_t show_max_current(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct lp5521_led *led = cdev_to_led(led_cdev);

return sprintf(buf, "%d\n", led->max_current);
}

static ssize_t show_current(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct lp5521_led *led = cdev_to_led(led_cdev);

return sprintf(buf, "%d\n", led->led_current);
}

static ssize_t store_current(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct lp5521_led *led = cdev_to_led(led_cdev);
struct lp5521_chip *chip = led_to_lp5521(led);
ssize_t ret;
unsigned long curr;

if (kstrtoul(buf, 0, &curr))
return -EINVAL;

if (curr > led->max_current)
return -EINVAL;

mutex_lock(&chip->lock);
ret = lp5521_set_led_current(chip, led->id, curr);
mutex_unlock(&chip->lock);

if (ret < 0)
return ret;

led->led_current = (u8)curr;

return len;
}

static ssize_t lp5521_selftest(struct device *dev,
struct device_attribute *attr,
char *buf)
Expand Down Expand Up @@ -615,18 +567,7 @@ static ssize_t store_led_pattern(struct device *dev,
return len;
}

/* led class device attributes */
static DEVICE_ATTR(led_current, S_IRUGO | S_IWUSR, show_current, store_current);
static DEVICE_ATTR(max_current, S_IRUGO , show_max_current, NULL);

static struct attribute *lp5521_led_attributes[] = {
&dev_attr_led_current.attr,
&dev_attr_max_current.attr,
NULL,
};

static struct attribute_group lp5521_led_attribute_group = {
.attrs = lp5521_led_attributes
};

/* device attributes */
Expand Down Expand Up @@ -700,6 +641,7 @@ static struct lp55xx_device_config lp5521_cfg = {
.max_channel = LP5521_MAX_LEDS,
.post_init_device = lp5521_post_init_device,
.brightness_work_fn = lp5521_led_brightness_work,
.set_led_current = lp5521_set_led_current,
};

static int lp5521_probe(struct i2c_client *client,
Expand Down
69 changes: 8 additions & 61 deletions drivers/leds/leds-lp5523.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,13 @@ struct lp5523_chip {
u8 num_leds;
};

static void lp5523_set_led_current(struct lp55xx_led *led, u8 led_current)
{
led->led_current = led_current;
lp55xx_write(led->chip, LP5523_REG_LED_CURRENT_BASE + led->chan_nr,
led_current);
}

static inline struct lp5523_led *cdev_to_led(struct led_classdev *cdev)
{
return container_of(cdev, struct lp5523_led, cdev);
Expand Down Expand Up @@ -602,68 +609,7 @@ store_mode(1)
store_mode(2)
store_mode(3)

static ssize_t show_max_current(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct lp5523_led *led = cdev_to_led(led_cdev);

return sprintf(buf, "%d\n", led->max_current);
}

static ssize_t show_current(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct lp5523_led *led = cdev_to_led(led_cdev);

return sprintf(buf, "%d\n", led->led_current);
}

static ssize_t store_current(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
struct led_classdev *led_cdev = dev_get_drvdata(dev);
struct lp5523_led *led = cdev_to_led(led_cdev);
struct lp5523_chip *chip = led_to_lp5523(led);
ssize_t ret;
unsigned long curr;

if (kstrtoul(buf, 0, &curr))
return -EINVAL;

if (curr > led->max_current)
return -EINVAL;

mutex_lock(&chip->lock);
ret = lp5523_write(chip->client,
LP5523_REG_LED_CURRENT_BASE + led->chan_nr,
(u8)curr);
mutex_unlock(&chip->lock);

if (ret < 0)
return ret;

led->led_current = (u8)curr;

return len;
}

/* led class device attributes */
static DEVICE_ATTR(led_current, S_IRUGO | S_IWUSR, show_current, store_current);
static DEVICE_ATTR(max_current, S_IRUGO , show_max_current, NULL);

static struct attribute *lp5523_led_attributes[] = {
&dev_attr_led_current.attr,
&dev_attr_max_current.attr,
NULL,
};

static struct attribute_group lp5523_led_attribute_group = {
.attrs = lp5523_led_attributes
};

/* device attributes */
Expand Down Expand Up @@ -780,6 +726,7 @@ static struct lp55xx_device_config lp5523_cfg = {
.max_channel = LP5523_MAX_LEDS,
.post_init_device = lp5523_post_init_device,
.brightness_work_fn = lp5523_led_brightness_work,
.set_led_current = lp5523_set_led_current,
};

static int lp5523_probe(struct i2c_client *client,
Expand Down
53 changes: 53 additions & 0 deletions drivers/leds/leds-lp55xx-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ static struct lp55xx_led *cdev_to_lp55xx_led(struct led_classdev *cdev)
return container_of(cdev, struct lp55xx_led, cdev);
}

static struct lp55xx_led *dev_to_lp55xx_led(struct device *dev)
{
return cdev_to_lp55xx_led(dev_get_drvdata(dev));
}

static void lp55xx_reset_device(struct lp55xx_chip *chip)
{
struct lp55xx_device_config *cfg = chip->cfg;
Expand Down Expand Up @@ -68,7 +73,55 @@ static int lp55xx_post_init_device(struct lp55xx_chip *chip)
return cfg->post_init_device(chip);
}

static ssize_t lp55xx_show_current(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct lp55xx_led *led = dev_to_lp55xx_led(dev);

return sprintf(buf, "%d\n", led->led_current);
}

static ssize_t lp55xx_store_current(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
struct lp55xx_led *led = dev_to_lp55xx_led(dev);
struct lp55xx_chip *chip = led->chip;
unsigned long curr;

if (kstrtoul(buf, 0, &curr))
return -EINVAL;

if (curr > led->max_current)
return -EINVAL;

if (!chip->cfg->set_led_current)
return len;

mutex_lock(&chip->lock);
chip->cfg->set_led_current(led, (u8)curr);
mutex_unlock(&chip->lock);

return len;
}

static ssize_t lp55xx_show_max_current(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct lp55xx_led *led = dev_to_lp55xx_led(dev);

return sprintf(buf, "%d\n", led->max_current);
}

static DEVICE_ATTR(led_current, S_IRUGO | S_IWUSR, lp55xx_show_current,
lp55xx_store_current);
static DEVICE_ATTR(max_current, S_IRUGO , lp55xx_show_max_current, NULL);

static struct attribute *lp55xx_led_attributes[] = {
&dev_attr_led_current.attr,
&dev_attr_max_current.attr,
NULL,
};

Expand Down

0 comments on commit a96bfa1

Please sign in to comment.