From: Jacek Anaszewski <j.anaszewski@samsung.com>
To: linux-leds@vger.kernel.org, linux-media@vger.kernel.org
Cc: devicetree@vger.kernel.org, kyungmin.park@samsung.com,
pavel@ucw.cz, cooloney@gmail.com, rpurdie@rpsys.net,
sakari.ailus@iki.fi, s.nawrocki@samsung.com,
Jacek Anaszewski <j.anaszewski@samsung.com>
Subject: [PATCH v2 11/11] leds: aat1290: add support for V4L2 Flash sub-device
Date: Fri, 27 Mar 2015 14:49:45 +0100 [thread overview]
Message-ID: <1427464185-27950-12-git-send-email-j.anaszewski@samsung.com> (raw)
In-Reply-To: <1427464185-27950-1-git-send-email-j.anaszewski@samsung.com>
Add support for V4L2 Flash sub-device to the aat1290 LED Flash class
driver. The support allows for V4L2 Flash sub-device to take the control
of the LED Flash class device.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Sakari Ailus <sakari.ailus@iki.fi>
---
drivers/leds/Kconfig | 1 +
drivers/leds/leds-aat1290.c | 150 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 149 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index c3b5b027..d73f43f 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -47,6 +47,7 @@ config LEDS_AAT1290
depends on LEDS_CLASS_FLASH
depends on GPIOLIB
depends on OF
+ depends on PINCTRL
help
This option enables support for the LEDs on the AAT1290.
diff --git a/drivers/leds/leds-aat1290.c b/drivers/leds/leds-aat1290.c
index acfae35..34fd5c4 100644
--- a/drivers/leds/leds-aat1290.c
+++ b/drivers/leds/leds-aat1290.c
@@ -17,9 +17,11 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of.h>
+#include <linux/pinctrl/consumer.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
+#include <media/v4l2-flash.h>
#define AAT1290_MOVIE_MODE_CURRENT_ADDR 17
#define AAT1290_MAX_MM_CURR_PERCENT_0 16
@@ -53,11 +55,17 @@ struct aat1290_led {
/* corresponding LED Flash class device */
struct led_classdev_flash fled_cdev;
+ /* V4L2 Flash device */
+ struct v4l2_flash *v4l2_flash;
/* FLEN pin */
struct gpio_desc *gpio_fl_en;
/* EN|SET pin */
struct gpio_desc *gpio_en_set;
+#if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS)
+ /* movie mode current scale */
+ int *mm_current_scale;
+#endif
/* maximum flash timeout */
u32 max_flash_tm;
@@ -224,11 +232,16 @@ static int aat1290_led_flash_timeout_set(struct led_classdev_flash *fled_cdev,
return 0;
}
-static int aat1290_led_parse_dt(struct aat1290_led *led)
+static int aat1290_led_parse_dt(struct aat1290_led *led,
+ struct device_node **sub_node,
+ struct v4l2_flash_config *v4l2_sd_cfg)
{
struct led_classdev *led_cdev = &led->fled_cdev.led_cdev;
struct device *dev = &led->pdev->dev;
struct device_node *child_node;
+#if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS)
+ struct pinctrl *pinctrl;
+#endif
int ret = 0;
led->gpio_fl_en = devm_gpiod_get(dev, "flen");
@@ -245,6 +258,17 @@ static int aat1290_led_parse_dt(struct aat1290_led *led)
return ret;
}
+#if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS)
+ pinctrl = devm_pinctrl_get_select_default(&led->pdev->dev);
+ if (IS_ERR(pinctrl)) {
+ v4l2_sd_cfg->has_external_strobe = false;
+ dev_info(dev,
+ "No support for external strobe detected.\n");
+ } else {
+ v4l2_sd_cfg->has_external_strobe = true;
+ }
+#endif
+
child_node = of_get_next_available_child(dev->of_node, NULL);
if (!child_node) {
dev_err(dev, "No DT child node found for connected LED.\n");
@@ -270,6 +294,8 @@ static int aat1290_led_parse_dt(struct aat1290_led *led)
return ret;
}
+ *sub_node = child_node;
+
return ret;
}
@@ -286,6 +312,100 @@ static void aat1290_init_flash_timeout(struct aat1290_led *led)
setting->val = setting->max;
}
+#if IS_ENABLED(CONFIG_V4L2_FLASH_LED_CLASS)
+enum led_brightness aat1290_intensity_to_brightness(
+ struct v4l2_flash *v4l2_flash,
+ s32 intensity)
+{
+ struct led_classdev_flash *fled_cdev = v4l2_flash->fled_cdev;
+ struct aat1290_led *led = fled_cdev_to_led(fled_cdev);
+ int i;
+
+ for (i = AAT1290_MM_CURRENT_SCALE_SIZE - 1; i >= 0; --i)
+ if (intensity >= led->mm_current_scale[i])
+ return i + 1;
+
+ return 1;
+}
+
+s32 aat1290_brightness_to_intensity(struct v4l2_flash *v4l2_flash,
+ enum led_brightness brightness)
+{
+ struct led_classdev_flash *fled_cdev = v4l2_flash->fled_cdev;
+ struct aat1290_led *led = fled_cdev_to_led(fled_cdev);
+
+ return led->mm_current_scale[brightness - 1];
+}
+
+static int aat1290_led_external_strobe_set(struct v4l2_flash *v4l2_flash,
+ bool enable)
+{
+ struct aat1290_led *led = fled_cdev_to_led(v4l2_flash->fled_cdev);
+ struct led_classdev_flash *fled_cdev = v4l2_flash->fled_cdev;
+ struct led_classdev *led_cdev = &fled_cdev->led_cdev;
+ struct pinctrl *pinctrl;
+
+ gpiod_direction_output(led->gpio_fl_en, 0);
+ gpiod_direction_output(led->gpio_en_set, 0);
+
+ led->movie_mode = false;
+ led_cdev->brightness = 0;
+
+ pinctrl = devm_pinctrl_get_select(&led->pdev->dev,
+ enable ? "isp" : "host");
+ if (IS_ERR(pinctrl)) {
+ dev_warn(&led->pdev->dev, "Unable to switch strobe source.\n");
+ return PTR_ERR(pinctrl);
+ }
+
+ return 0;
+}
+
+int init_mm_current_scale(struct aat1290_led *led)
+{
+ int max_mm_current_percent[] = { 20, 22, 25, 28, 32, 36, 40, 45, 50, 56,
+ 63, 71, 79, 89, 100 };
+ int i, max_mm_current = AAT1290_MAX_MM_CURRENT(led->max_flash_current);
+
+ led->mm_current_scale = devm_kzalloc(&led->pdev->dev,
+ sizeof(max_mm_current_percent),
+ GFP_KERNEL);
+ if (!led->mm_current_scale)
+ return -ENOMEM;
+
+ for (i = 0; i < AAT1290_MM_CURRENT_SCALE_SIZE; ++i)
+ led->mm_current_scale[i] = max_mm_current *
+ max_mm_current_percent[i] / 100;
+
+ return 0;
+}
+
+static void aat1290_init_v4l2_flash_config(struct aat1290_led *led,
+ struct v4l2_flash_config *v4l2_sd_cfg)
+{
+ struct led_classdev *led_cdev = &led->fled_cdev.led_cdev;
+ struct led_flash_setting *s;
+
+ strlcpy(v4l2_sd_cfg->dev_name, led_cdev->name,
+ sizeof(v4l2_sd_cfg->dev_name));
+
+ s = &v4l2_sd_cfg->intensity;
+ s->min = led->mm_current_scale[0];
+ s->max = led->mm_current_scale[AAT1290_MM_CURRENT_SCALE_SIZE - 1];
+ s->step = 1;
+ s->val = s->max;
+}
+
+static const struct v4l2_flash_ops v4l2_flash_ops = {
+ .external_strobe_set = aat1290_led_external_strobe_set,
+ .intensity_to_led_brightness = aat1290_intensity_to_brightness,
+ .led_brightness_to_intensity = aat1290_brightness_to_intensity,
+};
+#else
+#define aat1290_init_v4l2_flash_config(led, v4l2_sd_cfg)
+#define init_mm_current_scale(led) (0)
+#endif
+
static const struct led_flash_ops flash_ops = {
.strobe_set = aat1290_led_flash_strobe_set,
.timeout_set = aat1290_led_flash_timeout_set,
@@ -294,9 +414,11 @@ static const struct led_flash_ops flash_ops = {
static int aat1290_led_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
+ struct device_node *sub_node = NULL;
struct aat1290_led *led;
struct led_classdev *led_cdev;
struct led_classdev_flash *fled_cdev;
+ struct v4l2_flash_config v4l2_sd_cfg = {};
int ret;
led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
@@ -310,7 +432,15 @@ static int aat1290_led_probe(struct platform_device *pdev)
fled_cdev->ops = &flash_ops;
led_cdev = &fled_cdev->led_cdev;
- ret = aat1290_led_parse_dt(led);
+ ret = aat1290_led_parse_dt(led, &sub_node, &v4l2_sd_cfg);
+ if (ret < 0)
+ return ret;
+
+ /*
+ * Init non-linear movie mode current scale basing
+ * on the max flash current from Device Tree binding.
+ */
+ ret = init_mm_current_scale(led);
if (ret < 0)
return ret;
@@ -330,8 +460,23 @@ static int aat1290_led_probe(struct platform_device *pdev)
if (ret < 0)
goto err_flash_register;
+ aat1290_init_v4l2_flash_config(led, &v4l2_sd_cfg);
+
+ led_cdev->dev->of_node = sub_node;
+
+ /* Create V4L2 Flash subdev. */
+ led->v4l2_flash = v4l2_flash_init(fled_cdev,
+ &v4l2_flash_ops,
+ &v4l2_sd_cfg);
+ if (IS_ERR(led->v4l2_flash)) {
+ ret = PTR_ERR(led->v4l2_flash);
+ goto error_v4l2_flash_init;
+ }
+
return 0;
+error_v4l2_flash_init:
+ led_classdev_flash_unregister(fled_cdev);
err_flash_register:
mutex_destroy(&led->lock);
@@ -342,6 +487,7 @@ static int aat1290_led_remove(struct platform_device *pdev)
{
struct aat1290_led *led = platform_get_drvdata(pdev);
+ v4l2_flash_release(led->v4l2_flash);
led_classdev_flash_unregister(&led->fled_cdev);
cancel_work_sync(&led->work_brightness_set);
--
1.7.9.5
prev parent reply other threads:[~2015-03-27 13:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 13:49 [PATCH v2 00/11] LED / flash API integration Jacek Anaszewski
2015-03-27 13:49 ` [PATCH v2 01/11] leds: unify the location of led-trigger API Jacek Anaszewski
2015-03-28 22:33 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 02/11] leds: add uapi header file Jacek Anaszewski
[not found] ` <1427464185-27950-3-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-03-28 22:35 ` Sakari Ailus
2015-03-30 7:22 ` Jacek Anaszewski
2015-03-27 13:49 ` [PATCH v2 03/11] leds: Add support for max77693 mfd flash cell Jacek Anaszewski
2015-03-28 22:45 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 04/11] DT: Add documentation for the mfd Maxim max77693 Jacek Anaszewski
2015-03-27 14:06 ` Jacek Anaszewski
2015-03-28 22:55 ` Sakari Ailus
2015-03-30 7:36 ` Jacek Anaszewski
[not found] ` <5518FD05.5060800-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-03-30 9:35 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 05/11] leds: Add driver for AAT1290 flash LED controller Jacek Anaszewski
2015-03-28 22:57 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 06/11] of: Add Skyworks Solutions, Inc. vendor prefix Jacek Anaszewski
[not found] ` <1427464185-27950-1-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-03-27 13:49 ` [PATCH v2 07/11] DT: Add documentation for the Skyworks AAT1290 Jacek Anaszewski
2015-03-27 13:49 ` [PATCH v2 08/11] media: Add registration helpers for V4L2 flash sub-devices Jacek Anaszewski
2015-03-27 13:49 ` [PATCH v2 09/11] Documentation: leds: Add description of v4l2-flash sub-device Jacek Anaszewski
2015-03-28 23:35 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 10/11] leds: max77693: add support for V4L2 Flash sub-device Jacek Anaszewski
2015-03-27 13:49 ` Jacek Anaszewski [this message]
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=1427464185-27950-12-git-send-email-j.anaszewski@samsung.com \
--to=j.anaszewski@samsung.com \
--cc=cooloney@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-leds@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rpurdie@rpsys.net \
--cc=s.nawrocki@samsung.com \
--cc=sakari.ailus@iki.fi \
/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