From patchwork Wed Apr 11 09:16:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: linux-kernel-dev X-Patchwork-Id: 897098 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=beckhoff.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40LdlJ1KSqz9s27 for ; Wed, 11 Apr 2018 19:19:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 297DEC21DB3; Wed, 11 Apr 2018 09:17:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2AA9AC21C51; Wed, 11 Apr 2018 09:17:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 19A02C21DD4; Wed, 11 Apr 2018 09:17:07 +0000 (UTC) Received: from Netsrv01.beckhoff.com (netsrv01.beckhoff.com [62.159.14.10]) by lists.denx.de (Postfix) with ESMTPS id 3DEB9C21D8E for ; Wed, 11 Apr 2018 09:17:04 +0000 (UTC) Received: from lbs1.beckhoff.com (172.17.66.92) by NT-Mail02.beckhoff.com (10.1.0.27) with Microsoft SMTP Server (TLS) id 14.3.301.0; Wed, 11 Apr 2018 11:16:53 +0200 From: To: Date: Wed, 11 Apr 2018 11:16:27 +0200 Message-ID: <20180411091629.3113-2-linux-kernel-dev@beckhoff.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180411091629.3113-1-linux-kernel-dev@beckhoff.com> References: <20180411091629.3113-1-linux-kernel-dev@beckhoff.com> MIME-Version: 1.0 X-Originating-IP: [172.17.66.92] X-OLX-Disclaimer: Done Cc: Tom Rini , Ziping Chen , Patrick Bruenn Subject: [U-Boot] [PATCH v4 1/3] dm: led: Support "default-state" property X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Patrick Bruenn Add support for the device tree property "default-state". This feature might be useful for LEDs indicating "power on" or similar states. Note: Even with this commit gpio-leds remain in reset state. That's because the led_gpio is not probed until DM_FLAG_ACTIVATED is set. Signed-off-by: Patrick Bruenn --- Changes in v4: - don't break 'make tests' - rebased on 2600df4f8ef12ece9cec13030005919e0ba2b0d5 (master 2018-04-09) Changes in v3: - use ofnode_read_bool() instead of ofnode_read_string() to determine if LED node has the default-state property Changes in v2: - rebase to v2018.05-rc1 - add dm_test_led_default_state() to tests/dm/led.c drivers/led/led_gpio.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c index 9976635887..e68d8d3864 100644 --- a/drivers/led/led_gpio.c +++ b/drivers/led/led_gpio.c @@ -60,11 +60,25 @@ static int led_gpio_probe(struct udevice *dev) { struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); struct led_gpio_priv *priv = dev_get_priv(dev); + const char *default_state; + int ret; /* Ignore the top-level LED node */ if (!uc_plat->label) return 0; - return gpio_request_by_name(dev, "gpios", 0, &priv->gpio, GPIOD_IS_OUT); + + ret = gpio_request_by_name(dev, "gpios", 0, &priv->gpio, GPIOD_IS_OUT); + if (ret) + return ret; + + default_state = dev_read_string(dev, "default-state"); + if (default_state) { + if (!strncmp(default_state, "on", 2)) + gpio_led_set_state(dev, LEDST_ON); + else if (!strncmp(default_state, "off", 3)) + gpio_led_set_state(dev, LEDST_OFF); + } + return 0; } static int led_gpio_remove(struct udevice *dev) From patchwork Wed Apr 11 09:16:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: linux-kernel-dev X-Patchwork-Id: 897097 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=beckhoff.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40LdkS1g2Rz9s27 for ; Wed, 11 Apr 2018 19:18:23 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 74C33C21C50; Wed, 11 Apr 2018 09:17:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 65983C21DDC; Wed, 11 Apr 2018 09:17:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D56F3C21C6A; Wed, 11 Apr 2018 09:17:08 +0000 (UTC) Received: from Internet2.beckhoff.com (internet2.beckhoff.com [194.25.186.210]) by lists.denx.de (Postfix) with ESMTPS id 1E6E6C21C50 for ; Wed, 11 Apr 2018 09:17:05 +0000 (UTC) Received: from lbs1.beckhoff.com (172.17.66.92) by NT-Mail02.beckhoff.com (10.1.0.27) with Microsoft SMTP Server (TLS) id 14.3.301.0; Wed, 11 Apr 2018 11:17:04 +0200 From: To: Date: Wed, 11 Apr 2018 11:16:28 +0200 Message-ID: <20180411091629.3113-3-linux-kernel-dev@beckhoff.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180411091629.3113-1-linux-kernel-dev@beckhoff.com> References: <20180411091629.3113-1-linux-kernel-dev@beckhoff.com> MIME-Version: 1.0 X-Originating-IP: [172.17.66.92] X-OLX-Disclaimer: Done Cc: Tom Rini , Ziping Chen , Patrick Bruenn Subject: [U-Boot] [PATCH v4 2/3] dm: led: auto probe() LEDs with "default-state" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Patrick Bruenn To avoid board specificy LED activation code, automatically activate gpio-leds with "default-state" property during bind(). Signed-off-by: Patrick Bruenn --- Changes in v4: None Changes in v3: None Changes in v2: None drivers/led/led_gpio.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c index e68d8d3864..f5b3b63493 100644 --- a/drivers/led/led_gpio.c +++ b/drivers/led/led_gpio.c @@ -11,6 +11,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -120,6 +121,14 @@ static int led_gpio_bind(struct udevice *parent) return ret; uc_plat = dev_get_uclass_platdata(dev); uc_plat->label = label; + + if (ofnode_read_bool(node, "default-state")) { + struct udevice *devp; + + ret = uclass_get_device_tail(dev, 0, &devp); + if (ret) + return ret; + } } return 0; From patchwork Wed Apr 11 09:16:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: linux-kernel-dev X-Patchwork-Id: 897099 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=beckhoff.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Ldls3xm1z9s27 for ; Wed, 11 Apr 2018 19:19:37 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4A526C21DD3; Wed, 11 Apr 2018 09:18:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 10C93C21DB5; Wed, 11 Apr 2018 09:18:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B5176C21DEC; Wed, 11 Apr 2018 09:17:09 +0000 (UTC) Received: from Netsrv01.beckhoff.com (netsrv01.beckhoff.com [62.159.14.10]) by lists.denx.de (Postfix) with ESMTPS id 06F16C21D9A for ; Wed, 11 Apr 2018 09:17:06 +0000 (UTC) Received: from lbs1.beckhoff.com (172.17.66.92) by NT-Mail02.beckhoff.com (10.1.0.27) with Microsoft SMTP Server (TLS) id 14.3.301.0; Wed, 11 Apr 2018 11:17:05 +0200 From: To: Date: Wed, 11 Apr 2018 11:16:29 +0200 Message-ID: <20180411091629.3113-4-linux-kernel-dev@beckhoff.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180411091629.3113-1-linux-kernel-dev@beckhoff.com> References: <20180411091629.3113-1-linux-kernel-dev@beckhoff.com> MIME-Version: 1.0 X-Originating-IP: [172.17.66.92] X-OLX-Disclaimer: Done Cc: Martin Fuzzey , Tom Rini , Patrick Bruenn Subject: [U-Boot] [PATCH v4 3/3] dm: led: add testcase for "default-state" property X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Patrick Bruenn Add two more gpio-leds to sandbox test device tree with default-state property set to "on"/"off". Add dm_test_led_default_state() to check that these new LED's are set to LEDST_ON and LEDST_OFF. dm: led: add testcase for "default-state" property Add two more gpio-leds to sandbox test device tree with default-state property set to "on"/"off". Add dm_test_led_default_state() to check that these new LED's are set to LEDST_ON and LEDST_OFF. Signed-off-by: Patrick Bruenn --- patman complains about: test/dm/led.c:45: check: Please use a blank line after function/struct/union/enum declarations. I compared with other DM_TEST() usage and decided to ignore this check. Should we fix the macro, patman or keep ignoring this? Changes in v4: - gpio_a pin 4 is already use by dm_test_gpio_phandles() -> we switch to use pin 5 and 6 - adjust dm_test_led_base() to the fact that we have two more LEDs, now Changes in v3: None Changes in v2: None arch/sandbox/dts/test.dts | 12 ++++++++++++ test/dm/led.c | 20 +++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 06d0e8ce85..2f104af960 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -254,6 +254,18 @@ gpios = <&gpio_a 2 0>; label = "sandbox:green"; }; + + default_on { + gpios = <&gpio_a 5 0>; + label = "sandbox:default_on"; + default-state = "on"; + }; + + default_off { + gpios = <&gpio_a 6 0>; + label = "sandbox:default_off"; + default-state = "off"; + }; }; mbox: mbox { diff --git a/test/dm/led.c b/test/dm/led.c index fde700be38..af05cd78b6 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -22,12 +22,30 @@ static int dm_test_led_base(struct unit_test_state *uts) ut_assertok(uclass_get_device(UCLASS_LED, 0, &dev)); ut_assertok(uclass_get_device(UCLASS_LED, 1, &dev)); ut_assertok(uclass_get_device(UCLASS_LED, 2, &dev)); - ut_asserteq(-ENODEV, uclass_get_device(UCLASS_LED, 3, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 3, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 4, &dev)); + ut_asserteq(-ENODEV, uclass_get_device(UCLASS_LED, 5, &dev)); return 0; } DM_TEST(dm_test_led_base, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +/* Test of the LED 'default-state' device tree property */ +static int dm_test_led_default_state(struct unit_test_state *uts) +{ + struct udevice *dev; + + /* Check that we handle the default-state property correctly. */ + ut_assertok(led_get_by_label("sandbox:default_on", &dev)); + ut_asserteq(LEDST_ON, led_get_state(dev)); + + ut_assertok(led_get_by_label("sandbox:default_off", &dev)); + ut_asserteq(LEDST_OFF, led_get_state(dev)); + + return 0; +} +DM_TEST(dm_test_led_default_state, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); + /* Test of the led uclass using the led_gpio driver */ static int dm_test_led_gpio(struct unit_test_state *uts) {