From: "Álvaro Fernández Rojas" <noltari@gmail.com>
To: linux-leds@vger.kernel.org, jacek.anaszewski@gmail.com,
jonas.gorski@gmail.com, rpurdie@rpsys.net, pavel@ucw.cz
Cc: "Álvaro Fernández Rojas" <noltari@gmail.com>
Subject: [PATCH] leds-bcm6328: support second hw blinking interval
Date: Fri, 24 Apr 2020 14:46:21 +0200 [thread overview]
Message-ID: <20200424124621.23005-1-noltari@gmail.com> (raw)
Add support for both configurable HW blinking intervals.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
drivers/leds/leds-bcm6328.c | 54 ++++++++++++++++++++++++++-----------
1 file changed, 38 insertions(+), 16 deletions(-)
diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c
index 42e1b7598c3a..beb1aaff68f6 100644
--- a/drivers/leds/leds-bcm6328.c
+++ b/drivers/leds/leds-bcm6328.c
@@ -24,12 +24,16 @@
#define BCM6328_LED_MAX_COUNT 24
#define BCM6328_LED_DEF_DELAY 500
+#define BCM6328_LED_INTERVAL_NUM 2
#define BCM6328_LED_INTERVAL_MS 20
#define BCM6328_LED_INTV_MASK 0x3f
-#define BCM6328_LED_FAST_INTV_SHIFT 6
-#define BCM6328_LED_FAST_INTV_MASK (BCM6328_LED_INTV_MASK << \
- BCM6328_LED_FAST_INTV_SHIFT)
+#define BCM6328_LED_INTV1_SHIFT 0
+#define BCM6328_LED_INTV1_MASK (BCM6328_LED_INTV_MASK << \
+ BCM6328_LED_INTV1_SHIFT)
+#define BCM6328_LED_INTV2_SHIFT 6
+#define BCM6328_LED_INTV2_MASK (BCM6328_LED_INTV_MASK << \
+ BCM6328_LED_INTV2_SHIFT)
#define BCM6328_SERIAL_LED_EN BIT(12)
#define BCM6328_SERIAL_LED_MUX BIT(13)
#define BCM6328_SERIAL_LED_CLK_NPOL BIT(14)
@@ -45,8 +49,8 @@
#define BCM6328_LED_MODE_MASK 3
#define BCM6328_LED_MODE_ON 0
-#define BCM6328_LED_MODE_FAST 1
-#define BCM6328_LED_MODE_BLINK 2
+#define BCM6328_LED_MODE_INTV1 1
+#define BCM6328_LED_MODE_INTV2 2
#define BCM6328_LED_MODE_OFF 3
#define BCM6328_LED_SHIFT(X) ((X) << 1)
@@ -127,7 +131,8 @@ static void bcm6328_led_set(struct led_classdev *led_cdev,
unsigned long flags;
spin_lock_irqsave(led->lock, flags);
- *(led->blink_leds) &= ~BIT(led->pin);
+ led->blink_leds[0] &= ~BIT(led->pin);
+ led->blink_leds[1] &= ~BIT(led->pin);
if ((led->active_low && value == LED_OFF) ||
(!led->active_low && value != LED_OFF))
bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
@@ -176,20 +181,35 @@ static int bcm6328_blink_set(struct led_classdev *led_cdev,
}
spin_lock_irqsave(led->lock, flags);
- if (*(led->blink_leds) == 0 ||
- *(led->blink_leds) == BIT(led->pin) ||
- *(led->blink_delay) == delay) {
+ if (led->blink_leds[0] == 0 ||
+ led->blink_leds[0] == BIT(led->pin) ||
+ led->blink_delay[0] == delay) {
unsigned long val;
- *(led->blink_leds) |= BIT(led->pin);
- *(led->blink_delay) = delay;
+ led->blink_leds[0] |= BIT(led->pin);
+ led->blink_delay[0] = delay;
val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
- val &= ~BCM6328_LED_FAST_INTV_MASK;
- val |= (delay << BCM6328_LED_FAST_INTV_SHIFT);
+ val &= ~BCM6328_LED_INTV1_MASK;
+ val |= (delay << BCM6328_LED_INTV1_SHIFT);
bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
- bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK);
+ bcm6328_led_mode(led, BCM6328_LED_MODE_INTV1);
+ rc = 0;
+ } else if (led->blink_leds[1] == 0 ||
+ led->blink_leds[1] == BIT(led->pin) ||
+ led->blink_delay[1] == delay) {
+ unsigned long val;
+
+ led->blink_leds[1] |= BIT(led->pin);
+ led->blink_delay[1] = delay;
+
+ val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
+ val &= ~BCM6328_LED_INTV2_MASK;
+ val |= (delay << BCM6328_LED_INTV2_SHIFT);
+ bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
+
+ bcm6328_led_mode(led, BCM6328_LED_MODE_INTV2);
rc = 0;
} else {
dev_dbg(led_cdev->dev,
@@ -358,11 +378,13 @@ static int bcm6328_leds_probe(struct platform_device *pdev)
if (!lock)
return -ENOMEM;
- blink_leds = devm_kzalloc(dev, sizeof(*blink_leds), GFP_KERNEL);
+ blink_leds = devm_kcalloc(dev, BCM6328_LED_INTERVAL_NUM,
+ sizeof(*blink_leds), GFP_KERNEL);
if (!blink_leds)
return -ENOMEM;
- blink_delay = devm_kzalloc(dev, sizeof(*blink_delay), GFP_KERNEL);
+ blink_delay = devm_kcalloc(dev, BCM6328_LED_INTERVAL_NUM,
+ sizeof(*blink_delay), GFP_KERNEL);
if (!blink_delay)
return -ENOMEM;
--
2.20.1
next reply other threads:[~2020-04-24 12:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 12:46 Álvaro Fernández Rojas [this message]
2020-04-24 13:32 ` [PATCH v2] leds-bcm6328: support second hw blinking interval Álvaro Fernández Rojas
2020-04-25 21:14 ` Pavel Machek
2020-04-26 8:39 ` Álvaro Fernández Rojas
2020-05-12 10:01 ` [PATCH v3] " Álvaro Fernández Rojas
2020-06-04 13:24 ` Pavel Machek
2020-06-04 13:35 ` Álvaro Fernández Rojas
2020-06-04 13:40 ` Pavel Machek
2020-06-04 13:43 ` Álvaro Fernández Rojas
2020-06-04 13:53 ` Pavel Machek
2020-06-04 14:00 ` Álvaro Fernández Rojas
2020-06-04 13:48 ` [PATCH v4] " Álvaro Fernández Rojas
2020-06-04 13:59 ` [PATCH v5] " Álvaro Fernández Rojas
2020-06-04 14:01 ` Pavel Machek
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=20200424124621.23005-1-noltari@gmail.com \
--to=noltari@gmail.com \
--cc=jacek.anaszewski@gmail.com \
--cc=jonas.gorski@gmail.com \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--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).