From: Thierry Reding <thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org> To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>, Matthias Kaehlcke <matthias-RprLehDfhQ3k1uMJSBkQmQ@public.gmane.org>, Kurt Van Dijck <kurt.van.dijck-/BeEPy95v10@public.gmane.org>, Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>, Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>, Colin Cross <ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org>, Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>, Richard Purdie <rpurdie-Fm38FmjxZ/leoWH0uzbU5w@public.gmane.org>, Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>, Mitch Bradley <wmb-D5eQfiDGL7eakBO8gow8eQ@public.gmane.org>, Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>, Eric Miao <eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Subject: [PATCH v2 10/10] pwm-backlight: Add rudimentary device tree support Date: Mon, 6 Feb 2012 16:19:45 +0100 [thread overview] Message-ID: <1328541585-24642-11-git-send-email-thierry.reding@avionic-design.de> (raw) In-Reply-To: <1328541585-24642-1-git-send-email-thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org> This commit adds very basic support for device tree probing. Currently, only a PWM and maximum and default brightness values can be specified. Enabling or disabling backlight power via GPIOs is not yet supported. A pointer to the exit() callback is stored in the driver data to keep it around until the driver is unloaded. Signed-off-by: Thierry Reding <thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org> --- Changes in v2: - avoid oops by keeping a reference to the platform-specific exit() callback .../bindings/video/backlight/pwm-backlight | 16 ++++ drivers/video/backlight/Kconfig | 2 +- drivers/video/backlight/pwm_bl.c | 81 ++++++++++++++++++-- 3 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/backlight/pwm-backlight diff --git a/Documentation/devicetree/bindings/video/backlight/pwm-backlight b/Documentation/devicetree/bindings/video/backlight/pwm-backlight new file mode 100644 index 0000000..ce65280 --- /dev/null +++ b/Documentation/devicetree/bindings/video/backlight/pwm-backlight @@ -0,0 +1,16 @@ +pwm-backlight bindings + +Required properties: + - compatible: "pwm-backlight" + - default-brightness: the default brightness setting + - max-brightness: the maximum brightness setting + - pwm: OF device-tree PWM specification + +Example: + + backlight { + compatible = "pwm-backlight"; + default-brightness = <224>; + max-brightness = <255>; + pwm = <&pwm 0 5000000>; + }; diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig index 49e7d83..37982fa 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -233,7 +233,7 @@ config BACKLIGHT_CARILLO_RANCH config BACKLIGHT_PWM tristate "Generic PWM based Backlight Driver" - depends on HAVE_PWM + depends on HAVE_PWM || PWM help If you have a LCD backlight adjustable by PWM, say Y to enable this driver. diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 342b7d7..5c81397 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -17,6 +17,7 @@ #include <linux/fb.h> #include <linux/backlight.h> #include <linux/err.h> +#include <linux/of_pwm.h> #include <linux/pwm.h> #include <linux/pwm_backlight.h> #include <linux/slab.h> @@ -31,6 +32,7 @@ struct pwm_bl_data { void (*notify_after)(struct device *, int brightness); int (*check_fb)(struct device *, struct fb_info *); + void (*exit)(struct device *); }; static int pwm_backlight_update_status(struct backlight_device *bl) @@ -83,17 +85,79 @@ static const struct backlight_ops pwm_backlight_ops = { .check_fb = pwm_backlight_check_fb, }; +#ifdef CONFIG_OF +static int pwm_backlight_parse_dt(struct device *dev, + struct platform_pwm_backlight_data *data) +{ + struct device_node *node = dev->of_node; + struct pwm_spec spec; + u32 value; + int ret; + + if (!node) + return -ENODEV; + + memset(data, 0, sizeof(*data)); + + ret = of_get_named_pwm(node, "pwm", 0, &spec); + if (ret < 0) + return ret; + + data->pwm_period_ns = spec.period; + data->pwm_id = ret; + + ret = of_property_read_u32(node, "default-brightness", &value); + if (ret < 0) + return ret; + + data->dft_brightness = value; + + ret = of_property_read_u32(node, "max-brightness", &value); + if (ret < 0) + return ret; + + data->max_brightness = value; + + /* + * TODO: Most users of this driver use a number of GPIOs to control + * backlight power. Support for specifying these needs to be + * added. + */ + + return 0; +} + +static struct of_device_id pwm_backlight_of_match[] = { + { .compatible = "pwm-backlight" }, + { } +}; + +MODULE_DEVICE_TABLE(of, pwm_backlight_of_match); +#else +static int pwm_backlight_parse_dt(struct device *dev, + struct platform_pwm_backlight_data *data) +{ + return -ENODEV; +} +#endif + static int pwm_backlight_probe(struct platform_device *pdev) { struct backlight_properties props; struct platform_pwm_backlight_data *data = pdev->dev.platform_data; + struct platform_pwm_backlight_data defdata; struct backlight_device *bl; struct pwm_bl_data *pb; int ret; if (!data) { - dev_err(&pdev->dev, "failed to find platform data\n"); - return -EINVAL; + ret = pwm_backlight_parse_dt(&pdev->dev, &defdata); + if (ret < 0) { + dev_err(&pdev->dev, "failed to find platform data\n"); + return ret; + } + + data = &defdata; } if (data->init) { @@ -113,6 +177,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) pb->notify = data->notify; pb->notify_after = data->notify_after; pb->check_fb = data->check_fb; + pb->exit = data->exit; pb->lth_brightness = data->lth_brightness * (data->pwm_period_ns / data->max_brightness); pb->dev = &pdev->dev; @@ -152,7 +217,6 @@ err_alloc: static int pwm_backlight_remove(struct platform_device *pdev) { - struct platform_pwm_backlight_data *data = pdev->dev.platform_data; struct backlight_device *bl = platform_get_drvdata(pdev); struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev); @@ -160,8 +224,8 @@ static int pwm_backlight_remove(struct platform_device *pdev) pwm_config(pb->pwm, 0, pb->period); pwm_disable(pb->pwm); pwm_free(pb->pwm); - if (data->exit) - data->exit(&pdev->dev); + if (pb->exit) + pb->exit(&pdev->dev); return 0; } @@ -195,11 +259,12 @@ static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend, static struct platform_driver pwm_backlight_driver = { .driver = { - .name = "pwm-backlight", - .owner = THIS_MODULE, + .name = "pwm-backlight", + .owner = THIS_MODULE, #ifdef CONFIG_PM - .pm = &pwm_backlight_pm_ops, + .pm = &pwm_backlight_pm_ops, #endif + .of_match_table = of_match_ptr(pwm_backlight_of_match), }, .probe = pwm_backlight_probe, .remove = pwm_backlight_remove, -- 1.7.9
WARNING: multiple messages have this Message-ID (diff)
From: thierry.reding@avionic-design.de (Thierry Reding) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 10/10] pwm-backlight: Add rudimentary device tree support Date: Mon, 6 Feb 2012 16:19:45 +0100 [thread overview] Message-ID: <1328541585-24642-11-git-send-email-thierry.reding@avionic-design.de> (raw) In-Reply-To: <1328541585-24642-1-git-send-email-thierry.reding@avionic-design.de> This commit adds very basic support for device tree probing. Currently, only a PWM and maximum and default brightness values can be specified. Enabling or disabling backlight power via GPIOs is not yet supported. A pointer to the exit() callback is stored in the driver data to keep it around until the driver is unloaded. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> --- Changes in v2: - avoid oops by keeping a reference to the platform-specific exit() callback .../bindings/video/backlight/pwm-backlight | 16 ++++ drivers/video/backlight/Kconfig | 2 +- drivers/video/backlight/pwm_bl.c | 81 ++++++++++++++++++-- 3 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/backlight/pwm-backlight diff --git a/Documentation/devicetree/bindings/video/backlight/pwm-backlight b/Documentation/devicetree/bindings/video/backlight/pwm-backlight new file mode 100644 index 0000000..ce65280 --- /dev/null +++ b/Documentation/devicetree/bindings/video/backlight/pwm-backlight @@ -0,0 +1,16 @@ +pwm-backlight bindings + +Required properties: + - compatible: "pwm-backlight" + - default-brightness: the default brightness setting + - max-brightness: the maximum brightness setting + - pwm: OF device-tree PWM specification + +Example: + + backlight { + compatible = "pwm-backlight"; + default-brightness = <224>; + max-brightness = <255>; + pwm = <&pwm 0 5000000>; + }; diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig index 49e7d83..37982fa 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -233,7 +233,7 @@ config BACKLIGHT_CARILLO_RANCH config BACKLIGHT_PWM tristate "Generic PWM based Backlight Driver" - depends on HAVE_PWM + depends on HAVE_PWM || PWM help If you have a LCD backlight adjustable by PWM, say Y to enable this driver. diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 342b7d7..5c81397 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -17,6 +17,7 @@ #include <linux/fb.h> #include <linux/backlight.h> #include <linux/err.h> +#include <linux/of_pwm.h> #include <linux/pwm.h> #include <linux/pwm_backlight.h> #include <linux/slab.h> @@ -31,6 +32,7 @@ struct pwm_bl_data { void (*notify_after)(struct device *, int brightness); int (*check_fb)(struct device *, struct fb_info *); + void (*exit)(struct device *); }; static int pwm_backlight_update_status(struct backlight_device *bl) @@ -83,17 +85,79 @@ static const struct backlight_ops pwm_backlight_ops = { .check_fb = pwm_backlight_check_fb, }; +#ifdef CONFIG_OF +static int pwm_backlight_parse_dt(struct device *dev, + struct platform_pwm_backlight_data *data) +{ + struct device_node *node = dev->of_node; + struct pwm_spec spec; + u32 value; + int ret; + + if (!node) + return -ENODEV; + + memset(data, 0, sizeof(*data)); + + ret = of_get_named_pwm(node, "pwm", 0, &spec); + if (ret < 0) + return ret; + + data->pwm_period_ns = spec.period; + data->pwm_id = ret; + + ret = of_property_read_u32(node, "default-brightness", &value); + if (ret < 0) + return ret; + + data->dft_brightness = value; + + ret = of_property_read_u32(node, "max-brightness", &value); + if (ret < 0) + return ret; + + data->max_brightness = value; + + /* + * TODO: Most users of this driver use a number of GPIOs to control + * backlight power. Support for specifying these needs to be + * added. + */ + + return 0; +} + +static struct of_device_id pwm_backlight_of_match[] = { + { .compatible = "pwm-backlight" }, + { } +}; + +MODULE_DEVICE_TABLE(of, pwm_backlight_of_match); +#else +static int pwm_backlight_parse_dt(struct device *dev, + struct platform_pwm_backlight_data *data) +{ + return -ENODEV; +} +#endif + static int pwm_backlight_probe(struct platform_device *pdev) { struct backlight_properties props; struct platform_pwm_backlight_data *data = pdev->dev.platform_data; + struct platform_pwm_backlight_data defdata; struct backlight_device *bl; struct pwm_bl_data *pb; int ret; if (!data) { - dev_err(&pdev->dev, "failed to find platform data\n"); - return -EINVAL; + ret = pwm_backlight_parse_dt(&pdev->dev, &defdata); + if (ret < 0) { + dev_err(&pdev->dev, "failed to find platform data\n"); + return ret; + } + + data = &defdata; } if (data->init) { @@ -113,6 +177,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) pb->notify = data->notify; pb->notify_after = data->notify_after; pb->check_fb = data->check_fb; + pb->exit = data->exit; pb->lth_brightness = data->lth_brightness * (data->pwm_period_ns / data->max_brightness); pb->dev = &pdev->dev; @@ -152,7 +217,6 @@ err_alloc: static int pwm_backlight_remove(struct platform_device *pdev) { - struct platform_pwm_backlight_data *data = pdev->dev.platform_data; struct backlight_device *bl = platform_get_drvdata(pdev); struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev); @@ -160,8 +224,8 @@ static int pwm_backlight_remove(struct platform_device *pdev) pwm_config(pb->pwm, 0, pb->period); pwm_disable(pb->pwm); pwm_free(pb->pwm); - if (data->exit) - data->exit(&pdev->dev); + if (pb->exit) + pb->exit(&pdev->dev); return 0; } @@ -195,11 +259,12 @@ static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend, static struct platform_driver pwm_backlight_driver = { .driver = { - .name = "pwm-backlight", - .owner = THIS_MODULE, + .name = "pwm-backlight", + .owner = THIS_MODULE, #ifdef CONFIG_PM - .pm = &pwm_backlight_pm_ops, + .pm = &pwm_backlight_pm_ops, #endif + .of_match_table = of_match_ptr(pwm_backlight_of_match), }, .probe = pwm_backlight_probe, .remove = pwm_backlight_remove, -- 1.7.9
next prev parent reply other threads:[~2012-02-06 15:19 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-02-06 15:19 [PATCH v2 00/10] Add PWM framework and device-tree support Thierry Reding 2012-02-06 15:19 ` Thierry Reding [not found] ` <1328541585-24642-1-git-send-email-thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org> 2012-02-06 15:19 ` [PATCH v2 01/10] PWM: add pwm framework support Thierry Reding 2012-02-06 15:19 ` Thierry Reding 2012-02-06 15:19 ` [PATCH v2 02/10] pwm: Allow chips to support multiple PWMs Thierry Reding 2012-02-06 15:19 ` Thierry Reding [not found] ` <1328541585-24642-3-git-send-email-thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org> 2012-02-06 21:22 ` Lars-Peter Clausen 2012-02-06 21:22 ` Lars-Peter Clausen [not found] ` <4F3044A9.8000202-Qo5EllUWu/uELgA04lAiVw@public.gmane.org> 2012-02-07 7:04 ` Thierry Reding 2012-02-07 7:04 ` Thierry Reding [not found] ` <20120207070400.GA29238-RM9K5IK7kjIQXX3q8xo1gnVAuStQJXxyR5q1nwbD4aMs9pC9oP6+/A@public.gmane.org> 2012-02-07 11:38 ` Mark Brown 2012-02-07 11:38 ` Mark Brown 2012-02-08 9:13 ` Russell King - ARM Linux 2012-02-08 9:13 ` Russell King - ARM Linux [not found] ` <20120208091327.GH889-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 2012-02-08 11:12 ` Thierry Reding 2012-02-08 11:12 ` Thierry Reding 2012-02-07 22:53 ` Ryan Mallon 2012-02-07 22:53 ` Ryan Mallon [not found] ` <4F31AB63.3020301-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-02-08 8:15 ` Thierry Reding 2012-02-08 8:15 ` Thierry Reding [not found] ` <20120208081508.GA6673-RM9K5IK7kjIQXX3q8xo1gnVAuStQJXxyR5q1nwbD4aMs9pC9oP6+/A@public.gmane.org> 2012-02-08 9:00 ` Sascha Hauer 2012-02-08 9:00 ` Sascha Hauer [not found] ` <20120208090055.GP3852-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2012-02-08 11:16 ` Thierry Reding 2012-02-08 11:16 ` Thierry Reding 2012-02-08 9:17 ` Russell King - ARM Linux 2012-02-08 9:17 ` Russell King - ARM Linux [not found] ` <20120208091720.GI889-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 2012-02-08 10:31 ` Thierry Reding 2012-02-08 10:31 ` Thierry Reding 2012-02-06 15:19 ` [PATCH v2 03/10] of: Add PWM support Thierry Reding 2012-02-06 15:19 ` Thierry Reding 2012-02-06 15:19 ` [PATCH v2 04/10] arm/tegra: Fix PWM clock programming Thierry Reding 2012-02-06 15:19 ` Thierry Reding 2012-02-06 15:19 ` [PATCH v2 05/10] arm/tegra: Provide clock for only one PWM controller Thierry Reding 2012-02-06 15:19 ` Thierry Reding 2012-02-06 15:19 ` [PATCH v2 06/10] pwm: Add NVIDIA Tegra SoC support Thierry Reding 2012-02-06 15:19 ` Thierry Reding 2012-02-06 15:19 ` [PATCH v2 07/10] arm/tegra: Add PWFM controller device tree probing Thierry Reding 2012-02-06 15:19 ` Thierry Reding 2012-02-06 15:19 ` [PATCH v2 08/10] pwm: Add Blackfin support Thierry Reding 2012-02-06 15:19 ` Thierry Reding 2012-02-06 15:19 ` [PATCH v2 09/10] pwm: Add PXA support Thierry Reding 2012-02-06 15:19 ` Thierry Reding 2012-02-06 15:19 ` Thierry Reding [this message] 2012-02-06 15:19 ` [PATCH v2 10/10] pwm-backlight: Add rudimentary device tree support Thierry Reding
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=1328541585-24642-11-git-send-email-thierry.reding@avionic-design.de \ --to=thierry.reding-rm9k5ik7kjkj5m59nbduvrnah6klmebb@public.gmane.org \ --cc=arnd-r2nGTMty4D4@public.gmane.org \ --cc=broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org \ --cc=ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \ --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org \ --cc=kurt.van.dijck-/BeEPy95v10@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=matthias-RprLehDfhQ3k1uMJSBkQmQ@public.gmane.org \ --cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \ --cc=rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org \ --cc=rpurdie-Fm38FmjxZ/leoWH0uzbU5w@public.gmane.org \ --cc=s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ --cc=vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org \ --cc=wmb-D5eQfiDGL7eakBO8gow8eQ@public.gmane.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.