Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-04 02:32:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: led: Adjust the LED uclass

Browse source 
At present this is very simple, supporting only on and off. We want to
also support toggling and blinking. As a first step, change the name of
the main method and use an enum to indicate the state.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Ziping Chen <techping.chan@gmail.com>
This commit is contained in:
Simon Glass 2017-04-10 11:34:54 -06:00
parent 56e19871dc
commit ddae9fcddc
4 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/led/led-uclass.c
View file

@ -32,14 +32,14 @@ int led_get_by_label(const char *label, struct udevice **devp)
return -ENODEV; return -ENODEV;
} }
int led_set_on(struct udevice *dev, int on) int led_set_state(struct udevice *dev, enum led_state_t state)
{ {
struct led_ops *ops = led_get_ops(dev); struct led_ops *ops = led_get_ops(dev);
if (!ops->set_on) if (!ops->set_state)
return -ENOSYS; return -ENOSYS;
return ops->set_on(dev, on); return ops->set_state(dev, state);
} }
UCLASS_DRIVER(led) = { UCLASS_DRIVER(led) = {

6
drivers/led/led_gpio.c
View file

@ -18,14 +18,14 @@ struct led_gpio_priv {
struct gpio_desc gpio; struct gpio_desc gpio;
}; };
static int gpio_led_set_on(struct udevice *dev, int on) static int gpio_led_set_state(struct udevice *dev, enum led_state_t state)
{ {
struct led_gpio_priv *priv = dev_get_priv(dev); struct led_gpio_priv *priv = dev_get_priv(dev);
if (!dm_gpio_is_valid(&priv->gpio)) if (!dm_gpio_is_valid(&priv->gpio))
return -EREMOTEIO; return -EREMOTEIO;
return dm_gpio_set_value(&priv->gpio, on); return dm_gpio_set_value(&priv->gpio, state);
} }
static int led_gpio_probe(struct udevice *dev) static int led_gpio_probe(struct udevice *dev)
@ -87,7 +87,7 @@ static int led_gpio_bind(struct udevice *parent)
} }
static const struct led_ops gpio_led_ops = { static const struct led_ops gpio_led_ops = {
.set_on = gpio_led_set_on, .set_state = gpio_led_set_state,
}; };
static const struct udevice_id led_gpio_ids[] = { static const struct udevice_id led_gpio_ids[] = {

19
include/led.h
View file

@ -17,15 +17,22 @@ struct led_uc_plat {
const char *label; const char *label;
}; };
enum led_state_t {
LEDST_OFF = 0,
LEDST_ON = 1,
LEDST_COUNT,
};
struct led_ops { struct led_ops {
/** /**
* set_on() - set the state of an LED * set_state() - set the state of an LED
* *
* @dev: LED device to change * @dev: LED device to change
* @on: 1 to turn the LED on, 0 to turn it off * @state: LED state to set
* @return 0 if OK, -ve on error * @return 0 if OK, -ve on error
*/ */
int (*set_on)(struct udevice *dev, int on); int (*set_state)(struct udevice *dev, enum led_state_t state);
}; };
#define led_get_ops(dev) ((struct led_ops *)(dev)->driver->ops) #define led_get_ops(dev) ((struct led_ops *)(dev)->driver->ops)
@ -40,12 +47,12 @@ struct led_ops {
int led_get_by_label(const char *label, struct udevice **devp); int led_get_by_label(const char *label, struct udevice **devp);
/** /**
* led_set_on() - set the state of an LED * led_set_state() - set the state of an LED
* *
* @dev: LED device to change * @dev: LED device to change
* @on: 1 to turn the LED on, 0 to turn it off * @state: LED state to set
* @return 0 if OK, -ve on error * @return 0 if OK, -ve on error
*/ */
int led_set_on(struct udevice *dev, int on); int led_set_state(struct udevice *dev, enum led_state_t state);
#endif #endif

5
test/dm/led.c
View file

@ -41,9 +41,10 @@ static int dm_test_led_gpio(struct unit_test_state *uts)
ut_assertok(uclass_get_device(UCLASS_LED, 1, &dev)); ut_assertok(uclass_get_device(UCLASS_LED, 1, &dev));
ut_assertok(uclass_get_device(UCLASS_GPIO, 1, &gpio)); ut_assertok(uclass_get_device(UCLASS_GPIO, 1, &gpio));
ut_asserteq(0, sandbox_gpio_get_value(gpio, offset)); ut_asserteq(0, sandbox_gpio_get_value(gpio, offset));
led_set_on(dev, 1); ut_assertok(led_set_state(dev, LEDST_ON));
ut_asserteq(1, sandbox_gpio_get_value(gpio, offset)); ut_asserteq(1, sandbox_gpio_get_value(gpio, offset));
led_set_on(dev, 0);
ut_assertok(led_set_state(dev, LEDST_OFF));
ut_asserteq(0, sandbox_gpio_get_value(gpio, offset)); ut_asserteq(0, sandbox_gpio_get_value(gpio, offset));
return 0; return 0;