* [RESEND PATCH v3 1/2] devicetree: mfd: Add binding for the TI LM3533
@ 2016-03-31 6:27 Bjorn Andersson
2016-03-31 6:27 ` [RESEND PATCH v3 2/2] mfd: lm3533: Support initialization from Device Tree Bjorn Andersson
0 siblings, 1 reply; 4+ messages in thread
From: Bjorn Andersson @ 2016-03-31 6:27 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Lee Jones
Cc: devicetree, linux-kernel, Bjorn Andersson
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>
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Changes since v2:
- Included and changed unit in various dt properties
- Fix compilation issue with !CONFIG_OF
Changes since v1:
- Added units to bost-freq and als resistance
Documentation/devicetree/bindings/mfd/lm3533.txt | 184 +++++++++++++++++++++++
1 file changed, 184 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..d4b43602a382
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/lm3533.txt
@@ -0,0 +1,184 @@
+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 must be named "als", it carries the light
+sensor related properties.
+
+- 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 must be named "backlight", they carry the backlight related
+properties.
+
+- 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 must be named "led", they carry the LED related properties.
+
+- 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 {
+ ti,als-resistance-ohm = <200000>;
+ };
+
+ backlight@0 {
+ reg = <0>;
+ label = "backlight";
+
+ led-max-microamp = <20200>;
+ };
+
+ led@0 {
+ reg = <0>;
+ label = "red";
+
+ led-max-microamp = <5000>;
+ };
+
+ led@1 {
+ reg = <1>;
+ label = "green";
+
+ led-max-microamp = <5000>;
+ };
+
+ led@2 {
+ reg = <2>;
+ label = "blue";
+
+ led-max-microamp = <5000>;
+ };
+ };
+
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RESEND PATCH v3 2/2] mfd: lm3533: Support initialization from Device Tree
2016-03-31 6:27 [RESEND PATCH v3 1/2] devicetree: mfd: Add binding for the TI LM3533 Bjorn Andersson
@ 2016-03-31 6:27 ` Bjorn Andersson
2016-04-11 12:30 ` Lee Jones
0 siblings, 1 reply; 4+ messages in thread
From: Bjorn Andersson @ 2016-03-31 6:27 UTC (permalink / raw)
To: Lee Jones
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, devicetree,
linux-kernel, Bjorn Andersson
From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Implement Device Tree parsing functions to support initialization of the
lm3533 drivers.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Changes since v2:
- Drop vendor prefix of vendor properties
- Specify unit of various properties
- Fix reference paths
Changes since v1:
- Added unit to boost-freq and als-resistance (as the frequency now comes with
a unit specifier I changed it to be expressed in kHz)
drivers/mfd/lm3533-core.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 264 insertions(+)
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index 5abcbb2e8849..dbf26d86fe85 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -18,6 +18,7 @@
#include <linux/gpio.h>
#include <linux/i2c.h>
#include <linux/mfd/core.h>
+#include <linux/of_gpio.h>
#include <linux/regmap.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
@@ -25,6 +26,7 @@
#include <linux/mfd/lm3533.h>
+#define LM3533_DEFAULT_BRIGHTNESS 200
#define LM3533_BOOST_OVP_MASK 0x06
#define LM3533_BOOST_OVP_SHIFT 1
@@ -588,10 +590,266 @@ static const struct regmap_config regmap_config = {
.precious_reg = lm3533_precious_register,
};
+static int lm3533_of_parse_enum(struct device_node *node,
+ const char *propname,
+ const unsigned *match, size_t num_matches)
+{
+ size_t i;
+ int ret;
+ u32 val;
+
+ ret = of_property_read_u32(node, propname, &val);
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < num_matches; i++) {
+ if (val == match[i])
+ return i;
+ }
+
+ return -EINVAL;
+}
+
+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 int lm3533_of_parse_als_node(struct device *dev,
+ struct device_node *node,
+ struct lm3533_platform_data *pdata)
+{
+ struct lm3533_als_platform_data *als_pdata;
+ int ret;
+ u32 val;
+
+ als_pdata = devm_kzalloc(dev,
+ sizeof(struct lm3533_als_platform_data),
+ GFP_KERNEL);
+ if (!als_pdata)
+ return -ENOMEM;
+
+ 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 ret;
+ }
+
+ /* Leave at high-Z, if the property was omitted or specified as 0 */
+ if (!ret && val != 0)
+ als_pdata->r_select = 200000 / val;
+
+ pdata->als = als_pdata;
+
+ return 0;
+}
+
+static int lm3533_of_parse_bl_node(struct device *dev,
+ struct device_node *node,
+ struct lm3533_platform_data *pdata)
+{
+ struct lm3533_bl_platform_data *bl_pdata;
+ int ret;
+ u32 reg;
+ u32 val;
+
+ ret = of_property_read_u32(node, "reg", ®);
+ if (ret < 0 || reg >= ARRAY_SIZE(lm3533_bl_devs)) {
+ dev_err(dev, "invalid reg property\n");
+ return ret;
+ }
+
+ bl_pdata = &pdata->backlights[reg];
+
+ /* Increment num_backlights if we're filling a new space */
+ if (reg + 1 > pdata->num_backlights)
+ pdata->num_backlights = reg + 1;
+
+ ret = of_property_read_string(node, "label",
+ (const char **)&bl_pdata->name);
+ if (ret < 0) {
+ dev_err(dev, "unable to parse label\n");
+ return ret;
+ }
+
+ ret = of_property_read_u32(node, "led-max-microamp", &val);
+ if (ret < 0) {
+ dev_err(dev, "unable to parse led-max-microamp\n");
+ return ret;
+ }
+ bl_pdata->max_current = val;
+
+ val = LM3533_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 ret;
+ }
+ 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 ret;
+ }
+ bl_pdata->pwm = ret;
+
+ return 0;
+}
+
+static int lm3533_of_parse_led_node(struct device *dev,
+ struct device_node *node,
+ struct lm3533_platform_data *pdata)
+{
+ struct lm3533_led_platform_data *led_pdata;
+ int ret;
+ u32 reg;
+ u32 val;
+
+ ret = of_property_read_u32(node, "reg", ®);
+ if (ret < 0 || reg >= ARRAY_SIZE(lm3533_led_devs)) {
+ dev_err(dev, "invalid reg property\n");
+ return ret;
+ }
+
+ led_pdata = &pdata->leds[reg];
+
+ /* Increment num_leds if we're filling a new space */
+ if (reg + 1 > pdata->num_leds)
+ pdata->num_leds = reg + 1;
+
+ ret = of_property_read_string(node, "label",
+ (const char **)&led_pdata->name);
+ if (ret < 0) {
+ dev_err(dev, "unable to parse label\n");
+ return ret;
+ }
+
+ ret = of_property_read_u32(node, "led-max-microamp", &val);
+ if (ret < 0) {
+ dev_err(dev, "unable to parse led-max-microamp\n");
+ return ret;
+ }
+ 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 ret;
+ }
+
+ ret = lm3533_of_parse_pwm_zones(node);
+ if (ret < 0) {
+ dev_err(dev, "failed to parse ti,pwm-zones\n");
+ return ret;
+ }
+ led_pdata->pwm = ret;
+
+ return 0;
+}
+
+static int lm3533_pdata_from_of_node(struct device *dev)
+{
+ struct lm3533_platform_data *pdata;
+ struct device_node *node;
+ int ret;
+ const unsigned freqs[] = {
+ [LM3533_BOOST_FREQ_500KHZ] = 500000,
+ [LM3533_BOOST_FREQ_1000KHZ] = 1000000,
+ };
+ const unsigned ovps[] = {
+ [LM3533_BOOST_OVP_16V] = 16000,
+ [LM3533_BOOST_OVP_24V] = 24000,
+ [LM3533_BOOST_OVP_32V] = 32000,
+ [LM3533_BOOST_OVP_40V] = 40000,
+ };
+
+ pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata)
+ return -ENOMEM;
+
+ pdata->backlights = devm_kcalloc(dev,
+ ARRAY_SIZE(lm3533_bl_devs),
+ sizeof(struct lm3533_bl_platform_data),
+ GFP_KERNEL);
+ if (!pdata->backlights)
+ return -ENOMEM;
+
+ pdata->leds = devm_kcalloc(dev,
+ ARRAY_SIZE(lm3533_led_devs),
+ sizeof(struct lm3533_led_platform_data),
+ GFP_KERNEL);
+ if (!pdata->leds)
+ 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->of_node, "ti,boost-freq-hz", freqs, 2);
+ if (ret < 0) {
+ dev_err(dev, "failed to parse ti,boost-freq-hz\n");
+ return ret;
+ }
+ pdata->boost_freq = ret;
+
+ ret = lm3533_of_parse_enum(dev->of_node, "ti,boost-ovp-mv", ovps, 4);
+ if (ret < 0) {
+ dev_err(dev, "failed to parse ti,boost-ovp-mv\n");
+ return ret;
+ }
+ pdata->boost_ovp = ret;
+
+ for_each_child_of_node(dev->of_node, node) {
+ if (!strcmp(node->name, "als"))
+ ret = lm3533_of_parse_als_node(dev, node, pdata);
+ else if (!strcmp(node->name, "backlight"))
+ ret = lm3533_of_parse_bl_node(dev, node, pdata);
+ else if (!strcmp(node->name, "led"))
+ ret = lm3533_of_parse_led_node(dev, node, pdata);
+
+ if (ret < 0) {
+ of_node_put(node);
+ return 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 +866,12 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
lm3533->dev = &i2c->dev;
lm3533->irq = i2c->irq;
+ if (i2c->dev.of_node) {
+ ret = lm3533_pdata_from_of_node(lm3533->dev);
+ if (ret < 0)
+ return ret;
+ }
+
return lm3533_device_init(lm3533);
}
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [RESEND PATCH v3 2/2] mfd: lm3533: Support initialization from Device Tree
2016-03-31 6:27 ` [RESEND PATCH v3 2/2] mfd: lm3533: Support initialization from Device Tree Bjorn Andersson
@ 2016-04-11 12:30 ` Lee Jones
2016-04-11 13:40 ` Bjorn Andersson
0 siblings, 1 reply; 4+ messages in thread
From: Lee Jones @ 2016-04-11 12:30 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, devicetree,
linux-kernel, Bjorn Andersson
On Wed, 30 Mar 2016, Bjorn Andersson wrote:
> From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
>
> Implement Device Tree parsing functions to support initialization of the
> lm3533 drivers.
>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> Changes since v2:
> - Drop vendor prefix of vendor properties
> - Specify unit of various properties
> - Fix reference paths
>
> Changes since v1:
> - Added unit to boost-freq and als-resistance (as the frequency now comes with
> a unit specifier I changed it to be expressed in kHz)
>
> drivers/mfd/lm3533-core.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 264 insertions(+)
>
> diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
> index 5abcbb2e8849..dbf26d86fe85 100644
> --- a/drivers/mfd/lm3533-core.c
> +++ b/drivers/mfd/lm3533-core.c
> @@ -18,6 +18,7 @@
> #include <linux/gpio.h>
> #include <linux/i2c.h>
> #include <linux/mfd/core.h>
> +#include <linux/of_gpio.h>
> #include <linux/regmap.h>
> #include <linux/seq_file.h>
> #include <linux/slab.h>
> @@ -25,6 +26,7 @@
>
> #include <linux/mfd/lm3533.h>
>
> +#define LM3533_DEFAULT_BRIGHTNESS 200
The MFD doesn't care about child specifics. These needs to go into
the child driver.
> #define LM3533_BOOST_OVP_MASK 0x06
> #define LM3533_BOOST_OVP_SHIFT 1
> @@ -588,10 +590,266 @@ static const struct regmap_config regmap_config = {
> .precious_reg = lm3533_precious_register,
> };
>
> +static int lm3533_of_parse_enum(struct device_node *node,
> + const char *propname,
> + const unsigned *match, size_t num_matches)
> +{
> + size_t i;
> + int ret;
> + u32 val;
> +
> + ret = of_property_read_u32(node, propname, &val);
> + if (ret < 0)
> + return ret;
> +
> + for (i = 0; i < num_matches; i++) {
> + if (val == match[i])
> + return i;
> + }
> +
> + return -EINVAL;
> +}
> +
> +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;
> +}
Move to PWM driver.
> +static int lm3533_of_parse_als_node(struct device *dev,
> + struct device_node *node,
> + struct lm3533_platform_data *pdata)
> +{
> + struct lm3533_als_platform_data *als_pdata;
> + int ret;
> + u32 val;
> +
> + als_pdata = devm_kzalloc(dev,
> + sizeof(struct lm3533_als_platform_data),
> + GFP_KERNEL);
> + if (!als_pdata)
> + return -ENOMEM;
> +
> + 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 ret;
> + }
> +
> + /* Leave at high-Z, if the property was omitted or specified as 0 */
> + if (!ret && val != 0)
> + als_pdata->r_select = 200000 / val;
> +
> + pdata->als = als_pdata;
> +
> + return 0;
> +}
Move to wherever the ALS driver is.
> +static int lm3533_of_parse_bl_node(struct device *dev,
> + struct device_node *node,
> + struct lm3533_platform_data *pdata)
> +{
> + struct lm3533_bl_platform_data *bl_pdata;
> + int ret;
> + u32 reg;
> + u32 val;
> +
> + ret = of_property_read_u32(node, "reg", ®);
> + if (ret < 0 || reg >= ARRAY_SIZE(lm3533_bl_devs)) {
> + dev_err(dev, "invalid reg property\n");
> + return ret;
> + }
> +
> + bl_pdata = &pdata->backlights[reg];
> +
> + /* Increment num_backlights if we're filling a new space */
> + if (reg + 1 > pdata->num_backlights)
> + pdata->num_backlights = reg + 1;
> +
> + ret = of_property_read_string(node, "label",
> + (const char **)&bl_pdata->name);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse label\n");
> + return ret;
> + }
> +
> + ret = of_property_read_u32(node, "led-max-microamp", &val);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse led-max-microamp\n");
> + return ret;
> + }
> + bl_pdata->max_current = val;
> +
> + val = LM3533_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 ret;
> + }
> + 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 ret;
> + }
> + bl_pdata->pwm = ret;
> +
> + return 0;
> +}
Move to the Backlight driver.
> +static int lm3533_of_parse_led_node(struct device *dev,
> + struct device_node *node,
> + struct lm3533_platform_data *pdata)
> +{
> + struct lm3533_led_platform_data *led_pdata;
> + int ret;
> + u32 reg;
> + u32 val;
> +
> + ret = of_property_read_u32(node, "reg", ®);
> + if (ret < 0 || reg >= ARRAY_SIZE(lm3533_led_devs)) {
> + dev_err(dev, "invalid reg property\n");
> + return ret;
> + }
> +
> + led_pdata = &pdata->leds[reg];
> +
> + /* Increment num_leds if we're filling a new space */
> + if (reg + 1 > pdata->num_leds)
> + pdata->num_leds = reg + 1;
> +
> + ret = of_property_read_string(node, "label",
> + (const char **)&led_pdata->name);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse label\n");
> + return ret;
> + }
> +
> + ret = of_property_read_u32(node, "led-max-microamp", &val);
> + if (ret < 0) {
> + dev_err(dev, "unable to parse led-max-microamp\n");
> + return ret;
> + }
> + 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 ret;
> + }
> +
> + ret = lm3533_of_parse_pwm_zones(node);
> + if (ret < 0) {
> + dev_err(dev, "failed to parse ti,pwm-zones\n");
> + return ret;
> + }
> + led_pdata->pwm = ret;
> +
> + return 0;
> +}
Move to LED driver.
> +static int lm3533_pdata_from_of_node(struct device *dev)
> +{
> + struct lm3533_platform_data *pdata;
> + struct device_node *node;
> + int ret;
> + const unsigned freqs[] = {
> + [LM3533_BOOST_FREQ_500KHZ] = 500000,
> + [LM3533_BOOST_FREQ_1000KHZ] = 1000000,
> + };
> + const unsigned ovps[] = {
> + [LM3533_BOOST_OVP_16V] = 16000,
> + [LM3533_BOOST_OVP_24V] = 24000,
> + [LM3533_BOOST_OVP_32V] = 32000,
> + [LM3533_BOOST_OVP_40V] = 40000,
> + };
> +
> + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> + if (!pdata)
> + return -ENOMEM;
> +
> + pdata->backlights = devm_kcalloc(dev,
> + ARRAY_SIZE(lm3533_bl_devs),
> + sizeof(struct lm3533_bl_platform_data),
> + GFP_KERNEL);
> + if (!pdata->backlights)
> + return -ENOMEM;
These needs to go into the Backlight driver.
> + pdata->leds = devm_kcalloc(dev,
> + ARRAY_SIZE(lm3533_led_devs),
> + sizeof(struct lm3533_led_platform_data),
> + GFP_KERNEL);
> + if (!pdata->leds)
> + return -ENOMEM;
This needs to go into the LED driver.
> + 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->of_node, "ti,boost-freq-hz", freqs, 2);
> + if (ret < 0) {
> + dev_err(dev, "failed to parse ti,boost-freq-hz\n");
> + return ret;
> + }
I'm not a big fan of this abstraction method, but at the very least
you should place the error message into the function.
> + pdata->boost_freq = ret;
> +
> + ret = lm3533_of_parse_enum(dev->of_node, "ti,boost-ovp-mv", ovps, 4);
> + if (ret < 0) {
> + dev_err(dev, "failed to parse ti,boost-ovp-mv\n");
> + return ret;
> + }
> + pdata->boost_ovp = ret;
> +
> + for_each_child_of_node(dev->of_node, node) {
The MFD driver shouldn't have to care what child nodes are present.
Just regiser them as devices in their own right via mfd_add_devices()
or of_platform_populate.
> + if (!strcmp(node->name, "als"))
> + ret = lm3533_of_parse_als_node(dev, node, pdata);
> + else if (!strcmp(node->name, "backlight"))
> + ret = lm3533_of_parse_bl_node(dev, node, pdata);
> + else if (!strcmp(node->name, "led"))
> + ret = lm3533_of_parse_led_node(dev, node, pdata);
> +
> + if (ret < 0) {
> + of_node_put(node);
> + return 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 +866,12 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
> lm3533->dev = &i2c->dev;
> lm3533->irq = i2c->irq;
>
> + if (i2c->dev.of_node) {
> + 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] 4+ messages in thread
* Re: [RESEND PATCH v3 2/2] mfd: lm3533: Support initialization from Device Tree
2016-04-11 12:30 ` Lee Jones
@ 2016-04-11 13:40 ` Bjorn Andersson
0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Andersson @ 2016-04-11 13:40 UTC (permalink / raw)
To: Lee Jones
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, devicetree,
linux-kernel, Bjorn Andersson
On Mon 11 Apr 05:30 PDT 2016, Lee Jones wrote:
> On Wed, 30 Mar 2016, Bjorn Andersson wrote:
>
> > From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> >
> > Implement Device Tree parsing functions to support initialization of the
> > lm3533 drivers.
> >
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > ---
> > Changes since v2:
> > - Drop vendor prefix of vendor properties
> > - Specify unit of various properties
> > - Fix reference paths
> >
> > Changes since v1:
> > - Added unit to boost-freq and als-resistance (as the frequency now comes with
> > a unit specifier I changed it to be expressed in kHz)
> >
> > drivers/mfd/lm3533-core.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 264 insertions(+)
> >
> > diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
> > index 5abcbb2e8849..dbf26d86fe85 100644
> > --- a/drivers/mfd/lm3533-core.c
> > +++ b/drivers/mfd/lm3533-core.c
> > @@ -18,6 +18,7 @@
> > #include <linux/gpio.h>
> > #include <linux/i2c.h>
> > #include <linux/mfd/core.h>
> > +#include <linux/of_gpio.h>
> > #include <linux/regmap.h>
> > #include <linux/seq_file.h>
> > #include <linux/slab.h>
> > @@ -25,6 +26,7 @@
> >
> > #include <linux/mfd/lm3533.h>
> >
> > +#define LM3533_DEFAULT_BRIGHTNESS 200
>
> The MFD doesn't care about child specifics. These needs to go into
> the child driver.
>
OK, sounds reasonable. Thanks for your feedback!
Regards,
Bjorn
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-11 13:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-31 6:27 [RESEND PATCH v3 1/2] devicetree: mfd: Add binding for the TI LM3533 Bjorn Andersson
2016-03-31 6:27 ` [RESEND PATCH v3 2/2] mfd: lm3533: Support initialization from Device Tree Bjorn Andersson
2016-04-11 12:30 ` Lee Jones
2016-04-11 13:40 ` Bjorn Andersson
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).