From: Olliver Schinagl <oliver@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>,
Richard Purdie <rpurdie@rpsys.net>,
Jacek Anaszewski <j.anaszewski@samsung.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-leds@vger.kernel.org, Olliver Schinagl <oliver@schinagl.nl>
Subject: [PATCH 5/6] leds: pca963x: Inform the output that it is inverted
Date: Tue, 19 Apr 2016 09:40:49 +0200 [thread overview]
Message-ID: <1461051650-18824-6-git-send-email-oliver@schinagl.nl> (raw)
In-Reply-To: <1461051650-18824-1-git-send-email-oliver@schinagl.nl>
When leds are connected in a totem-pole configuration, they can be
connected either in a active-high, or active-low manor. The driver
currently always assumes active-high. This patch adds the
'nxp,inverted-out' boolean property to tell the driver that the leds
are driven active-low, or rather, that the behavior is inverted to what
is normally expected.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
---
Documentation/devicetree/bindings/leds/pca963x.txt | 1 +
drivers/leds/leds-pca963x.c | 20 +++++++++++++-------
include/linux/platform_data/leds-pca963x.h | 1 +
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/leds/pca963x.txt b/Documentation/devicetree/bindings/leds/pca963x.txt
index dafbe99..7b23725 100644
--- a/Documentation/devicetree/bindings/leds/pca963x.txt
+++ b/Documentation/devicetree/bindings/leds/pca963x.txt
@@ -6,6 +6,7 @@ Required properties:
Optional properties:
- nxp,totem-pole : use totem pole (push-pull) instead of open-drain (pca9632 defaults
to open-drain, newer chips to totem pole)
+ nxp,inverted-out: the connected leds are active-low, default to active-high
- nxp,hw-blink : use hardware blinking instead of software blinking
Each led is represented as a sub-node of the nxp,pca963x device.
diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c
index 14690f2..85dd506 100644
--- a/drivers/leds/leds-pca963x.c
+++ b/drivers/leds/leds-pca963x.c
@@ -370,6 +370,9 @@ pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip)
else
pdata->outdrv = PCA963X_OPEN_DRAIN;
+ /* default to normal output unless inverted output is specified */
+ pdata->inverted_out = of_property_read_bool(np, "nxp,inverted-out");
+
/* default to software blinking unless hardware blinking is specified */
if (of_property_read_bool(np, "nxp,hw-blink"))
pdata->blink_type = PCA963X_HW_BLINK;
@@ -478,14 +481,17 @@ static int pca963x_probe(struct i2c_client *client,
i2c_smbus_write_byte_data(client, PCA963X_MODE1, 0x00);
if (pdata) {
+ /* Always enable LED output */
+ u8 mode2 = PCA963X_MODE2_OUTNE_OUTDRV;
+
/* Configure output: open-drain or totem pole (push-pull) */
- if (pdata->outdrv == PCA963X_OPEN_DRAIN)
- i2c_smbus_write_byte_data(client, PCA963X_MODE2,
- PCA963X_MODE2_OUTNE_OUTDRV);
- else
- i2c_smbus_write_byte_data(client, PCA963X_MODE2,
- PCA963X_MODE2_OUTNE_OUTDRV |
- PCA963X_MODE2_OUTDRV_TOTEM_POLE);
+ if (pdata->outdrv == PCA963X_TOTEM_POLE)
+ mode2 |= PCA963X_MODE2_OUTDRV_TOTEM_POLE;
+ /* Configure output: inverted output */
+ if (pdata->inverted_out)
+ mode2 |= PCA963X_MODE2_INVRT;
+
+ i2c_smbus_write_byte_data(client, PCA963X_MODE2, mode2);
}
return 0;
diff --git a/include/linux/platform_data/leds-pca963x.h b/include/linux/platform_data/leds-pca963x.h
index e731f00..6f784d4 100644
--- a/include/linux/platform_data/leds-pca963x.h
+++ b/include/linux/platform_data/leds-pca963x.h
@@ -36,6 +36,7 @@ enum pca963x_blink_type {
struct pca963x_platform_data {
struct led_platform_data leds;
enum pca963x_outdrv outdrv;
+ bool inverted_out;
enum pca963x_blink_type blink_type;
};
--
2.8.0.rc3
next prev parent reply other threads:[~2016-04-19 7:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-19 7:40 [PATCHv1 0/6] leds: pca9653x: support inverted outputs and cleanups Olliver Schinagl
2016-04-19 7:40 ` [PATCH 1/6] leds: pca963x: Alphabetize headers Olliver Schinagl
2016-04-19 7:40 ` [PATCH 2/6] leds: pca963x: Lock i2c r/w access Olliver Schinagl
2016-04-19 7:40 ` [PATCH 3/6] leds: pca963x: Add defines and remove some magic values Olliver Schinagl
2016-04-19 8:16 ` kbuild test robot
2016-04-19 7:40 ` [PATCH 4/6] leds: pca963x: Reduce " Olliver Schinagl
2016-04-19 7:40 ` Olliver Schinagl [this message]
2016-04-21 15:07 ` [PATCH 5/6] leds: pca963x: Inform the output that it is inverted Rob Herring
2016-04-22 12:38 ` Olliver Schinagl
2016-04-22 13:09 ` Rob Herring
2016-04-22 15:44 ` Olliver Schinagl
2016-04-19 7:40 ` [PATCH 6/6] leds: pca963x: Remove whitespace and checkpatch problems Olliver Schinagl
2016-04-19 9:23 ` [PATCHv1 0/6] leds: pca9653x: support inverted outputs and cleanups Jacek Anaszewski
2016-04-19 9:39 ` Olliver Schinagl
2016-04-19 11:18 ` Ricardo Ribalda Delgado
2016-04-19 13:27 ` Olliver Schinagl
2016-04-19 13:42 ` Ricardo Ribalda Delgado
2016-04-20 7:21 ` Olliver Schinagl
2016-04-20 8:01 ` Ricardo Ribalda Delgado
2016-04-20 8:51 ` Olliver Schinagl
2016-04-20 8:56 ` Ricardo Ribalda Delgado
2016-04-20 9:06 ` Olliver Schinagl
2016-04-20 9:17 ` Ricardo Ribalda Delgado
2016-04-20 10:12 ` Olliver Schinagl
2016-04-22 7:21 ` Olliver Schinagl
2016-05-12 9:04 ` Olliver Schinagl
2016-05-12 9:07 ` Olliver Schinagl
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=1461051650-18824-6-git-send-email-oliver@schinagl.nl \
--to=oliver@schinagl.nl \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=j.anaszewski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=rpurdie@rpsys.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).