From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752932AbcKIKoE (ORCPT ); Wed, 9 Nov 2016 05:44:04 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:42217 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751934AbcKIKoB (ORCPT ); Wed, 9 Nov 2016 05:44:01 -0500 X-AuditID: cbfee61b-f796f6d000004092-36-5822fdef16a5 From: Jacek Anaszewski To: linux-leds@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jacek Anaszewski , Pavel Machek , Hans de Goede Subject: [PATCH v2] leds: ledtrig-heartbeat: Make top brightness adjustable Date: Wed, 09 Nov 2016 11:43:46 +0100 Message-id: <1478688226-4158-1-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKLMWRmVeSWpSXmKPExsVy+t9jQd33f5UiDNbO4bd4c3w6k0Xv1eeM Fpd3zWGz2PpmHaPF3VNH2RxYPd7vu8rm0bdlFaPHitXf2T0+b5ILYIlys8lITUxJLVJIzUvO T8nMS7dVCg1x07VQUshLzE21VYrQ9Q0JUlIoS8wpBfKMDNCAg3OAe7CSvl2CW8arz2uYCp6J VRz8+JmpgbFHuIuRk0NCwERizcvvjBC2mMSFe+vZuhi5OIQEZjFK/Dy5nR3C+ckoce/TDRaQ KjYBQ4mfL14zdTFycIgIyEnsPFMJUsMsMJFR4vzRZWwgNcIC3hL7tq4Hs1kEVCWuLH8LVs8r 4C7x+rMJxDI5iZPHJrNOYORewMiwilEitSC5oDgpPdcoL7Vcrzgxt7g0L10vOT93EyM4CJ9J 72A8vMv9EKMAB6MSD2/GQ8UIIdbEsuLK3EOMEhzMSiK8fX+UIoR4UxIrq1KL8uOLSnNSiw8x mgLtn8gsJZqcD4yQvJJ4QxNzE3NjAwtzS0sTIyVx3sbZz8KFBNITS1KzU1MLUotg+pg4OKUa GO0Tqj5pPhKzc/jMsJtz5pMIid1lNwUOzGC8X1/dfupGcMvlnScKl+ot037OarsppG5/nZaA Zf2eD76vQjo2uNX6pdYtXnf0/0JNzfurF3pNf5HVd7ep8QrPcSmpw7NYPgfrSpg2nz93OpdP Uy+xgrWbQ/TDFuX6HTPEfn2s065Jf7x8T5dohhJLcUaioRZzUXEiAMuEzlJYAgAA X-MTR: 20000000000000000@CPGS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org LED class heartbeat trigger allowed only for blinking with max_brightness value. This patch adds more flexibility by exploiting part of LED core software blink infrastructure. Signed-off-by: Jacek Anaszewski Cc: Pavel Machek Cc: Hans de Goede --- Changes since v1: - after introduction of work_flags and new_blink_brightness properties this patch needs to be updated drivers/leds/trigger/ledtrig-heartbeat.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c index c9f3862..e6f2f8b 100644 --- a/drivers/leds/trigger/ledtrig-heartbeat.c +++ b/drivers/leds/trigger/ledtrig-heartbeat.c @@ -43,6 +43,9 @@ static void led_heartbeat_function(unsigned long data) return; } + if (test_and_clear_bit(LED_BLINK_BRIGHTNESS_CHANGE, &led_cdev->work_flags)) + led_cdev->blink_brightness = led_cdev->new_blink_brightness; + /* acts like an actual heart beat -- ie thump-thump-pause... */ switch (heartbeat_data->phase) { case 0: @@ -59,26 +62,26 @@ static void led_heartbeat_function(unsigned long data) delay = msecs_to_jiffies(70); heartbeat_data->phase++; if (!heartbeat_data->invert) - brightness = led_cdev->max_brightness; + brightness = led_cdev->blink_brightness; break; case 1: delay = heartbeat_data->period / 4 - msecs_to_jiffies(70); heartbeat_data->phase++; if (heartbeat_data->invert) - brightness = led_cdev->max_brightness; + brightness = led_cdev->blink_brightness; break; case 2: delay = msecs_to_jiffies(70); heartbeat_data->phase++; if (!heartbeat_data->invert) - brightness = led_cdev->max_brightness; + brightness = led_cdev->blink_brightness; break; default: delay = heartbeat_data->period - heartbeat_data->period / 4 - msecs_to_jiffies(70); heartbeat_data->phase = 0; if (heartbeat_data->invert) - brightness = led_cdev->max_brightness; + brightness = led_cdev->blink_brightness; break; } @@ -133,7 +136,10 @@ static void heartbeat_trig_activate(struct led_classdev *led_cdev) setup_timer(&heartbeat_data->timer, led_heartbeat_function, (unsigned long) led_cdev); heartbeat_data->phase = 0; + if (!led_cdev->blink_brightness) + led_cdev->blink_brightness = led_cdev->max_brightness; led_heartbeat_function(heartbeat_data->timer.data); + set_bit(LED_BLINK_SW, &led_cdev->work_flags); led_cdev->activated = true; } @@ -145,6 +151,7 @@ static void heartbeat_trig_deactivate(struct led_classdev *led_cdev) del_timer_sync(&heartbeat_data->timer); device_remove_file(led_cdev->dev, &dev_attr_invert); kfree(heartbeat_data); + clear_bit(LED_BLINK_SW, &led_cdev->work_flags); led_cdev->activated = false; } } -- 1.9.1