* [PATCH v6 1/5] devicetree: mfd: Add binding for the TI LM3533
@ 2017-01-30 21:17 Bjorn Andersson
2017-01-30 21:17 ` [PATCH v6 2/5] mfd: lm3533: Support initialization from Device Tree Bjorn Andersson
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Bjorn Andersson @ 2017-01-30 21:17 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Jonathan Cameron
Cc: Lee Jones, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, Richard Purdie, Pavel Machek, Jingoo Han,
devicetree, linux-kernel, linux-iio, linux-leds
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Add the binding for the Texas Instruments LM3533 lighting power
solution.
Acked-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Rob Herring <robh@kernel.org>
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Changes since v5:
- None
Changes since v4:
- Acks from Jonathan, Lee and Rob
Changes since v3:
- Added compatible to sub-nodes, per Lee's requested to treat them as separate
pieces.
Documentation/devicetree/bindings/mfd/lm3533.txt | 205 +++++++++++++++++++++++
1 file changed, 205 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/lm3533.txt
diff --git a/Documentation/devicetree/bindings/mfd/lm3533.txt b/Documentation/devicetree/bindings/mfd/lm3533.txt
new file mode 100644
index 000000000000..909281096ba2
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/lm3533.txt
@@ -0,0 +1,205 @@
+Texas Instruments LM3533 binding
+
+This binding describes the Texas Instruments LM3533, a lighting power solution
+for smartphone handsets. The common properties are described directly in the
+node, while each individual component are described in an optional subnode.
+
+- compatible:
+ Usage: required
+ Value type: <stringlist>
+ Definition: must be:
+ "ti,lm3533"
+
+- reg:
+ Usage: required
+ Value type: <u32>
+ Definition: i2c address of the LM3533 chip
+
+- als-supply:
+ Usage: optional
+ Value type: <prop-encoded-array>
+ Definition: reference to regulator powering the V_als input; as
+ specified in "../regulator/regulator.txt"
+
+- hwen-gpios:
+ Usage: required
+ Value type: <prop-encoded-array>
+ Definition: reference to gpio pin connected to the HWEN input; as
+ specified in "../gpio/gpio.txt"
+
+- ti,boost-freq-hz:
+ Usage: required
+ Value type: <u32>
+ Definition: switch-frequency of the boost converter, must be either:
+ 500000 or 1000000
+
+- ti,boost-ovp-mv:
+ Usage: required
+ Value type: <u32>
+ Definition: over-voltage protection limit, in mV. Must be one of:
+ 16000, 24000, 32000 or 40000
+
+- #address-cells:
+ Usage: required
+ Value type: <u32>
+ Definition: must be 1
+
+- #size-cells:
+ Usage: required
+ Value type: <u32>
+ Definition: must be 0
+
+= ALS SUBNODE
+The ambient light sensor subnode carrying the light sensor related properties.
+
+- compatible:
+ Usage: required
+ Value type: <stringlist>
+ Definition: must be:
+ "ti,lm3533-als"
+
+- ti,als-resistance-ohm:
+ Usage: required (unless ti,pwm-mode is specified)
+ Value type: <u32>
+ Definition: specifies the resistor value (R_als), in Ohm. Valid values
+ ranges from 200000 to 1574 Ohm.
+
+- ti,pwm-mode:
+ Usage: optional
+ Value type: <empty>
+ Definition: specifies, if present, that the als should operate in PWM
+ mode - rather than analog mode
+
+= BACKLIGHT NODES
+Backlight subnodes carrying the backlight related properties.
+
+- compatible:
+ Usage: required
+ Value type: <stringlist>
+ Definition: must be:
+ "ti,lm3533-backlight"
+
+- reg:
+ Usage: required
+ Value type: <u32>
+ Definition: specifies which of the two backlights this node corresponds
+ to
+
+- default-brightness:
+ Usage: optional
+ Value type: <32>
+ Definition: specifies the default brightness for the backlight, in
+ units of brightness [0-255]
+
+- label:
+ Usage: required
+ Value type: <string>
+ Definition: specifies a name of this backlight
+
+- led-max-microamp:
+ Usage: required
+ Value type: <u32>
+ Definition: specifies the max current for this backlight, in uA, as
+ described in "../leds/common.txt"
+
+- ti,pwm-zones:
+ Usage: optional
+ Value type: <u32 list>
+ Definition: lists the ALS zones to be PWM controlled for this backlight,
+ the values in the list are in the range [0 - 4]
+
+= LED NODES
+LED subnodes carrying the LED related properties.
+
+- compatible:
+ Usage: required
+ Value type: <stringlist>
+ Definition: must be:
+ "ti,lm3533-led"
+
+- reg:
+ Usage: required
+ Value type: <u32>
+ Definition: specifies which of the four LEDs this node corresponds to
+
+- linux,default-trigger:
+ Usage: optional
+ Value type: <string>
+ Definition: specifies the default trigger for the LED, as described in
+ "../leds/common.txt"
+
+- label:
+ Usage: required
+ Value type: <string>
+ Definition: specifies a name of this LED, as described in
+ "../leds/common.txt"
+
+- led-max-microamp:
+ Usage: required
+ Value type: <u32>
+ Definition: specifies the max current for this LED, in uA, as described
+ in "../leds/common.txt"
+
+- ti,pwm-zones:
+ Usage: optional
+ Value type: <u32 list>
+ Definition: lists the ALS zones to be PWM controlled for this LED, the
+ values in the list are in the range [0 - 4]
+
+= EXAMPLE
+
+i2c@12460000 {
+ compatible = "qcom,i2c-qup-v1.1.1";
+ ...
+
+ lm3533@36 {
+ compatible = "ti,lm3533";
+ reg = <0x36>;
+
+ als-supply = <&pm8921_l11>;
+ hwen-gpios = <&pm8921_gpio 26 GPIO_ACTIVE_HIGH>;
+
+ ti,boost-freq-hz = <500000>;
+ ti,boost-ovp-mv = <24000>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ als {
+ compatible = "ti,lm3533-als";
+ ti,als-resistance-ohm = <200000>;
+ };
+
+ backlight@0 {
+ compatible = "ti,lm3533-backlight";
+ reg = <0>;
+ label = "backlight";
+
+ led-max-microamp = <20200>;
+ };
+
+ led@0 {
+ compatible = "ti,lm3533-led";
+ reg = <0>;
+ label = "red";
+
+ led-max-microamp = <5000>;
+ };
+
+ led@1 {
+ compatible = "ti,lm3533-led";
+ reg = <1>;
+ label = "green";
+
+ led-max-microamp = <5000>;
+ };
+
+ led@2 {
+ compatible = "ti,lm3533-led";
+ reg = <2>;
+ label = "blue";
+
+ led-max-microamp = <5000>;
+ };
+ };
+
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v6 2/5] mfd: lm3533: Support initialization from Device Tree
2017-01-30 21:17 [PATCH v6 1/5] devicetree: mfd: Add binding for the TI LM3533 Bjorn Andersson
@ 2017-01-30 21:17 ` Bjorn Andersson
2017-02-08 10:41 ` Lee Jones
2017-01-30 21:17 ` [PATCH v6 3/5] backlight: " Bjorn Andersson
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Bjorn Andersson @ 2017-01-30 21:17 UTC (permalink / raw)
To: Lee Jones
Cc: Rob Herring, Mark Rutland, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, Richard Purdie,
Pavel Machek, Jingoo Han, devicetree, linux-kernel, linux-iio,
linux-leds
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Implement support for initialization of the lm3533 driver core and
probing child devices from Device Tree.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/mfd/lm3533-core.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
Note that this patch can be merged independently of the other patches in the
series.
Changes since v5:
- Added comment re of_platform_populate()
Changes since v4:
- Moved of_node check into lm3533_pdata_from_of_node()
Changes since v3:
- Moved parsing of child of nodes into each child driver
- Use of_platform_populate() to instanciate child devices
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index 5abcbb2e8849..89c79328c78e 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -18,6 +18,8 @@
#include <linux/gpio.h>
#include <linux/i2c.h>
#include <linux/mfd/core.h>
+#include <linux/of_gpio.h>
+#include <linux/of_platform.h>
#include <linux/regmap.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
@@ -512,6 +514,16 @@ static int lm3533_device_init(struct lm3533 *lm3533)
lm3533_device_bl_init(lm3533);
lm3533_device_led_init(lm3533);
+ /*
+ * Check of_node as of_platform_populate treats NULL as the root node,
+ * which would cause side effects in certain unlikely DT/non-DT hybrid
+ * solutions.
+ */
+ if (lm3533->dev->of_node) {
+ of_platform_populate(lm3533->dev->of_node, NULL, NULL,
+ lm3533->dev);
+ }
+
ret = sysfs_create_group(&lm3533->dev->kobj, &lm3533_attribute_group);
if (ret < 0) {
dev_err(lm3533->dev, "failed to create sysfs attributes\n");
@@ -588,10 +600,76 @@ static const struct regmap_config regmap_config = {
.precious_reg = lm3533_precious_register,
};
+static int lm3533_of_parse_enum(struct device *dev, const char *propname,
+ const unsigned int *match, size_t num_matches)
+{
+ size_t i;
+ int ret;
+ u32 val;
+
+ ret = of_property_read_u32(dev->of_node, propname, &val);
+ if (ret < 0) {
+ dev_err(dev, "failed to parse %s\n", propname);
+ return ret;
+ }
+
+ for (i = 0; i < num_matches; i++) {
+ if (val == match[i])
+ return i;
+ }
+
+ dev_err(dev, "unsupported value of %s\n", propname);
+ return -EINVAL;
+}
+
+static int lm3533_pdata_from_of_node(struct device *dev)
+{
+ struct lm3533_platform_data *pdata;
+ int ret;
+ const unsigned int freqs[] = {
+ [LM3533_BOOST_FREQ_500KHZ] = 500000,
+ [LM3533_BOOST_FREQ_1000KHZ] = 1000000,
+ };
+ const unsigned int ovps[] = {
+ [LM3533_BOOST_OVP_16V] = 16000,
+ [LM3533_BOOST_OVP_24V] = 24000,
+ [LM3533_BOOST_OVP_32V] = 32000,
+ [LM3533_BOOST_OVP_40V] = 40000,
+ };
+
+ if (!dev->of_node)
+ return 0;
+
+ pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata)
+ return -ENOMEM;
+
+ pdata->gpio_hwen = of_get_named_gpio(dev->of_node, "hwen-gpios", 0);
+ if (pdata->gpio_hwen < 0)
+ return pdata->gpio_hwen;
+
+ ret = lm3533_of_parse_enum(dev, "ti,boost-freq-hz",
+ freqs, ARRAY_SIZE(freqs));
+ if (ret < 0)
+ return ret;
+ pdata->boost_freq = ret;
+
+ ret = lm3533_of_parse_enum(dev, "ti,boost-ovp-mv",
+ ovps, ARRAY_SIZE(ovps));
+ if (ret < 0)
+ return ret;
+ pdata->boost_ovp = ret;
+
+ dev->platform_data = pdata;
+
+ return 0;
+}
+
static int lm3533_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct lm3533 *lm3533;
+ int ret;
dev_dbg(&i2c->dev, "%s\n", __func__);
@@ -608,6 +686,10 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
lm3533->dev = &i2c->dev;
lm3533->irq = i2c->irq;
+ ret = lm3533_pdata_from_of_node(lm3533->dev);
+ if (ret < 0)
+ return ret;
+
return lm3533_device_init(lm3533);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v6 3/5] backlight: lm3533: Support initialization from Device Tree
2017-01-30 21:17 [PATCH v6 1/5] devicetree: mfd: Add binding for the TI LM3533 Bjorn Andersson
2017-01-30 21:17 ` [PATCH v6 2/5] mfd: lm3533: Support initialization from Device Tree Bjorn Andersson
@ 2017-01-30 21:17 ` Bjorn Andersson
2017-02-08 12:54 ` Lee Jones
[not found] ` <20170130211719.31017-3-bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-01-30 21:17 ` [PATCH v6 4/5] iio: light: lm3533-als: " Bjorn Andersson
2017-01-30 21:17 ` [PATCH v6 5/5] leds: lm3533: " Bjorn Andersson
3 siblings, 2 replies; 11+ messages in thread
From: Bjorn Andersson @ 2017-01-30 21:17 UTC (permalink / raw)
To: Lee Jones, Jingoo Han
Cc: Rob Herring, Mark Rutland, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, Richard Purdie,
Pavel Machek, devicetree, linux-kernel, linux-iio, linux-leds
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Implement support for initialization of the lm3533 backlight from Device
Tree.
Acked-by: Jingoo Han <jingoohan1@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Note that this patch can be merged independently of the other patches in the
series.
Changes since v5:
- None
Changes since v4:
- Acks from Pavel and Jingoo
Changes since v3:
- Moved backlight DT parsing from mfd driver
- Gave driver its own compatible
drivers/video/backlight/lm3533_bl.c | 98 +++++++++++++++++++++++++++++++++++--
1 file changed, 95 insertions(+), 3 deletions(-)
diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
index 0e2337f367b6..2f132199e604 100644
--- a/drivers/video/backlight/lm3533_bl.c
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -22,6 +22,7 @@
#define LM3533_HVCTRLBANK_COUNT 2
+#define LM3533_BL_DEFAULT_BRIGHTNESS 200
#define LM3533_BL_MAX_BRIGHTNESS 255
#define LM3533_REG_CTRLBANK_AB_BCONF 0x1a
@@ -269,6 +270,86 @@ static int lm3533_bl_setup(struct lm3533_bl *bl,
return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);
}
+static int lm3533_of_parse_pwm_zones(struct device_node *node)
+{
+ const char *propname = "ti,pwm-zones";
+ u32 zones[5];
+ int count;
+ int ret;
+ int i;
+
+ count = of_property_count_u32_elems(node, propname);
+ if (count == -EINVAL)
+ return 0;
+ if (count <= 0)
+ return count;
+ if (count >= ARRAY_SIZE(zones))
+ return -EINVAL;
+
+ ret = of_property_read_u32_array(node, propname, zones, count);
+ if (ret < 0)
+ return ret;
+
+ /* Enable pwm input, and enable the selected zones */
+ ret = BIT(0);
+ for (i = 0; i < count; i++)
+ ret |= BIT(zones[i] + 1);
+
+ return ret;
+}
+
+static struct lm3533_bl_platform_data *lm3533_bl_of_parse(struct device *dev,
+ int *id)
+{
+ struct lm3533_bl_platform_data *bl_pdata;
+ struct device_node *node = dev->of_node;
+ int ret;
+ u32 reg;
+ u32 val;
+
+ bl_pdata = devm_kzalloc(dev, sizeof(*bl_pdata), GFP_KERNEL);
+ if (!bl_pdata)
+ return NULL;
+
+ ret = of_property_read_u32(node, "reg", ®);
+ if (ret < 0) {
+ dev_err(dev, "invalid reg property\n");
+ return NULL;
+ }
+ *id = reg;
+
+ ret = of_property_read_string(node, "label",
+ (const char **)&bl_pdata->name);
+ if (ret < 0) {
+ dev_err(dev, "unable to parse label\n");
+ return NULL;
+ }
+
+ ret = of_property_read_u32(node, "led-max-microamp", &val);
+ if (ret < 0) {
+ dev_err(dev, "unable to parse led-max-microamp\n");
+ return NULL;
+ }
+ bl_pdata->max_current = val;
+
+ val = LM3533_BL_DEFAULT_BRIGHTNESS;
+ ret = of_property_read_u32(node, "default-brightness", &val);
+ if (ret < 0 && ret != -EINVAL) {
+ dev_err(dev, "unable to parse default-brightness\n");
+ return NULL;
+ }
+ bl_pdata->default_brightness = val;
+
+ ret = lm3533_of_parse_pwm_zones(node);
+ if (ret < 0) {
+ dev_err(dev, "failed to parse ti,pwm-zones\n");
+ return NULL;
+ }
+ bl_pdata->pwm = ret;
+
+ return bl_pdata;
+}
+
static int lm3533_bl_probe(struct platform_device *pdev)
{
struct lm3533 *lm3533;
@@ -277,6 +358,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
struct backlight_device *bd;
struct backlight_properties props;
int ret;
+ int id;
dev_dbg(&pdev->dev, "%s\n", __func__);
@@ -284,14 +366,17 @@ static int lm3533_bl_probe(struct platform_device *pdev)
if (!lm3533)
return -EINVAL;
+ id = pdev->id;
pdata = dev_get_platdata(&pdev->dev);
+ if (!pdata)
+ pdata = lm3533_bl_of_parse(&pdev->dev, &id);
if (!pdata) {
dev_err(&pdev->dev, "no platform data\n");
return -EINVAL;
}
- if (pdev->id < 0 || pdev->id >= LM3533_HVCTRLBANK_COUNT) {
- dev_err(&pdev->dev, "illegal backlight id %d\n", pdev->id);
+ if (id < 0 || id >= LM3533_HVCTRLBANK_COUNT) {
+ dev_err(&pdev->dev, "illegal backlight id %d\n", id);
return -EINVAL;
}
@@ -300,7 +385,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
return -ENOMEM;
bl->lm3533 = lm3533;
- bl->id = pdev->id;
+ bl->id = id;
bl->cb.lm3533 = lm3533;
bl->cb.id = lm3533_bl_get_ctrlbank_id(bl);
@@ -394,10 +479,17 @@ static void lm3533_bl_shutdown(struct platform_device *pdev)
lm3533_ctrlbank_disable(&bl->cb);
}
+static const struct of_device_id lm3533_bl_of_match[] = {
+ { .compatible = "ti,lm3533-backlight", },
+ { },
+};
+MODULE_DEVICE_TABLE(of, lm3533_bl_of_match);
+
static struct platform_driver lm3533_bl_driver = {
.driver = {
.name = "lm3533-backlight",
.pm = &lm3533_bl_pm_ops,
+ .of_match_table = lm3533_bl_of_match,
},
.probe = lm3533_bl_probe,
.remove = lm3533_bl_remove,
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v6 4/5] iio: light: lm3533-als: Support initialization from Device Tree
2017-01-30 21:17 [PATCH v6 1/5] devicetree: mfd: Add binding for the TI LM3533 Bjorn Andersson
2017-01-30 21:17 ` [PATCH v6 2/5] mfd: lm3533: Support initialization from Device Tree Bjorn Andersson
2017-01-30 21:17 ` [PATCH v6 3/5] backlight: " Bjorn Andersson
@ 2017-01-30 21:17 ` Bjorn Andersson
2017-01-31 7:06 ` Peter Meerwald-Stadler
2017-01-30 21:17 ` [PATCH v6 5/5] leds: lm3533: " Bjorn Andersson
3 siblings, 1 reply; 11+ messages in thread
From: Bjorn Andersson @ 2017-01-30 21:17 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler
Cc: linux-iio, linux-kernel, Lee Jones
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Implement support for initialization of the lm3533 als driver from
Device Tree.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Note that this patch can be merged independently of the other patches in the
series.
Changes since v5:
- None
Changes since v4:
- None
Changes since v3:
- Moved als DT parsing from mfd driver
- Gave driver its own compatible
drivers/iio/light/lm3533-als.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/light/lm3533-als.c b/drivers/iio/light/lm3533-als.c
index f409c2047c05..eef9f06eb0b1 100644
--- a/drivers/iio/light/lm3533-als.c
+++ b/drivers/iio/light/lm3533-als.c
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/mfd/core.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/uaccess.h>
@@ -831,6 +832,32 @@ static const struct iio_info lm3533_als_info = {
.read_raw = &lm3533_als_read_raw,
};
+static struct lm3533_als_platform_data *lm3533_als_of_parse(struct device *dev)
+{
+ struct lm3533_als_platform_data *als_pdata;
+ struct device_node *node = dev->of_node;
+ int ret;
+ u32 val;
+
+ als_pdata = devm_kzalloc(dev, sizeof(*als_pdata), GFP_KERNEL);
+ if (!als_pdata)
+ return NULL;
+
+ als_pdata->pwm_mode = of_property_read_bool(node, "ti,pwm-mode");
+
+ ret = of_property_read_u32(node, "ti,als-resistance-ohm", &val);
+ if (ret < 0 && ret != -EINVAL) {
+ dev_err(dev, "unable to read ti,als-resistance-ohm");
+ return NULL;
+ }
+
+ /* Leave at high-Z, if the property was omitted or specified as 0 */
+ if (!ret && val != 0)
+ als_pdata->r_select = 200000 / val;
+
+ return als_pdata;
+}
+
static int lm3533_als_probe(struct platform_device *pdev)
{
struct lm3533 *lm3533;
@@ -843,7 +870,11 @@ static int lm3533_als_probe(struct platform_device *pdev)
if (!lm3533)
return -EINVAL;
- pdata = pdev->dev.platform_data;
+ if (pdev->dev.of_node)
+ pdata = lm3533_als_of_parse(&pdev->dev);
+ else
+ pdata = pdev->dev.platform_data;
+
if (!pdata) {
dev_err(&pdev->dev, "no platform data\n");
return -EINVAL;
@@ -914,9 +945,16 @@ static int lm3533_als_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id lm3533_als_of_match[] = {
+ { .compatible = "ti,lm3533-als", },
+ { },
+};
+MODULE_DEVICE_TABLE(of, lm3533_als_of_match);
+
static struct platform_driver lm3533_als_driver = {
.driver = {
.name = "lm3533-als",
+ .of_match_table = lm3533_als_of_match,
},
.probe = lm3533_als_probe,
.remove = lm3533_als_remove,
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v6 5/5] leds: lm3533: Support initialization from Device Tree
2017-01-30 21:17 [PATCH v6 1/5] devicetree: mfd: Add binding for the TI LM3533 Bjorn Andersson
` (2 preceding siblings ...)
2017-01-30 21:17 ` [PATCH v6 4/5] iio: light: lm3533-als: " Bjorn Andersson
@ 2017-01-30 21:17 ` Bjorn Andersson
2017-01-31 21:15 ` Jacek Anaszewski
3 siblings, 1 reply; 11+ messages in thread
From: Bjorn Andersson @ 2017-01-30 21:17 UTC (permalink / raw)
To: Richard Purdie, Pavel Machek; +Cc: linux-leds, linux-kernel, Lee Jones
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Implement support for initialization of the lm3533 LED driver from
Device Tree.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Note that this patch can be merged independently of the other patches in the
series.
Changes since v5:
- None
Changes since v4:
- None
Changes since v3:
- Moved LED DT parsing from mfd driver
- Gave driver its own compatible
drivers/leds/leds-lm3533.c | 98 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 95 insertions(+), 3 deletions(-)
diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
index 5b529dc013d2..3eedad0ea9df 100644
--- a/drivers/leds/leds-lm3533.c
+++ b/drivers/leds/leds-lm3533.c
@@ -15,6 +15,7 @@
#include <linux/leds.h>
#include <linux/mfd/core.h>
#include <linux/mutex.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
@@ -648,12 +649,92 @@ static int lm3533_led_setup(struct lm3533_led *led,
return lm3533_ctrlbank_set_pwm(&led->cb, pdata->pwm);
}
+static int lm3533_of_parse_pwm_zones(struct device_node *node)
+{
+ const char *propname = "ti,pwm-zones";
+ u32 zones[5];
+ int count;
+ int ret;
+ int i;
+
+ count = of_property_count_u32_elems(node, propname);
+ if (count == -EINVAL)
+ return 0;
+ if (count <= 0)
+ return count;
+ if (count >= ARRAY_SIZE(zones))
+ return -EINVAL;
+
+ ret = of_property_read_u32_array(node, propname, zones, count);
+ if (ret < 0)
+ return ret;
+
+ /* Enable pwm input, and enable the selected zones */
+ ret = BIT(0);
+ for (i = 0; i < count; i++)
+ ret |= BIT(zones[i] + 1);
+
+ return ret;
+}
+
+static struct lm3533_led_platform_data *lm3533_led_of_parse(struct device *dev,
+ int *id)
+{
+ struct lm3533_led_platform_data *led_pdata;
+ struct device_node *node = dev->of_node;
+ int ret;
+ u32 reg;
+ u32 val;
+
+ led_pdata = devm_kzalloc(dev, sizeof(*led_pdata), GFP_KERNEL);
+ if (!led_pdata)
+ return NULL;
+
+ ret = of_property_read_u32(node, "reg", ®);
+ if (ret < 0) {
+ dev_err(dev, "invalid reg property\n");
+ return NULL;
+ }
+ *id = reg;
+
+ ret = of_property_read_string(node, "label",
+ (const char **)&led_pdata->name);
+ if (ret < 0) {
+ dev_err(dev, "unable to parse label\n");
+ return NULL;
+ }
+
+ ret = of_property_read_u32(node, "led-max-microamp", &val);
+ if (ret < 0) {
+ dev_err(dev, "unable to parse led-max-microamp\n");
+ return NULL;
+ }
+ led_pdata->max_current = val;
+
+ ret = of_property_read_string(node, "linux,default-trigger",
+ &led_pdata->default_trigger);
+ if (ret < 0 && ret != -EINVAL) {
+ dev_err(dev, "unable to parse default-trigger\n");
+ return NULL;
+ }
+
+ ret = lm3533_of_parse_pwm_zones(node);
+ if (ret < 0) {
+ dev_err(dev, "failed to parse ti,pwm-zones\n");
+ return NULL;
+ }
+ led_pdata->pwm = ret;
+
+ return led_pdata;
+}
+
static int lm3533_led_probe(struct platform_device *pdev)
{
struct lm3533 *lm3533;
struct lm3533_led_platform_data *pdata;
struct lm3533_led *led;
int ret;
+ int id;
dev_dbg(&pdev->dev, "%s\n", __func__);
@@ -661,14 +742,18 @@ static int lm3533_led_probe(struct platform_device *pdev)
if (!lm3533)
return -EINVAL;
+ id = pdev->id;
pdata = dev_get_platdata(&pdev->dev);
+ if (!pdata)
+ pdata = lm3533_led_of_parse(&pdev->dev, &id);
+
if (!pdata) {
dev_err(&pdev->dev, "no platform data\n");
return -EINVAL;
}
- if (pdev->id < 0 || pdev->id >= LM3533_LVCTRLBANK_COUNT) {
- dev_err(&pdev->dev, "illegal LED id %d\n", pdev->id);
+ if (id < 0 || id >= LM3533_LVCTRLBANK_COUNT) {
+ dev_err(&pdev->dev, "illegal LED id %d\n", id);
return -EINVAL;
}
@@ -684,7 +769,7 @@ static int lm3533_led_probe(struct platform_device *pdev)
led->cdev.blink_set = lm3533_led_blink_set;
led->cdev.brightness = LED_OFF;
led->cdev.groups = lm3533_led_attribute_groups,
- led->id = pdev->id;
+ led->id = id;
mutex_init(&led->mutex);
@@ -739,9 +824,16 @@ static void lm3533_led_shutdown(struct platform_device *pdev)
lm3533_led_set(&led->cdev, LED_OFF); /* disable blink */
}
+static const struct of_device_id lm3533_led_of_match[] = {
+ { .compatible = "ti,lm3533-led", },
+ { },
+};
+MODULE_DEVICE_TABLE(of, lm3533_led_of_match);
+
static struct platform_driver lm3533_led_driver = {
.driver = {
.name = "lm3533-leds",
+ .of_match_table = lm3533_led_of_match,
},
.probe = lm3533_led_probe,
.remove = lm3533_led_remove,
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v6 4/5] iio: light: lm3533-als: Support initialization from Device Tree
2017-01-30 21:17 ` [PATCH v6 4/5] iio: light: lm3533-als: " Bjorn Andersson
@ 2017-01-31 7:06 ` Peter Meerwald-Stadler
0 siblings, 0 replies; 11+ messages in thread
From: Peter Meerwald-Stadler @ 2017-01-31 7:06 UTC (permalink / raw)
To: Bjorn Andersson; +Cc: Jonathan Cameron, linux-iio, linux-kernel, Lee Jones
> Implement support for initialization of the lm3533 als driver from
> Device Tree.
minor comment below
> Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>
> Note that this patch can be merged independently of the other patches in the
> series.
>
> Changes since v5:
> - None
>
> Changes since v4:
> - None
>
> Changes since v3:
> - Moved als DT parsing from mfd driver
> - Gave driver its own compatible
>
> drivers/iio/light/lm3533-als.c | 40 +++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 39 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/light/lm3533-als.c b/drivers/iio/light/lm3533-als.c
> index f409c2047c05..eef9f06eb0b1 100644
> --- a/drivers/iio/light/lm3533-als.c
> +++ b/drivers/iio/light/lm3533-als.c
> @@ -20,6 +20,7 @@
> #include <linux/module.h>
> #include <linux/mutex.h>
> #include <linux/mfd/core.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> #include <linux/uaccess.h>
> @@ -831,6 +832,32 @@ static const struct iio_info lm3533_als_info = {
> .read_raw = &lm3533_als_read_raw,
> };
>
> +static struct lm3533_als_platform_data *lm3533_als_of_parse(struct device *dev)
> +{
> + struct lm3533_als_platform_data *als_pdata;
> + struct device_node *node = dev->of_node;
> + int ret;
> + u32 val;
> +
> + als_pdata = devm_kzalloc(dev, sizeof(*als_pdata), GFP_KERNEL);
> + if (!als_pdata)
> + return NULL;
> +
> + als_pdata->pwm_mode = of_property_read_bool(node, "ti,pwm-mode");
> +
> + ret = of_property_read_u32(node, "ti,als-resistance-ohm", &val);
> + if (ret < 0 && ret != -EINVAL) {
> + dev_err(dev, "unable to read ti,als-resistance-ohm");
\n missing
> + return NULL;
> + }
> +
> + /* Leave at high-Z, if the property was omitted or specified as 0 */
> + if (!ret && val != 0)
> + als_pdata->r_select = 200000 / val;
> +
> + return als_pdata;
> +}
> +
> static int lm3533_als_probe(struct platform_device *pdev)
> {
> struct lm3533 *lm3533;
> @@ -843,7 +870,11 @@ static int lm3533_als_probe(struct platform_device *pdev)
> if (!lm3533)
> return -EINVAL;
>
> - pdata = pdev->dev.platform_data;
> + if (pdev->dev.of_node)
> + pdata = lm3533_als_of_parse(&pdev->dev);
> + else
> + pdata = pdev->dev.platform_data;
> +
> if (!pdata) {
> dev_err(&pdev->dev, "no platform data\n");
> return -EINVAL;
> @@ -914,9 +945,16 @@ static int lm3533_als_remove(struct platform_device *pdev)
> return 0;
> }
>
> +static const struct of_device_id lm3533_als_of_match[] = {
> + { .compatible = "ti,lm3533-als", },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, lm3533_als_of_match);
> +
> static struct platform_driver lm3533_als_driver = {
> .driver = {
> .name = "lm3533-als",
> + .of_match_table = lm3533_als_of_match,
> },
> .probe = lm3533_als_probe,
> .remove = lm3533_als_remove,
>
--
Peter Meerwald-Stadler
+43-664-2444418 (mobile)
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 5/5] leds: lm3533: Support initialization from Device Tree
2017-01-30 21:17 ` [PATCH v6 5/5] leds: lm3533: " Bjorn Andersson
@ 2017-01-31 21:15 ` Jacek Anaszewski
0 siblings, 0 replies; 11+ messages in thread
From: Jacek Anaszewski @ 2017-01-31 21:15 UTC (permalink / raw)
To: Bjorn Andersson, Richard Purdie, Pavel Machek
Cc: linux-leds, linux-kernel, Lee Jones
Hi Bjorn,
Thanks for the patch.
On 01/30/2017 10:17 PM, Bjorn Andersson wrote:
> From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
>
> Implement support for initialization of the lm3533 LED driver from
> Device Tree.
>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>
> Note that this patch can be merged independently of the other patches in the
> series.
>
> Changes since v5:
> - None
>
> Changes since v4:
> - None
>
> Changes since v3:
> - Moved LED DT parsing from mfd driver
> - Gave driver its own compatible
>
> drivers/leds/leds-lm3533.c | 98 ++++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 95 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
> index 5b529dc013d2..3eedad0ea9df 100644
> --- a/drivers/leds/leds-lm3533.c
> +++ b/drivers/leds/leds-lm3533.c
> @@ -15,6 +15,7 @@
> #include <linux/leds.h>
> #include <linux/mfd/core.h>
> #include <linux/mutex.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
>
> @@ -648,12 +649,92 @@ static int lm3533_led_setup(struct lm3533_led *led,
> return lm3533_ctrlbank_set_pwm(&led->cb, pdata->pwm);
> }
>
> +static int lm3533_of_parse_pwm_zones(struct device_node *node)
> +{
> + const char *propname = "ti,pwm-zones";
> + u32 zones[5];
> + int count;
> + int ret;
> + int i;
> +
> + count = of_property_count_u32_elems(node, propname);
> + if (count == -EINVAL)
> + return 0;
> + if (count <= 0)
> + return count;
> + if (count >= ARRAY_SIZE(zones))
> + return -EINVAL;
> +
> + ret = of_property_read_u32_array(node, propname, zones, count);
> + if (ret < 0)
> + return ret;
> +
> + /* Enable pwm input, and enable the selected zones */
> + ret = BIT(0);
> + for (i = 0; i < count; i++)
> + ret |= BIT(zones[i] + 1);
> +
> + return ret;
> +}
> +
> +static struct lm3533_led_platform_data *lm3533_led_of_parse(struct device *dev,
> + int *id)
> +{
> + struct lm3533_led_platform_data *led_pdata;
> + struct device_node *node = dev->of_node;
> + int ret;
> + u32 reg;
> + u32 val;
> +
> + led_pdata = devm_kzalloc(dev, sizeof(*led_pdata), GFP_KERNEL);
> + if (!led_pdata)
> + return NULL;
> +
> + ret = of_property_read_u32(node, "reg", ®);
> + if (ret < 0) {
> + dev_err(dev, "invalid reg property\n");
> + return NULL;
> + }
> + *id = reg;
> +
> + ret = of_property_read_string(node, "label",
> + (const char **)&led_pdata->name);
leds/common.txt says:
- label : The label for this LED. If omitted, the label is taken from
the node name.
Please refer to the other LED class drivers.
> + if (ret < 0) {
> + dev_err(dev, "unable to parse label\n");
> + return NULL;
> + }
> +
> + ret = of_property_read_u32(node, "led-max-microamp", &val);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse led-max-microamp\n");
> + return NULL;
> + }
> + led_pdata->max_current = val;
> +
> + ret = of_property_read_string(node, "linux,default-trigger",
> + &led_pdata->default_trigger);
> + if (ret < 0 && ret != -EINVAL) {
> + dev_err(dev, "unable to parse default-trigger\n");
> + return NULL;
> + }
> +
> + ret = lm3533_of_parse_pwm_zones(node);
> + if (ret < 0) {
> + dev_err(dev, "failed to parse ti,pwm-zones\n");
> + return NULL;
> + }
> + led_pdata->pwm = ret;
> +
> + return led_pdata;
> +}
> +
> static int lm3533_led_probe(struct platform_device *pdev)
> {
> struct lm3533 *lm3533;
> struct lm3533_led_platform_data *pdata;
> struct lm3533_led *led;
> int ret;
> + int id;
>
> dev_dbg(&pdev->dev, "%s\n", __func__);
>
> @@ -661,14 +742,18 @@ static int lm3533_led_probe(struct platform_device *pdev)
> if (!lm3533)
> return -EINVAL;
>
> + id = pdev->id;
> pdata = dev_get_platdata(&pdev->dev);
> + if (!pdata)
> + pdata = lm3533_led_of_parse(&pdev->dev, &id);
> +
> if (!pdata) {
> dev_err(&pdev->dev, "no platform data\n");
> return -EINVAL;
> }
>
> - if (pdev->id < 0 || pdev->id >= LM3533_LVCTRLBANK_COUNT) {
> - dev_err(&pdev->dev, "illegal LED id %d\n", pdev->id);
> + if (id < 0 || id >= LM3533_LVCTRLBANK_COUNT) {
> + dev_err(&pdev->dev, "illegal LED id %d\n", id);
> return -EINVAL;
> }
>
> @@ -684,7 +769,7 @@ static int lm3533_led_probe(struct platform_device *pdev)
> led->cdev.blink_set = lm3533_led_blink_set;
> led->cdev.brightness = LED_OFF;
> led->cdev.groups = lm3533_led_attribute_groups,
> - led->id = pdev->id;
> + led->id = id;
>
> mutex_init(&led->mutex);
>
> @@ -739,9 +824,16 @@ static void lm3533_led_shutdown(struct platform_device *pdev)
> lm3533_led_set(&led->cdev, LED_OFF); /* disable blink */
> }
>
> +static const struct of_device_id lm3533_led_of_match[] = {
> + { .compatible = "ti,lm3533-led", },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, lm3533_led_of_match);
> +
> static struct platform_driver lm3533_led_driver = {
> .driver = {
> .name = "lm3533-leds",
> + .of_match_table = lm3533_led_of_match,
> },
> .probe = lm3533_led_probe,
> .remove = lm3533_led_remove,
>
--
Best regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 2/5] mfd: lm3533: Support initialization from Device Tree
2017-01-30 21:17 ` [PATCH v6 2/5] mfd: lm3533: Support initialization from Device Tree Bjorn Andersson
@ 2017-02-08 10:41 ` Lee Jones
0 siblings, 0 replies; 11+ messages in thread
From: Lee Jones @ 2017-02-08 10:41 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Rob Herring, Mark Rutland, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, Richard Purdie,
Pavel Machek, Jingoo Han, devicetree, linux-kernel, linux-iio,
linux-leds
On Mon, 30 Jan 2017, Bjorn Andersson wrote:
> From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
>
> Implement support for initialization of the lm3533 driver core and
> probing child devices from Device Tree.
>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> drivers/mfd/lm3533-core.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 82 insertions(+)
>
> Note that this patch can be merged independently of the other patches in the
> series.
>
> Changes since v5:
> - Added comment re of_platform_populate()
>
> Changes since v4:
> - Moved of_node check into lm3533_pdata_from_of_node()
>
> Changes since v3:
> - Moved parsing of child of nodes into each child driver
> - Use of_platform_populate() to instanciate child devices
>
>
> diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
> index 5abcbb2e8849..89c79328c78e 100644
> --- a/drivers/mfd/lm3533-core.c
> +++ b/drivers/mfd/lm3533-core.c
> @@ -18,6 +18,8 @@
> #include <linux/gpio.h>
> #include <linux/i2c.h>
> #include <linux/mfd/core.h>
> +#include <linux/of_gpio.h>
> +#include <linux/of_platform.h>
> #include <linux/regmap.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> @@ -512,6 +514,16 @@ static int lm3533_device_init(struct lm3533 *lm3533)
> lm3533_device_bl_init(lm3533);
> lm3533_device_led_init(lm3533);
>
> + /*
> + * Check of_node as of_platform_populate treats NULL as the root node,
> + * which would cause side effects in certain unlikely DT/non-DT hybrid
> + * solutions.
> + */
> + if (lm3533->dev->of_node) {
> + of_platform_populate(lm3533->dev->of_node, NULL, NULL,
> + lm3533->dev);
> + }
> +
> ret = sysfs_create_group(&lm3533->dev->kobj, &lm3533_attribute_group);
> if (ret < 0) {
> dev_err(lm3533->dev, "failed to create sysfs attributes\n");
> @@ -588,10 +600,76 @@ static const struct regmap_config regmap_config = {
> .precious_reg = lm3533_precious_register,
> };
>
> +static int lm3533_of_parse_enum(struct device *dev, const char *propname,
> + const unsigned int *match, size_t num_matches)
> +{
> + size_t i;
> + int ret;
> + u32 val;
> +
> + ret = of_property_read_u32(dev->of_node, propname, &val);
> + if (ret < 0) {
If you do a fix-up of this driver please:
s/(ret < 0)/(ret)/
If not, it's not enough of an issue for non-acceptance:
For my own reference:
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
> + dev_err(dev, "failed to parse %s\n", propname);
> + return ret;
> + }
> +
> + for (i = 0; i < num_matches; i++) {
> + if (val == match[i])
> + return i;
> + }
> +
> + dev_err(dev, "unsupported value of %s\n", propname);
> + return -EINVAL;
> +}
> +
> +static int lm3533_pdata_from_of_node(struct device *dev)
> +{
> + struct lm3533_platform_data *pdata;
> + int ret;
> + const unsigned int freqs[] = {
> + [LM3533_BOOST_FREQ_500KHZ] = 500000,
> + [LM3533_BOOST_FREQ_1000KHZ] = 1000000,
> + };
> + const unsigned int ovps[] = {
> + [LM3533_BOOST_OVP_16V] = 16000,
> + [LM3533_BOOST_OVP_24V] = 24000,
> + [LM3533_BOOST_OVP_32V] = 32000,
> + [LM3533_BOOST_OVP_40V] = 40000,
> + };
> +
> + if (!dev->of_node)
> + return 0;
> +
> + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> + if (!pdata)
> + return -ENOMEM;
> +
> + pdata->gpio_hwen = of_get_named_gpio(dev->of_node, "hwen-gpios", 0);
> + if (pdata->gpio_hwen < 0)
> + return pdata->gpio_hwen;
> +
> + ret = lm3533_of_parse_enum(dev, "ti,boost-freq-hz",
> + freqs, ARRAY_SIZE(freqs));
> + if (ret < 0)
> + return ret;
> + pdata->boost_freq = ret;
> +
> + ret = lm3533_of_parse_enum(dev, "ti,boost-ovp-mv",
> + ovps, ARRAY_SIZE(ovps));
> + if (ret < 0)
> + return ret;
> + pdata->boost_ovp = ret;
> +
> + dev->platform_data = pdata;
> +
> + return 0;
> +}
> +
> static int lm3533_i2c_probe(struct i2c_client *i2c,
> const struct i2c_device_id *id)
> {
> struct lm3533 *lm3533;
> + int ret;
>
> dev_dbg(&i2c->dev, "%s\n", __func__);
>
> @@ -608,6 +686,10 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
> lm3533->dev = &i2c->dev;
> lm3533->irq = i2c->irq;
>
> + ret = lm3533_pdata_from_of_node(lm3533->dev);
> + if (ret < 0)
> + return ret;
> +
> return lm3533_device_init(lm3533);
> }
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 3/5] backlight: lm3533: Support initialization from Device Tree
2017-01-30 21:17 ` [PATCH v6 3/5] backlight: " Bjorn Andersson
@ 2017-02-08 12:54 ` Lee Jones
[not found] ` <20170130211719.31017-3-bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
1 sibling, 0 replies; 11+ messages in thread
From: Lee Jones @ 2017-02-08 12:54 UTC (permalink / raw)
To: Bjorn Andersson, daniel.thompson
Cc: Jingoo Han, Rob Herring, Mark Rutland, Jonathan Cameron,
Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
Richard Purdie, Pavel Machek, devicetree, linux-kernel,
linux-iio, linux-leds
Cc'ing Daniel Thompson, the new Maintainer.
On Mon, 30 Jan 2017, Bjorn Andersson wrote:
> From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
>
> Implement support for initialization of the lm3533 backlight from Device
> Tree.
>
> Acked-by: Jingoo Han <jingoohan1@gmail.com>
> Acked-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>
> Note that this patch can be merged independently of the other patches in the
> series.
>
> Changes since v5:
> - None
>
> Changes since v4:
> - Acks from Pavel and Jingoo
>
> Changes since v3:
> - Moved backlight DT parsing from mfd driver
> - Gave driver its own compatible
>
> drivers/video/backlight/lm3533_bl.c | 98 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 95 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
> index 0e2337f367b6..2f132199e604 100644
> --- a/drivers/video/backlight/lm3533_bl.c
> +++ b/drivers/video/backlight/lm3533_bl.c
> @@ -22,6 +22,7 @@
>
>
> #define LM3533_HVCTRLBANK_COUNT 2
> +#define LM3533_BL_DEFAULT_BRIGHTNESS 200
> #define LM3533_BL_MAX_BRIGHTNESS 255
>
> #define LM3533_REG_CTRLBANK_AB_BCONF 0x1a
> @@ -269,6 +270,86 @@ static int lm3533_bl_setup(struct lm3533_bl *bl,
> return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);
> }
>
> +static int lm3533_of_parse_pwm_zones(struct device_node *node)
> +{
> + const char *propname = "ti,pwm-zones";
> + u32 zones[5];
> + int count;
> + int ret;
> + int i;
> +
> + count = of_property_count_u32_elems(node, propname);
> + if (count == -EINVAL)
> + return 0;
> + if (count <= 0)
> + return count;
> + if (count >= ARRAY_SIZE(zones))
> + return -EINVAL;
> +
> + ret = of_property_read_u32_array(node, propname, zones, count);
> + if (ret < 0)
> + return ret;
> +
> + /* Enable pwm input, and enable the selected zones */
> + ret = BIT(0);
> + for (i = 0; i < count; i++)
> + ret |= BIT(zones[i] + 1);
> +
> + return ret;
> +}
> +
> +static struct lm3533_bl_platform_data *lm3533_bl_of_parse(struct device *dev,
> + int *id)
> +{
> + struct lm3533_bl_platform_data *bl_pdata;
> + struct device_node *node = dev->of_node;
> + int ret;
> + u32 reg;
> + u32 val;
> +
> + bl_pdata = devm_kzalloc(dev, sizeof(*bl_pdata), GFP_KERNEL);
> + if (!bl_pdata)
> + return NULL;
> +
> + ret = of_property_read_u32(node, "reg", ®);
> + if (ret < 0) {
> + dev_err(dev, "invalid reg property\n");
> + return NULL;
> + }
> + *id = reg;
> +
> + ret = of_property_read_string(node, "label",
> + (const char **)&bl_pdata->name);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse label\n");
> + return NULL;
> + }
> +
> + ret = of_property_read_u32(node, "led-max-microamp", &val);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse led-max-microamp\n");
> + return NULL;
> + }
> + bl_pdata->max_current = val;
> +
> + val = LM3533_BL_DEFAULT_BRIGHTNESS;
> + ret = of_property_read_u32(node, "default-brightness", &val);
> + if (ret < 0 && ret != -EINVAL) {
> + dev_err(dev, "unable to parse default-brightness\n");
> + return NULL;
> + }
> + bl_pdata->default_brightness = val;
> +
> + ret = lm3533_of_parse_pwm_zones(node);
> + if (ret < 0) {
> + dev_err(dev, "failed to parse ti,pwm-zones\n");
> + return NULL;
> + }
> + bl_pdata->pwm = ret;
> +
> + return bl_pdata;
> +}
> +
> static int lm3533_bl_probe(struct platform_device *pdev)
> {
> struct lm3533 *lm3533;
> @@ -277,6 +358,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> struct backlight_device *bd;
> struct backlight_properties props;
> int ret;
> + int id;
>
> dev_dbg(&pdev->dev, "%s\n", __func__);
>
> @@ -284,14 +366,17 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> if (!lm3533)
> return -EINVAL;
>
> + id = pdev->id;
> pdata = dev_get_platdata(&pdev->dev);
> + if (!pdata)
> + pdata = lm3533_bl_of_parse(&pdev->dev, &id);
> if (!pdata) {
> dev_err(&pdev->dev, "no platform data\n");
> return -EINVAL;
> }
>
> - if (pdev->id < 0 || pdev->id >= LM3533_HVCTRLBANK_COUNT) {
> - dev_err(&pdev->dev, "illegal backlight id %d\n", pdev->id);
> + if (id < 0 || id >= LM3533_HVCTRLBANK_COUNT) {
> + dev_err(&pdev->dev, "illegal backlight id %d\n", id);
> return -EINVAL;
> }
>
> @@ -300,7 +385,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> bl->lm3533 = lm3533;
> - bl->id = pdev->id;
> + bl->id = id;
>
> bl->cb.lm3533 = lm3533;
> bl->cb.id = lm3533_bl_get_ctrlbank_id(bl);
> @@ -394,10 +479,17 @@ static void lm3533_bl_shutdown(struct platform_device *pdev)
> lm3533_ctrlbank_disable(&bl->cb);
> }
>
> +static const struct of_device_id lm3533_bl_of_match[] = {
> + { .compatible = "ti,lm3533-backlight", },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, lm3533_bl_of_match);
> +
> static struct platform_driver lm3533_bl_driver = {
> .driver = {
> .name = "lm3533-backlight",
> .pm = &lm3533_bl_pm_ops,
> + .of_match_table = lm3533_bl_of_match,
> },
> .probe = lm3533_bl_probe,
> .remove = lm3533_bl_remove,
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 3/5] backlight: lm3533: Support initialization from Device Tree
2017-01-30 21:17 ` [PATCH v6 3/5] backlight: " Bjorn Andersson
@ 2017-03-10 13:45 ` Daniel Thompson
[not found] ` <20170130211719.31017-3-bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
1 sibling, 0 replies; 11+ messages in thread
From: Daniel Thompson @ 2017-03-10 13:45 UTC (permalink / raw)
To: Bjorn Andersson, Lee Jones, Jingoo Han
Cc: Rob Herring, Mark Rutland, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, Richard Purdie,
Pavel Machek, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-iio-u79uwXL29TY76Z2rM5mHXA,
linux-leds-u79uwXL29TY76Z2rM5mHXA
On 30/01/17 22:17, Bjorn Andersson wrote:
> From: Bjorn Andersson <bjorn.andersson-/MT0OVThwyLZJqsBc5GL+g@public.gmane.org>
>
> Implement support for initialization of the lm3533 backlight from Device
> Tree.
>
> Acked-by: Jingoo Han <jingoohan1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
> Signed-off-by: Bjorn Andersson <bjorn.andersson-/MT0OVThwyLZJqsBc5GL+g@public.gmane.org>
> Signed-off-by: Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Acked-by: Daniel Thompson <daniel.thompson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>
> Note that this patch can be merged independently of the other patches in the
> series.
>
> Changes since v5:
> - None
>
> Changes since v4:
> - Acks from Pavel and Jingoo
>
> Changes since v3:
> - Moved backlight DT parsing from mfd driver
> - Gave driver its own compatible
>
> drivers/video/backlight/lm3533_bl.c | 98 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 95 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
> index 0e2337f367b6..2f132199e604 100644
> --- a/drivers/video/backlight/lm3533_bl.c
> +++ b/drivers/video/backlight/lm3533_bl.c
> @@ -22,6 +22,7 @@
>
>
> #define LM3533_HVCTRLBANK_COUNT 2
> +#define LM3533_BL_DEFAULT_BRIGHTNESS 200
> #define LM3533_BL_MAX_BRIGHTNESS 255
>
> #define LM3533_REG_CTRLBANK_AB_BCONF 0x1a
> @@ -269,6 +270,86 @@ static int lm3533_bl_setup(struct lm3533_bl *bl,
> return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);
> }
>
> +static int lm3533_of_parse_pwm_zones(struct device_node *node)
> +{
> + const char *propname = "ti,pwm-zones";
> + u32 zones[5];
> + int count;
> + int ret;
> + int i;
> +
> + count = of_property_count_u32_elems(node, propname);
> + if (count == -EINVAL)
> + return 0;
> + if (count <= 0)
> + return count;
> + if (count >= ARRAY_SIZE(zones))
> + return -EINVAL;
> +
> + ret = of_property_read_u32_array(node, propname, zones, count);
> + if (ret < 0)
> + return ret;
> +
> + /* Enable pwm input, and enable the selected zones */
> + ret = BIT(0);
> + for (i = 0; i < count; i++)
> + ret |= BIT(zones[i] + 1);
> +
> + return ret;
> +}
> +
> +static struct lm3533_bl_platform_data *lm3533_bl_of_parse(struct device *dev,
> + int *id)
> +{
> + struct lm3533_bl_platform_data *bl_pdata;
> + struct device_node *node = dev->of_node;
> + int ret;
> + u32 reg;
> + u32 val;
> +
> + bl_pdata = devm_kzalloc(dev, sizeof(*bl_pdata), GFP_KERNEL);
> + if (!bl_pdata)
> + return NULL;
> +
> + ret = of_property_read_u32(node, "reg", ®);
> + if (ret < 0) {
> + dev_err(dev, "invalid reg property\n");
> + return NULL;
> + }
> + *id = reg;
> +
> + ret = of_property_read_string(node, "label",
> + (const char **)&bl_pdata->name);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse label\n");
> + return NULL;
> + }
> +
> + ret = of_property_read_u32(node, "led-max-microamp", &val);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse led-max-microamp\n");
> + return NULL;
> + }
> + bl_pdata->max_current = val;
> +
> + val = LM3533_BL_DEFAULT_BRIGHTNESS;
> + ret = of_property_read_u32(node, "default-brightness", &val);
> + if (ret < 0 && ret != -EINVAL) {
> + dev_err(dev, "unable to parse default-brightness\n");
> + return NULL;
> + }
> + bl_pdata->default_brightness = val;
> +
> + ret = lm3533_of_parse_pwm_zones(node);
> + if (ret < 0) {
> + dev_err(dev, "failed to parse ti,pwm-zones\n");
> + return NULL;
> + }
> + bl_pdata->pwm = ret;
> +
> + return bl_pdata;
> +}
> +
> static int lm3533_bl_probe(struct platform_device *pdev)
> {
> struct lm3533 *lm3533;
> @@ -277,6 +358,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> struct backlight_device *bd;
> struct backlight_properties props;
> int ret;
> + int id;
>
> dev_dbg(&pdev->dev, "%s\n", __func__);
>
> @@ -284,14 +366,17 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> if (!lm3533)
> return -EINVAL;
>
> + id = pdev->id;
> pdata = dev_get_platdata(&pdev->dev);
> + if (!pdata)
> + pdata = lm3533_bl_of_parse(&pdev->dev, &id);
> if (!pdata) {
> dev_err(&pdev->dev, "no platform data\n");
> return -EINVAL;
> }
>
> - if (pdev->id < 0 || pdev->id >= LM3533_HVCTRLBANK_COUNT) {
> - dev_err(&pdev->dev, "illegal backlight id %d\n", pdev->id);
> + if (id < 0 || id >= LM3533_HVCTRLBANK_COUNT) {
> + dev_err(&pdev->dev, "illegal backlight id %d\n", id);
> return -EINVAL;
> }
>
> @@ -300,7 +385,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> bl->lm3533 = lm3533;
> - bl->id = pdev->id;
> + bl->id = id;
>
> bl->cb.lm3533 = lm3533;
> bl->cb.id = lm3533_bl_get_ctrlbank_id(bl);
> @@ -394,10 +479,17 @@ static void lm3533_bl_shutdown(struct platform_device *pdev)
> lm3533_ctrlbank_disable(&bl->cb);
> }
>
> +static const struct of_device_id lm3533_bl_of_match[] = {
> + { .compatible = "ti,lm3533-backlight", },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, lm3533_bl_of_match);
> +
> static struct platform_driver lm3533_bl_driver = {
> .driver = {
> .name = "lm3533-backlight",
> .pm = &lm3533_bl_pm_ops,
> + .of_match_table = lm3533_bl_of_match,
> },
> .probe = lm3533_bl_probe,
> .remove = lm3533_bl_remove,
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 3/5] backlight: lm3533: Support initialization from Device Tree
@ 2017-03-10 13:45 ` Daniel Thompson
0 siblings, 0 replies; 11+ messages in thread
From: Daniel Thompson @ 2017-03-10 13:45 UTC (permalink / raw)
To: Bjorn Andersson, Lee Jones, Jingoo Han
Cc: Rob Herring, Mark Rutland, Jonathan Cameron, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, Richard Purdie,
Pavel Machek, devicetree, linux-kernel, linux-iio, linux-leds
On 30/01/17 22:17, Bjorn Andersson wrote:
> From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
>
> Implement support for initialization of the lm3533 backlight from Device
> Tree.
>
> Acked-by: Jingoo Han <jingoohan1@gmail.com>
> Acked-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
> ---
>
> Note that this patch can be merged independently of the other patches in the
> series.
>
> Changes since v5:
> - None
>
> Changes since v4:
> - Acks from Pavel and Jingoo
>
> Changes since v3:
> - Moved backlight DT parsing from mfd driver
> - Gave driver its own compatible
>
> drivers/video/backlight/lm3533_bl.c | 98 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 95 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
> index 0e2337f367b6..2f132199e604 100644
> --- a/drivers/video/backlight/lm3533_bl.c
> +++ b/drivers/video/backlight/lm3533_bl.c
> @@ -22,6 +22,7 @@
>
>
> #define LM3533_HVCTRLBANK_COUNT 2
> +#define LM3533_BL_DEFAULT_BRIGHTNESS 200
> #define LM3533_BL_MAX_BRIGHTNESS 255
>
> #define LM3533_REG_CTRLBANK_AB_BCONF 0x1a
> @@ -269,6 +270,86 @@ static int lm3533_bl_setup(struct lm3533_bl *bl,
> return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);
> }
>
> +static int lm3533_of_parse_pwm_zones(struct device_node *node)
> +{
> + const char *propname = "ti,pwm-zones";
> + u32 zones[5];
> + int count;
> + int ret;
> + int i;
> +
> + count = of_property_count_u32_elems(node, propname);
> + if (count == -EINVAL)
> + return 0;
> + if (count <= 0)
> + return count;
> + if (count >= ARRAY_SIZE(zones))
> + return -EINVAL;
> +
> + ret = of_property_read_u32_array(node, propname, zones, count);
> + if (ret < 0)
> + return ret;
> +
> + /* Enable pwm input, and enable the selected zones */
> + ret = BIT(0);
> + for (i = 0; i < count; i++)
> + ret |= BIT(zones[i] + 1);
> +
> + return ret;
> +}
> +
> +static struct lm3533_bl_platform_data *lm3533_bl_of_parse(struct device *dev,
> + int *id)
> +{
> + struct lm3533_bl_platform_data *bl_pdata;
> + struct device_node *node = dev->of_node;
> + int ret;
> + u32 reg;
> + u32 val;
> +
> + bl_pdata = devm_kzalloc(dev, sizeof(*bl_pdata), GFP_KERNEL);
> + if (!bl_pdata)
> + return NULL;
> +
> + ret = of_property_read_u32(node, "reg", ®);
> + if (ret < 0) {
> + dev_err(dev, "invalid reg property\n");
> + return NULL;
> + }
> + *id = reg;
> +
> + ret = of_property_read_string(node, "label",
> + (const char **)&bl_pdata->name);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse label\n");
> + return NULL;
> + }
> +
> + ret = of_property_read_u32(node, "led-max-microamp", &val);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse led-max-microamp\n");
> + return NULL;
> + }
> + bl_pdata->max_current = val;
> +
> + val = LM3533_BL_DEFAULT_BRIGHTNESS;
> + ret = of_property_read_u32(node, "default-brightness", &val);
> + if (ret < 0 && ret != -EINVAL) {
> + dev_err(dev, "unable to parse default-brightness\n");
> + return NULL;
> + }
> + bl_pdata->default_brightness = val;
> +
> + ret = lm3533_of_parse_pwm_zones(node);
> + if (ret < 0) {
> + dev_err(dev, "failed to parse ti,pwm-zones\n");
> + return NULL;
> + }
> + bl_pdata->pwm = ret;
> +
> + return bl_pdata;
> +}
> +
> static int lm3533_bl_probe(struct platform_device *pdev)
> {
> struct lm3533 *lm3533;
> @@ -277,6 +358,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> struct backlight_device *bd;
> struct backlight_properties props;
> int ret;
> + int id;
>
> dev_dbg(&pdev->dev, "%s\n", __func__);
>
> @@ -284,14 +366,17 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> if (!lm3533)
> return -EINVAL;
>
> + id = pdev->id;
> pdata = dev_get_platdata(&pdev->dev);
> + if (!pdata)
> + pdata = lm3533_bl_of_parse(&pdev->dev, &id);
> if (!pdata) {
> dev_err(&pdev->dev, "no platform data\n");
> return -EINVAL;
> }
>
> - if (pdev->id < 0 || pdev->id >= LM3533_HVCTRLBANK_COUNT) {
> - dev_err(&pdev->dev, "illegal backlight id %d\n", pdev->id);
> + if (id < 0 || id >= LM3533_HVCTRLBANK_COUNT) {
> + dev_err(&pdev->dev, "illegal backlight id %d\n", id);
> return -EINVAL;
> }
>
> @@ -300,7 +385,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> bl->lm3533 = lm3533;
> - bl->id = pdev->id;
> + bl->id = id;
>
> bl->cb.lm3533 = lm3533;
> bl->cb.id = lm3533_bl_get_ctrlbank_id(bl);
> @@ -394,10 +479,17 @@ static void lm3533_bl_shutdown(struct platform_device *pdev)
> lm3533_ctrlbank_disable(&bl->cb);
> }
>
> +static const struct of_device_id lm3533_bl_of_match[] = {
> + { .compatible = "ti,lm3533-backlight", },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, lm3533_bl_of_match);
> +
> static struct platform_driver lm3533_bl_driver = {
> .driver = {
> .name = "lm3533-backlight",
> .pm = &lm3533_bl_pm_ops,
> + .of_match_table = lm3533_bl_of_match,
> },
> .probe = lm3533_bl_probe,
> .remove = lm3533_bl_remove,
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-03-10 13:45 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-30 21:17 [PATCH v6 1/5] devicetree: mfd: Add binding for the TI LM3533 Bjorn Andersson
2017-01-30 21:17 ` [PATCH v6 2/5] mfd: lm3533: Support initialization from Device Tree Bjorn Andersson
2017-02-08 10:41 ` Lee Jones
2017-01-30 21:17 ` [PATCH v6 3/5] backlight: " Bjorn Andersson
2017-02-08 12:54 ` Lee Jones
[not found] ` <20170130211719.31017-3-bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-03-10 13:45 ` Daniel Thompson
2017-03-10 13:45 ` Daniel Thompson
2017-01-30 21:17 ` [PATCH v6 4/5] iio: light: lm3533-als: " Bjorn Andersson
2017-01-31 7:06 ` Peter Meerwald-Stadler
2017-01-30 21:17 ` [PATCH v6 5/5] leds: lm3533: " Bjorn Andersson
2017-01-31 21:15 ` Jacek Anaszewski
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.