Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 647CDC433F5 for ; Sun, 3 Apr 2022 23:23:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3A12083C09; Mon, 4 Apr 2022 01:23:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649028223; bh=RYx8IyYBiGP14GFK0D2lJc8bXdXA2NHA3TYQ5yVgomw=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=Z6zBg+98LVUCj+LrmjxguPiOXqYCcVf81d3q7gdxGAxPaJ8t4upLiwuwlvqGUtgY4 LcHMpcCGoASWJWxVY6eNLXWF7pYKx7s0slsYRFZEk1j2RkMp+JrrCKytRob8RAYm3A AbLOIj1mtX0mXZrCDYvN++QVoJGwJoevYF8XoH/bPAtvExv7U/6JQ8Wo0Y0cCBwN3z X0VULebQ33u3Mx7hfpzYDnyAREykC37ktxzt/ielH65o1MTEUURSPxQkjg97+9ONM5 WpzUtL0SpGELTKMn4xC2girDxXX5w5l8cGS3VR04bq/dBs5mFh8VQq19tGqRmGXTIv SJFlBjFFAy6QA== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id DFB4883BE4; Mon, 4 Apr 2022 01:23:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649028218; bh=RYx8IyYBiGP14GFK0D2lJc8bXdXA2NHA3TYQ5yVgomw=; h=From:To:Cc:Subject:Date:From; b=n20olGCFSBELMpwR3CxdMbJkUkMfXrKZyJLpOMHV03b+v86kleVPb7JEpjPvG+PhN KEGtZ1Pv64+sB0t6SOFSZ8ndSQa2w2wAiwxAWlmz7dh1VBR7FoMrKweXLeSMrwfKo/ 0jwXG2WNdncvQ2ywxzdZitj9TnMONfnImWmq0VUQfocODAvMWkAAqj7Gh7BEGVeKc7 QeHJRTQ/5iXZCUJFIRqGA0+sw74Ej5Tei2wzLhDbRUgA/SOCU2jcK54lkZooX+u6Tn c14g5OUb6+lih1J5EOsr1oBoMVcqCSCx749WlMO31JXYFsvlAZ0ebZ1d0kvDSMDLni TF54u47wR/bhw== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Alex Nemirovsky , Patrick Delaunay , Philippe Reynes , Sean Anderson , Simon Glass , Steven Lawrance Subject: [PATCH] led: Configure LED default-state on boot Date: Mon, 4 Apr 2022 01:23:27 +0200 Message-Id: <20220403232327.720900-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean In case the DT LED subnode contains "default-state" property set to either "on" or "off", probe the LED driver and configure the LED state automatically. Signed-off-by: Marek Vasut Cc: Alex Nemirovsky Cc: Patrick Delaunay Cc: Philippe Reynes Cc: Sean Anderson Cc: Simon Glass Cc: Steven Lawrance --- drivers/led/led-uclass.c | 57 ++++++++++++++++++++++------------------ include/led.h | 24 +++++++++-------- 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 2f4aa18fb10..5d7bf40896b 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -66,43 +66,49 @@ int led_set_period(struct udevice *dev, int period_ms) } #endif +/* This is superseded by led_post_bind()/led_post_probe() below. */ int led_default_state(void) { - struct udevice *dev; - struct uclass *uc; - const char *default_state; - int ret; - - ret = uclass_get(UCLASS_LED, &uc); - if (ret) - return ret; - for (uclass_find_first_device(UCLASS_LED, &dev); - dev; - uclass_find_next_device(&dev)) { - default_state = dev_read_string(dev, "default-state"); - if (!default_state) - continue; - ret = device_probe(dev); - if (ret) - return ret; - if (!strncmp(default_state, "on", 2)) - led_set_state(dev, LEDST_ON); - else if (!strncmp(default_state, "off", 3)) - led_set_state(dev, LEDST_OFF); - /* default-state = "keep" : device is only probed */ - } - - return ret; + return 0; } static int led_post_bind(struct udevice *dev) { struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); + const char *default_state; uc_plat->label = dev_read_string(dev, "label"); if (!uc_plat->label) uc_plat->label = ofnode_get_name(dev_ofnode(dev)); + uc_plat->default_state = LEDST_COUNT; + + default_state = dev_read_string(dev, "default-state"); + if (!default_state) + return 0; + + if (!strncmp(default_state, "on", 2)) + uc_plat->default_state = LEDST_ON; + else if (!strncmp(default_state, "off", 3)) + uc_plat->default_state = LEDST_OFF; + else + return 0; + + /* + * In case the LED has default-state DT property, trigger + * probe() to configure its default state during startup. + */ + return device_probe(dev); +} + +static int led_post_probe(struct udevice *dev) +{ + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); + + if (uc_plat->default_state == LEDST_ON || + uc_plat->default_state == LEDST_OFF) + led_set_state(dev, uc_plat->default_state); + return 0; } @@ -111,4 +117,5 @@ UCLASS_DRIVER(led) = { .name = "led", .per_device_plat_auto = sizeof(struct led_uc_plat), .post_bind = led_post_bind, + .post_probe = led_post_probe, }; diff --git a/include/led.h b/include/led.h index 8eeb5a7c6d3..43acca85719 100644 --- a/include/led.h +++ b/include/led.h @@ -9,13 +9,26 @@ struct udevice; +enum led_state_t { + LEDST_OFF = 0, + LEDST_ON = 1, + LEDST_TOGGLE, +#ifdef CONFIG_LED_BLINK + LEDST_BLINK, +#endif + + LEDST_COUNT, +}; + /** * struct led_uc_plat - Platform data the uclass stores about each device * * @label: LED label + * @default_state: LED default state */ struct led_uc_plat { const char *label; + enum led_state_t default_state; }; /** @@ -27,17 +40,6 @@ struct led_uc_priv { int period_ms; }; -enum led_state_t { - LEDST_OFF = 0, - LEDST_ON = 1, - LEDST_TOGGLE, -#ifdef CONFIG_LED_BLINK - LEDST_BLINK, -#endif - - LEDST_COUNT, -}; - struct led_ops { /** * set_state() - set the state of an LED -- 2.35.1