diff mbox

[U-Boot,v2,6/9] dm: led: Support toggling LEDs

Message ID 20170410173459.30461-7-sjg@chromium.org
State Accepted
Commit 9413ad4f0def2e06a5042106a6e1650a1aa03a5a
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass April 10, 2017, 5:34 p.m. UTC 
Add support for toggling an LED into the uclass interface. This can be
efficiently implemented by the driver.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Drop the explicit assignment to LEDST_TOGGLE

 drivers/led/led_gpio.c |  7 +++++++
 include/led.h          |  1 +
 test/dm/led.c          | 25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+)

Comments

techping.chan@gmail.com April 12, 2017, 8:52 a.m. UTC | #1 
2017-04-11 1:34 GMT+08:00 Simon Glass <sjg@chromium.org>:

> Add support for toggling an LED into the uclass interface. This can be
> efficiently implemented by the driver.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2:
> - Drop the explicit assignment to LEDST_TOGGLE
>
>  drivers/led/led_gpio.c |  7 +++++++
>  include/led.h          |  1 +
>  test/dm/led.c          | 25 +++++++++++++++++++++++++
>  3 files changed, 33 insertions(+)
>
> diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
> index 789d15600f..4106ecb679 100644
> --- a/drivers/led/led_gpio.c
> +++ b/drivers/led/led_gpio.c
> @@ -21,6 +21,7 @@ struct led_gpio_priv {
>  static int gpio_led_set_state(struct udevice *dev, enum led_state_t state)
>  {
>         struct led_gpio_priv *priv = dev_get_priv(dev);
> +       int ret;
>
>         if (!dm_gpio_is_valid(&priv->gpio))
>                 return -EREMOTEIO;
> @@ -28,6 +29,12 @@ static int gpio_led_set_state(struct udevice *dev, enum
> led_state_t state)
>         case LEDST_OFF:
>         case LEDST_ON:
>                 break;
> +       case LEDST_TOGGLE:
> +               ret = dm_gpio_get_value(&priv->gpio);
> +               if (ret < 0)
> +                       return ret;
> +               state = !ret;
> +               break;
>         default:
>                 return -ENOSYS;
>         }
> diff --git a/include/led.h b/include/led.h
> index bbab4d14c9..8c107e28e7 100644
> --- a/include/led.h
> +++ b/include/led.h
> @@ -20,6 +20,7 @@ struct led_uc_plat {
>  enum led_state_t {
>         LEDST_OFF = 0,
>         LEDST_ON = 1,
> +       LEDST_TOGGLE,
>
>         LEDST_COUNT,
>  };
> diff --git a/test/dm/led.c b/test/dm/led.c
> index 68aa39bd4d..2cc24127e2 100644
> --- a/test/dm/led.c
> +++ b/test/dm/led.c
> @@ -53,6 +53,31 @@ static int dm_test_led_gpio(struct unit_test_state *uts)
>  }
>  DM_TEST(dm_test_led_gpio, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
>
> +/* Test that we can toggle LEDs */
> +static int dm_test_led_toggle(struct unit_test_state *uts)
> +{
> +       const int offset = 1;
> +       struct udevice *dev, *gpio;
> +
> +       /*
> +        * Check that we can manipulate an LED. LED 1 is connected to GPIO
> +        * bank gpio_a, offset 1.
> +        */
> +       ut_assertok(uclass_get_device(UCLASS_LED, 1, &dev));
> +       ut_assertok(uclass_get_device(UCLASS_GPIO, 1, &gpio));
> +       ut_asserteq(0, sandbox_gpio_get_value(gpio, offset));
> +       ut_assertok(led_set_state(dev, LEDST_TOGGLE));
> +       ut_asserteq(1, sandbox_gpio_get_value(gpio, offset));
> +       ut_asserteq(LEDST_ON, led_get_state(dev));
> +
> +       ut_assertok(led_set_state(dev, LEDST_TOGGLE));
> +       ut_asserteq(0, sandbox_gpio_get_value(gpio, offset));
> +       ut_asserteq(LEDST_OFF, led_get_state(dev));
> +
> +       return 0;
> +}
> +DM_TEST(dm_test_led_toggle, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
> +
>  /* Test obtaining an LED by label */
>  static int dm_test_led_label(struct unit_test_state *uts)
>  {
> --
> 2.12.2.715.g7642488e1d-goog
>
>
Reviewed-by: Ziping Chen <techping.chan@gmail.com>
Simon Glass April 15, 2017, 4:08 p.m. UTC | #2 
On 12 April 2017 at 02:52, Ziping Chen <techping.chan@gmail.com> wrote:
>
>
> 2017-04-11 1:34 GMT+08:00 Simon Glass <sjg@chromium.org>:
>>
>> Add support for toggling an LED into the uclass interface. This can be
>> efficiently implemented by the driver.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> Changes in v2:
>> - Drop the explicit assignment to LEDST_TOGGLE
>>
>>  drivers/led/led_gpio.c |  7 +++++++
>>  include/led.h          |  1 +
>>  test/dm/led.c          | 25 +++++++++++++++++++++++++
>>  3 files changed, 33 insertions(+)
>>
>
> Reviewed-by: Ziping Chen <techping.chan@gmail.com>

Applied to u-boot-dm
diff mbox

Patch

diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index 789d15600f..4106ecb679 100644
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -21,6 +21,7 @@  struct led_gpio_priv {
 static int gpio_led_set_state(struct udevice *dev, enum led_state_t state)
 {
 	struct led_gpio_priv *priv = dev_get_priv(dev);
+	int ret;
 
 	if (!dm_gpio_is_valid(&priv->gpio))
 		return -EREMOTEIO;
@@ -28,6 +29,12 @@  static int gpio_led_set_state(struct udevice *dev, enum led_state_t state)
 	case LEDST_OFF:
 	case LEDST_ON:
 		break;
+	case LEDST_TOGGLE:
+		ret = dm_gpio_get_value(&priv->gpio);
+		if (ret < 0)
+			return ret;
+		state = !ret;
+		break;
 	default:
 		return -ENOSYS;
 	}
diff --git a/include/led.h b/include/led.h
index bbab4d14c9..8c107e28e7 100644
--- a/include/led.h
+++ b/include/led.h
@@ -20,6 +20,7 @@  struct led_uc_plat {
 enum led_state_t {
 	LEDST_OFF = 0,
 	LEDST_ON = 1,
+	LEDST_TOGGLE,
 
 	LEDST_COUNT,
 };
diff --git a/test/dm/led.c b/test/dm/led.c
index 68aa39bd4d..2cc24127e2 100644
--- a/test/dm/led.c
+++ b/test/dm/led.c
@@ -53,6 +53,31 @@  static int dm_test_led_gpio(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_led_gpio, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
 
+/* Test that we can toggle LEDs */
+static int dm_test_led_toggle(struct unit_test_state *uts)
+{
+	const int offset = 1;
+	struct udevice *dev, *gpio;
+
+	/*
+	 * Check that we can manipulate an LED. LED 1 is connected to GPIO
+	 * bank gpio_a, offset 1.
+	 */
+	ut_assertok(uclass_get_device(UCLASS_LED, 1, &dev));
+	ut_assertok(uclass_get_device(UCLASS_GPIO, 1, &gpio));
+	ut_asserteq(0, sandbox_gpio_get_value(gpio, offset));
+	ut_assertok(led_set_state(dev, LEDST_TOGGLE));
+	ut_asserteq(1, sandbox_gpio_get_value(gpio, offset));
+	ut_asserteq(LEDST_ON, led_get_state(dev));
+
+	ut_assertok(led_set_state(dev, LEDST_TOGGLE));
+	ut_asserteq(0, sandbox_gpio_get_value(gpio, offset));
+	ut_asserteq(LEDST_OFF, led_get_state(dev));
+
+	return 0;
+}
+DM_TEST(dm_test_led_toggle, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+
 /* Test obtaining an LED by label */
 static int dm_test_led_label(struct unit_test_state *uts)
 {