LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Olliver Schinagl <oliver+list@schinagl.nl>
To: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Bryan Wu <cooloney@gmail.com>, Richard Purdie <rpurdie@rpsys.net>
Cc: Olliver Schinagl <oliver@schinagl.nl>,
Robin Gong <b38343@freescale.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Aaron Lu <aaron.lu@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Grant Likely <grant.likely@linaro.org>,
Wolfram Sang <wsa@the-dreams.de>,
Alexander Shiyan <shc_work@mail.ru>,
Jingoo Han <jg1.han@samsung.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-gpio@vger.kernel.org, linux-input@vger.kernel.org,
linux-leds@vger.kernel.org
Subject: [PATCH v1 4/4] leds: no longer use unnamed gpios
Date: Wed, 7 Jan 2015 10:08:42 +0100 [thread overview]
Message-ID: <1420621722-7428-5-git-send-email-oliver+list@schinagl.nl> (raw)
In-Reply-To: <1420621722-7428-1-git-send-email-oliver+list@schinagl.nl>
From: Olliver Schinagl <oliver@schinagl.nl>
The gpio document says we should not use unnamed bindings for gpios.
This patch uses the 'led-' prefix to the gpios and updates code and
documents. Because the devm_get_gpiod_from_child() falls back to using
old-style unnamed gpios, we can update the code first, and update
dts files as time allows.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
---
Documentation/devicetree/bindings/leds/leds-gpio.txt | 12 ++++++------
drivers/leds/leds-gpio.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/leds/leds-gpio.txt b/Documentation/devicetree/bindings/leds/leds-gpio.txt
index d544cf1..2c138cc 100644
--- a/Documentation/devicetree/bindings/leds/leds-gpio.txt
+++ b/Documentation/devicetree/bindings/leds/leds-gpio.txt
@@ -7,7 +7,7 @@ Each LED is represented as a sub-node of the gpio-leds device. Each
node's name represents the name of the corresponding LED.
LED sub-node properties:
-- gpios : Should specify the LED's GPIO, see "gpios property" in
+- led-gpios : Should specify the LED's GPIO, see "gpios property" in
Documentation/devicetree/bindings/gpio/gpio.txt. Active low LEDs should be
indicated using flags in the GPIO specifier.
- label : (optional)
@@ -32,12 +32,12 @@ leds {
compatible = "gpio-leds";
hdd {
label = "IDE Activity";
- gpios = <&mcu_pio 0 GPIO_ACTIVE_LOW>;
+ led-gpios = <&mcu_pio 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "ide-disk";
};
fault {
- gpios = <&mcu_pio 1 GPIO_ACTIVE_HIGH>;
+ led-gpios = <&mcu_pio 1 GPIO_ACTIVE_HIGH>;
/* Keep LED on if BIOS detected hardware fault */
default-state = "keep";
};
@@ -46,11 +46,11 @@ leds {
run-control {
compatible = "gpio-leds";
red {
- gpios = <&mpc8572 6 GPIO_ACTIVE_HIHG>;
+ led-gpios = <&mpc8572 6 GPIO_ACTIVE_HIHG>;
default-state = "off";
};
green {
- gpios = <&mpc8572 7 GPIO_ACTIVE_HIGH>;
+ led-gpios = <&mpc8572 7 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
};
@@ -59,7 +59,7 @@ leds {
compatible = "gpio-leds";
charger-led {
- gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+ led-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "max8903-charger-charging";
retain-state-suspended;
};
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 8e5af69..5b7bc84 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -184,7 +184,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
struct gpio_led led = {};
const char *state = NULL;
- led.gpiod = devm_get_gpiod_from_child(dev, NULL, child);
+ led.gpiod = devm_get_gpiod_from_child(dev, "led", child);
if (IS_ERR(led.gpiod)) {
fwnode_handle_put(child);
goto err;
--
2.1.4
next prev parent reply other threads:[~2015-01-07 9:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-07 9:08 [PATCH v1 0/4] Let leds use named gpios Olliver Schinagl
2015-01-07 9:08 ` [PATCH v1 1/4] gpio:gpiolib: use static const char const * for a suffixes array Olliver Schinagl
2015-01-14 12:35 ` Linus Walleij
2015-01-07 9:08 ` [PATCH v1 2/4] gpio: add parameter to allow the use named gpios Olliver Schinagl
2015-01-08 0:15 ` Dmitry Torokhov
2015-01-14 12:36 ` Linus Walleij
2015-01-19 4:04 ` Alexandre Courbot
2015-01-21 21:44 ` Olliver Schinagl
2015-01-23 9:16 ` Alexandre Courbot
2015-01-07 9:08 ` [PATCH v1 3/4] leds: Let the binding document example for leds-gpio follow the gpio bindings Olliver Schinagl
2015-01-07 23:56 ` Dmitry Torokhov
2015-01-08 1:45 ` Rob Herring
2015-01-14 12:38 ` Linus Walleij
2015-01-07 9:08 ` Olliver Schinagl [this message]
2015-01-07 23:55 ` [PATCH v1 4/4] leds: no longer use unnamed gpios Dmitry Torokhov
2015-01-08 8:45 ` Olliver Schinagl
2015-01-08 14:40 ` Rob Herring
2015-01-08 22:12 ` Dmitry Torokhov
2015-01-14 12:45 ` Linus Walleij
2015-01-14 13:20 ` Olliver Schinagl
2015-01-19 3:43 ` Alexandre Courbot
2015-01-19 4:09 ` Alexandre Courbot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1420621722-7428-5-git-send-email-oliver+list@schinagl.nl \
--to=oliver+list@schinagl.nl \
--cc=aaron.lu@intel.com \
--cc=b38343@freescale.com \
--cc=cooloney@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=galak@codeaurora.org \
--cc=gnurou@gmail.com \
--cc=grant.likely@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jg1.han@samsung.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mika.westerberg@linux.intel.com \
--cc=oliver@schinagl.nl \
--cc=pawel.moll@arm.com \
--cc=rafael.j.wysocki@intel.com \
--cc=robh+dt@kernel.org \
--cc=rpurdie@rpsys.net \
--cc=shc_work@mail.ru \
--cc=wsa@the-dreams.de \
--subject='Re: [PATCH v1 4/4] leds: no longer use unnamed gpios' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).