Message ID | 1445963373-27790-3-git-send-email-bjorn.andersson@sonymobile.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Bjorn, [auto build test WARNING on ljones-mfd/for-mfd-next -- if it's inappropriate base, please suggest rules for selecting the more suitable base] url: https://github.com/0day-ci/linux/commits/Bjorn-Andersson/devicetree-mfd-Add-binding-for-the-TI-LM3533/20151028-003248 config: x86_64-randconfig-x012-201543 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All warnings (new ones prefixed by >>): In file included from include/uapi/linux/stddef.h:1:0, from include/linux/stddef.h:4, from include/uapi/linux/posix_types.h:4, from include/uapi/linux/types.h:13, from include/linux/types.h:5, from include/linux/list.h:4, from include/linux/module.h:9, from drivers/mfd/lm3533-core.c:14: drivers/mfd/lm3533-core.c: In function 'lm3533_pdata_from_of_node': drivers/mfd/lm3533-core.c:830:8: error: implicit declaration of function 'of_node_cmp' [-Werror=implicit-function-declaration] if (!of_node_cmp(node->name, "als")) ^ include/linux/compiler.h:147:28: note: in definition of macro '__trace_if' if (__builtin_constant_p((cond)) ? !!(cond) : \ ^ >> drivers/mfd/lm3533-core.c:830:3: note: in expansion of macro 'if' if (!of_node_cmp(node->name, "als")) ^ cc1: some warnings being treated as errors vim +/if +830 drivers/mfd/lm3533-core.c 814 815 ret = lm3533_of_parse_enum(dev->of_node, "ti,boost-freq-khz", freqs, 2); 816 if (ret < 0) { 817 dev_err(dev, "failed to parse ti,boost-freq-khz\n"); 818 return ret; 819 } 820 pdata->boost_freq = ret; 821 822 ret = lm3533_of_parse_enum(dev->of_node, "ti,boost-ovp", ovps, 4); 823 if (ret < 0) { 824 dev_err(dev, "failed to parse ti,boost-ovp\n"); 825 return ret; 826 } 827 pdata->boost_ovp = ret; 828 829 for_each_child_of_node(dev->of_node, node) { > 830 if (!of_node_cmp(node->name, "als")) 831 ret = lm3533_of_parse_als_node(dev, node, pdata); 832 else if (!of_node_cmp(node->name, "backlight")) 833 ret = lm3533_of_parse_bl_node(dev, node, pdata); 834 else if (!of_node_cmp(node->name, "led")) 835 ret = lm3533_of_parse_led_node(dev, node, pdata); 836 837 if (ret < 0) { 838 of_node_put(node); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Bjorn, [auto build test ERROR on ljones-mfd/for-mfd-next -- if it's inappropriate base, please suggest rules for selecting the more suitable base] url: https://github.com/0day-ci/linux/commits/Bjorn-Andersson/devicetree-mfd-Add-binding-for-the-TI-LM3533/20151028-003248 config: x86_64-randconfig-x019-201543 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): drivers/mfd/lm3533-core.c: In function 'lm3533_pdata_from_of_node': >> drivers/mfd/lm3533-core.c:830:8: error: implicit declaration of function 'of_node_cmp' [-Werror=implicit-function-declaration] if (!of_node_cmp(node->name, "als")) ^ cc1: some warnings being treated as errors vim +/of_node_cmp +830 drivers/mfd/lm3533-core.c 824 dev_err(dev, "failed to parse ti,boost-ovp\n"); 825 return ret; 826 } 827 pdata->boost_ovp = ret; 828 829 for_each_child_of_node(dev->of_node, node) { > 830 if (!of_node_cmp(node->name, "als")) 831 ret = lm3533_of_parse_als_node(dev, node, pdata); 832 else if (!of_node_cmp(node->name, "backlight")) 833 ret = lm3533_of_parse_bl_node(dev, node, pdata); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Tue, 27 Oct 2015, Bjorn Andersson wrote: > Implement Device Tree parsing functions to support initialization of the > lm3533 drivers. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> > --- > > Changes since v1: > - Added units to bost-freq and als resistance > > drivers/mfd/lm3533-core.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 264 insertions(+) I assume you plan on fixing the build robot's complains? > diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c > index 5abcbb2e8849..9f0fb362ee76 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] = 500, > + [LM3533_BOOST_FREQ_1000KHZ] = 1000, > + }; > + const unsigned ovps[] = { > + [LM3533_BOOST_OVP_16V] = 16, > + [LM3533_BOOST_OVP_24V] = 24, > + [LM3533_BOOST_OVP_32V] = 32, > + [LM3533_BOOST_OVP_40V] = 40, > + }; > + > + 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, "ti,hwen-gpios", 0); > + if (pdata->gpio_hwen < 0) > + return pdata->gpio_hwen; > + > + ret = lm3533_of_parse_enum(dev->of_node, "ti,boost-freq-khz", freqs, 2); > + if (ret < 0) { > + dev_err(dev, "failed to parse ti,boost-freq-khz\n"); > + return ret; > + } > + pdata->boost_freq = ret; > + > + ret = lm3533_of_parse_enum(dev->of_node, "ti,boost-ovp", ovps, 4); > + if (ret < 0) { > + dev_err(dev, "failed to parse ti,boost-ovp\n"); > + return ret; > + } > + pdata->boost_ovp = ret; > + > + for_each_child_of_node(dev->of_node, node) { > + if (!of_node_cmp(node->name, "als")) > + ret = lm3533_of_parse_als_node(dev, node, pdata); > + else if (!of_node_cmp(node->name, "backlight")) > + ret = lm3533_of_parse_bl_node(dev, node, pdata); > + else if (!of_node_cmp(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); > } >
On Wed, 2015-10-28 at 11:40 +0000, Lee Jones wrote: > On Tue, 27 Oct 2015, Bjorn Andersson wrote: > > Implement Device Tree parsing functions to support initialization of the > > lm3533 drivers. [] > > Changes since v1: > > - Added units to bost-freq and als resistance [] > I assume you plan on fixing the build robot's complains? [ then +15 kb of useless quoted stuff ] Please remember to trim your replies.
On Wed 28 Oct 04:40 PDT 2015, Lee Jones wrote: > On Tue, 27 Oct 2015, Bjorn Andersson wrote: > > > Implement Device Tree parsing functions to support initialization of the > > lm3533 drivers. > > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> > > --- > > > > Changes since v1: > > - Added units to bost-freq and als resistance > > > > drivers/mfd/lm3533-core.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 264 insertions(+) > > I assume you plan on fixing the build robot's complains? > I do, unfortunately I didn't get those on v1 :/ Just trying to conclude if I should move the logic from patch 2 into this patch before resending. Regards, Bjorn
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c index 5abcbb2e8849..9f0fb362ee76 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] = 500, + [LM3533_BOOST_FREQ_1000KHZ] = 1000, + }; + const unsigned ovps[] = { + [LM3533_BOOST_OVP_16V] = 16, + [LM3533_BOOST_OVP_24V] = 24, + [LM3533_BOOST_OVP_32V] = 32, + [LM3533_BOOST_OVP_40V] = 40, + }; + + 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, "ti,hwen-gpios", 0); + if (pdata->gpio_hwen < 0) + return pdata->gpio_hwen; + + ret = lm3533_of_parse_enum(dev->of_node, "ti,boost-freq-khz", freqs, 2); + if (ret < 0) { + dev_err(dev, "failed to parse ti,boost-freq-khz\n"); + return ret; + } + pdata->boost_freq = ret; + + ret = lm3533_of_parse_enum(dev->of_node, "ti,boost-ovp", ovps, 4); + if (ret < 0) { + dev_err(dev, "failed to parse ti,boost-ovp\n"); + return ret; + } + pdata->boost_ovp = ret; + + for_each_child_of_node(dev->of_node, node) { + if (!of_node_cmp(node->name, "als")) + ret = lm3533_of_parse_als_node(dev, node, pdata); + else if (!of_node_cmp(node->name, "backlight")) + ret = lm3533_of_parse_bl_node(dev, node, pdata); + else if (!of_node_cmp(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); }
Implement Device Tree parsing functions to support initialization of the lm3533 drivers. Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> --- Changes since v1: - Added units to bost-freq and als resistance drivers/mfd/lm3533-core.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+)