Thread (51 messages) 51 messages, 6 authors, 21d ago

Re: [PATCH v5 08/14] mfd: lm3533: Convert to use OF bindings

From: Svyatoslav Ryhel <hidden>
Date: 2026-07-14 13:57:17
Also in: dri-devel, linux-devicetree, linux-iio, linux-leds, lkml

пт, 3 лип. 2026 р. о 14:03 Johan Hovold [off-list ref] пише:
On Wed, Jun 17, 2026 at 11:00:25AM +0300, Svyatoslav Ryhel wrote:
quoted
Since there are no users of this driver via platform data, remove the
platform data support and switch to using Device Tree bindings.

Signed-off-by: Svyatoslav Ryhel <redacted>
Reviewed-by: Daniel Thompson (RISCstar) <danielt@kernel.org> #for backlight
---
 drivers/iio/light/lm3533-als.c      |  67 +++++---
 drivers/leds/leds-lm3533.c          |  50 ++++--
 drivers/mfd/lm3533-core.c           | 236 ++++++++++++----------------
 drivers/mfd/lm3533-ctrlbank.c       |   5 -
 drivers/video/backlight/lm3533_bl.c |  55 +++++--
 include/linux/mfd/lm3533.h          |  52 +-----
 6 files changed, 220 insertions(+), 245 deletions(-)
quoted
 static int lm3533_als_probe(struct platform_device *pdev)
 {
-     const struct lm3533_als_platform_data *pdata;
      struct lm3533 *lm3533;
      struct lm3533_als *als;
      struct iio_dev *indio_dev;
@@ -803,12 +817,6 @@ static int lm3533_als_probe(struct platform_device *pdev)
      if (!lm3533)
              return -EINVAL;

-     pdata = dev_get_platdata(&pdev->dev);
-     if (!pdata) {
-             dev_err(&pdev->dev, "no platform data\n");
-             return -EINVAL;
-     }
-
      indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*als));
      if (!indio_dev)
              return -ENOMEM;
@@ -817,25 +825,27 @@ static int lm3533_als_probe(struct platform_device *pdev)
      indio_dev->channels = lm3533_als_channels;
      indio_dev->num_channels = ARRAY_SIZE(lm3533_als_channels);
      indio_dev->name = dev_name(&pdev->dev);
-     iio_device_set_parent(indio_dev, pdev->dev.parent);
Why are you reparenting the iio device here?
Because every cell has its own binding now and using phandle to parent
when device has its own node is not a good practice.
That's an ABI break.
This driver does not have any active users in the kernel and no
activity for more then 2 years.
quoted
+static const struct of_device_id lm3533_als_match_table[] = {
+     { .compatible = "ti,lm3533-als" },
+     { }
+};
+MODULE_DEVICE_TABLE(of, lm3533_als_match_table);
+
 static struct platform_driver lm3533_als_driver = {
      .driver = {
              .name   = "lm3533-als",
+             .of_match_table = lm3533_als_match_table,
      },
      .probe          = lm3533_als_probe,
      .remove         = lm3533_als_remove,
You should also remove the platform module alias below.
Why?
quoted
diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
index 0cb0585eb960..ed810c23f30f 100644
--- a/drivers/leds/leds-lm3533.c
+++ b/drivers/leds/leds-lm3533.c
@@ -10,8 +10,10 @@
 #include <linux/module.h>
 #include <linux/leds.h>
 #include <linux/mfd/core.h>
+#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
@@ -50,6 +52,9 @@ struct lm3533_led {
      struct mutex mutex;
      unsigned long flags;

+     u32 max_current;
+     u32 pwm;
+
      bool have_als;
 };
@@ -616,22 +621,20 @@ static const struct attribute_group *lm3533_led_attribute_groups[] = {
      NULL
 };

-static int lm3533_led_setup(struct lm3533_led *led,
-                                     struct lm3533_led_platform_data *pdata)
+static int lm3533_led_setup(struct lm3533_led *led)
 {
      int ret;

-     ret = lm3533_ctrlbank_set_max_current(&led->cb, pdata->max_current);
+     ret = lm3533_ctrlbank_set_max_current(&led->cb, led->max_current);
      if (ret)
              return ret;

-     return lm3533_ctrlbank_set_pwm(&led->cb, pdata->pwm);
+     return lm3533_ctrlbank_set_pwm(&led->cb, led->pwm);
 }

 static int lm3533_led_probe(struct platform_device *pdev)
 {
      struct lm3533 *lm3533;
-     struct lm3533_led_platform_data *pdata;
      struct lm3533_led *led;
      int ret;
@@ -641,12 +644,6 @@ static int lm3533_led_probe(struct platform_device *pdev)
      if (!lm3533)
              return -EINVAL;

-     pdata = dev_get_platdata(&pdev->dev);
-     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);
              return -EINVAL;
@@ -659,8 +656,6 @@ static int lm3533_led_probe(struct platform_device *pdev)
      led->regmap = lm3533->regmap;
      led->have_als = lm3533->have_als;

-     led->cdev.name = pdata->name;
-     led->cdev.default_trigger = pdata->default_trigger;
      led->cdev.brightness_set_blocking = lm3533_led_set;
      led->cdev.brightness_get = lm3533_led_get;
      led->cdev.blink_set = lm3533_led_blink_set;
@@ -668,6 +663,15 @@ static int lm3533_led_probe(struct platform_device *pdev)
      led->cdev.groups = lm3533_led_attribute_groups;
      led->id = pdev->id;

+     led->cdev.name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s-%d",
+                                     pdev->name, led->id);
Is "led-2", etc. unique enough here?
lm3533-leds-2
quoted
+     if (!led->cdev.name)
+             return -ENOMEM;
+
+     led->cdev.default_trigger = "none";
+     device_property_read_string(&pdev->dev, "linux,default-trigger",
+                                 &led->cdev.default_trigger);
+
      mutex_init(&led->mutex);

      /* The class framework makes a callback to get brightness during
@@ -680,15 +684,22 @@ static int lm3533_led_probe(struct platform_device *pdev)

      platform_set_drvdata(pdev, led);

-     ret = led_classdev_register(pdev->dev.parent, &led->cdev);
+     ret = led_classdev_register(&pdev->dev, &led->cdev);
Here too you appear to be reparenting the class devices.
quoted
      if (ret) {
-             dev_err(&pdev->dev, "failed to register LED %d\n", pdev->id);
+             dev_err(&pdev->dev, "failed to register LED %d\n", led->id);
This does not seem to be necessary.
Agreed.
quoted
              return ret;
      }

      led->cb.dev = led->cdev.dev;

-     ret = lm3533_led_setup(led, pdata);
+     device_property_read_u32(&pdev->dev, "led-max-microamp",
+                              &led->max_current);
+     led->max_current = clamp(led->max_current, LM3533_MAX_CURRENT_MIN,
+                              LM3533_MAX_CURRENT_MAX);
Why clamp instead of having lm3533_led_setup() fail below?
According to OF schema default lower margin is set to
LM3533_MAX_CURRENT_MIN so clamping seems a good option here, even
though it will clamp max value.
quoted
+
+     device_property_read_u32(&pdev->dev, "ti,pwm-config-mask", &led->pwm);
+
+     ret = lm3533_led_setup(led);
      if (ret)
              goto err_deregister;
@@ -725,9 +736,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_match_table[] = {
+     { .compatible = "ti,lm3533-leds" },
+     { }
+};
+MODULE_DEVICE_TABLE(of, lm3533_led_match_table);
+
 static struct platform_driver lm3533_led_driver = {
      .driver = {
              .name = "lm3533-leds",
+             .of_match_table = lm3533_led_match_table,
      },
      .probe          = lm3533_led_probe,
      .remove         = lm3533_led_remove,
Remove platform alias below as well.
Why?
quoted
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index b03a3ae96c10..a5aa7da9668b 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -14,19 +14,26 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/mfd/core.h>
+#include <linux/mod_devicetable.h>
+#include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/units.h>

 #include <linux/mfd/lm3533.h>


 #define LM3533_BOOST_OVP_MASK                0x06
 #define LM3533_BOOST_OVP_SHIFT               1
+#define LM3533_BOOST_OVP_MIN         (16 * MICRO)
+#define LM3533_BOOST_OVP_MAX         (40 * MICRO)

 #define LM3533_BOOST_FREQ_MASK               0x01
 #define LM3533_BOOST_FREQ_SHIFT              0
+#define LM3533_BOOST_FREQ_MIN                (500 * HZ_PER_KHZ)
+#define LM3533_BOOST_FREQ_MAX                (1000 * HZ_PER_KHZ)

 #define LM3533_BL_ID_MASK            1
 #define LM3533_LED_ID_MASK           3
@@ -35,6 +42,7 @@

 #define LM3533_HVLED_ID_MAX          2
 #define LM3533_LVLED_ID_MAX          5
+#define LM3533_CELLS_MAX             7

 #define LM3533_REG_OUTPUT_CONF1              0x10
 #define LM3533_REG_OUTPUT_CONF2              0x11
@@ -42,44 +50,6 @@

 #define LM3533_REG_MAX                       0xb2

-
-static struct mfd_cell lm3533_als_devs[] = {
-     {
-             .name   = "lm3533-als",
-             .id     = -1,
-     },
-};
-
-static struct mfd_cell lm3533_bl_devs[] = {
-     {
-             .name   = "lm3533-backlight",
-             .id     = 0,
-     },
-     {
-             .name   = "lm3533-backlight",
-             .id     = 1,
-     },
-};
-
-static struct mfd_cell lm3533_led_devs[] = {
-     {
-             .name   = "lm3533-leds",
-             .id     = 0,
-     },
-     {
-             .name   = "lm3533-leds",
-             .id     = 1,
-     },
-     {
-             .name   = "lm3533-leds",
-             .id     = 2,
-     },
-     {
-             .name   = "lm3533-leds",
-             .id     = 3,
-     },
-};
-
 /*
  * HVLED output config -- output hvled controlled by backlight bl
  */
@@ -301,125 +271,91 @@ static const struct attribute_group *lm3533_attribute_groups[] = {
      NULL,
 };

-static int lm3533_device_als_init(struct lm3533 *lm3533)
-{
-     struct lm3533_platform_data *pdata = dev_get_platdata(lm3533->dev);
-     int ret;
-
-     if (!pdata->als)
-             return 0;
-
-     lm3533_als_devs[0].platform_data = pdata->als;
-     lm3533_als_devs[0].pdata_size = sizeof(*pdata->als);
-
-     ret = mfd_add_devices(lm3533->dev, 0, lm3533_als_devs, 1, NULL,
-                           0, NULL);
-     if (ret) {
-             dev_err(lm3533->dev, "failed to add ALS device\n");
-             return ret;
-     }
-
-     lm3533->have_als = 1;
-
-     return 0;
-}
-
-static int lm3533_device_bl_init(struct lm3533 *lm3533)
-{
-     struct lm3533_platform_data *pdata = dev_get_platdata(lm3533->dev);
-     int i;
-     int ret;
-
-     if (!pdata->backlights || pdata->num_backlights == 0)
-             return 0;
-
-     if (pdata->num_backlights > ARRAY_SIZE(lm3533_bl_devs))
-             pdata->num_backlights = ARRAY_SIZE(lm3533_bl_devs);
-
-     for (i = 0; i < pdata->num_backlights; ++i) {
-             lm3533_bl_devs[i].platform_data = &pdata->backlights[i];
-             lm3533_bl_devs[i].pdata_size = sizeof(pdata->backlights[i]);
-     }
-
-     ret = mfd_add_devices(lm3533->dev, 0, lm3533_bl_devs,
-                           pdata->num_backlights, NULL, 0, NULL);
-     if (ret) {
-             dev_err(lm3533->dev, "failed to add backlight devices\n");
-             return ret;
-     }
-
-     lm3533->have_backlights = 1;
-
-     return 0;
-}
-
-static int lm3533_device_led_init(struct lm3533 *lm3533)
-{
-     struct lm3533_platform_data *pdata = dev_get_platdata(lm3533->dev);
-     int i;
-     int ret;
-
-     if (!pdata->leds || pdata->num_leds == 0)
-             return 0;
-
-     if (pdata->num_leds > ARRAY_SIZE(lm3533_led_devs))
-             pdata->num_leds = ARRAY_SIZE(lm3533_led_devs);
-
-     for (i = 0; i < pdata->num_leds; ++i) {
-             lm3533_led_devs[i].platform_data = &pdata->leds[i];
-             lm3533_led_devs[i].pdata_size = sizeof(pdata->leds[i]);
-     }
-
-     ret = mfd_add_devices(lm3533->dev, 0, lm3533_led_devs,
-                           pdata->num_leds, NULL, 0, NULL);
-     if (ret) {
-             dev_err(lm3533->dev, "failed to add LED devices\n");
-             return ret;
-     }
-
-     lm3533->have_leds = 1;
-
-     return 0;
-}
-
 static int lm3533_device_init(struct lm3533 *lm3533)
 {
-     struct lm3533_platform_data *pdata = dev_get_platdata(lm3533->dev);
+     struct device *dev = lm3533->dev;
+     struct mfd_cell *lm3533_devices;
+     u32 count = 0, reg, nchilds;
Don't mix multiple declarations with initialisation like this.
Checkpatch does not complain on style issue, hence this is not prohibited.
quoted
      int ret;

-     dev_dbg(lm3533->dev, "%s\n", __func__);
+     nchilds = device_get_child_node_count(dev);
+     if (!nchilds || nchilds > LM3533_CELLS_MAX)
+             return dev_err_probe(dev, -ENODEV,
+                                  "num of child nodes is not supported\n");

-     if (!pdata) {
-             dev_err(lm3533->dev, "no platform data\n");
-             return -EINVAL;
-     }
+     lm3533_devices = devm_kcalloc(dev, nchilds, sizeof(*lm3533_devices),
+                                   GFP_KERNEL);
+     if (!lm3533_devices)
+             return -ENOMEM;

-     lm3533->hwen = devm_gpiod_get(lm3533->dev, NULL, GPIOD_OUT_LOW);
-     if (IS_ERR(lm3533->hwen))
-             return dev_err_probe(lm3533->dev, PTR_ERR(lm3533->hwen), "failed to request HWEN GPIO\n");
-     gpiod_set_consumer_name(lm3533->hwen, "lm3533-hwen");
+     device_for_each_child_node_scoped(dev, child) {
+             if (count >= nchilds)
+                     break;
How could count be larger than nchilds?
Only if the tree is malformed, hence this check was added.
quoted
+
+             if (fwnode_device_is_compatible(child, "ti,lm3533-als")) {
+                     lm3533_devices[count].name = "lm3533-als";
+                     lm3533_devices[count].of_compatible = "ti,lm3533-als";
+                     lm3533_devices[count].id = PLATFORM_DEVID_NONE;
+
+                     lm3533->have_als = true;
+                     count++;
+             } else if (fwnode_device_is_compatible(child, "ti,lm3533-backlight")) {
+                     ret = fwnode_property_read_u32(child, "reg", &reg);
+                     if (ret || reg >= LM3533_HVLED_ID_MAX) {
+                             dev_err(dev, "invalid backlight node %pfw\n", child);
+                             continue;
+                     }
+
+                     lm3533_devices[count].name = "lm3533-backlight";
+                     lm3533_devices[count].of_compatible = "ti,lm3533-backlight";
+                     lm3533_devices[count].id = reg;
+                     lm3533_devices[count].of_reg = reg;
+                     lm3533_devices[count].use_of_reg = true;
+
+                     lm3533->have_backlights = true;
+                     count++;
+             } else if (fwnode_device_is_compatible(child, "ti,lm3533-leds")) {
+                     ret = fwnode_property_read_u32(child, "reg", &reg);
+                     if (ret || reg < LM3533_HVLED_ID_MAX ||
+                         reg > LM3533_LVLED_ID_MAX) {
+                             dev_err(dev, "invalid LED node %pfw\n", child);
+                             continue;
+                     }
+
+                     lm3533_devices[count].name = "lm3533-leds";
+                     lm3533_devices[count].of_compatible = "ti,lm3533-leds";
+                     lm3533_devices[count].id = reg - LM3533_HVLED_ID_MAX;
+                     lm3533_devices[count].of_reg = reg;
+                     lm3533_devices[count].use_of_reg = true;
+
+                     lm3533->have_leds = true;
+                     count++;
+             }
+     }
Why do you need the above at all? Shouldn't you be able to just use
of_platform_populate().
of_platform_populate() is not a part of mfd framework.
quoted
      lm3533_enable(lm3533);

      ret = regmap_update_bits(lm3533->regmap, LM3533_REG_BOOST_PWM,
                               LM3533_BOOST_FREQ_MASK,
-                              pdata->boost_freq << LM3533_BOOST_FREQ_SHIFT);
+                              lm3533->boost_freq << LM3533_BOOST_FREQ_SHIFT);
      if (ret) {
-             dev_err(lm3533->dev, "failed to set boost frequency\n");
+             dev_err(dev, "failed to set boost frequency\n");
              goto err_disable;
      }

      ret = regmap_update_bits(lm3533->regmap, LM3533_REG_BOOST_PWM,
                               LM3533_BOOST_OVP_MASK,
-                              pdata->boost_ovp << LM3533_BOOST_OVP_SHIFT);
+                              lm3533->boost_ovp << LM3533_BOOST_OVP_SHIFT);
      if (ret) {
-             dev_err(lm3533->dev, "failed to set boost ovp\n");
+             dev_err(dev, "failed to set boost ovp\n");
              goto err_disable;
      }

-     lm3533_device_als_init(lm3533);
-     lm3533_device_bl_init(lm3533);
-     lm3533_device_led_init(lm3533);
+     ret = mfd_add_devices(dev, 0, lm3533_devices, count, NULL, 0, NULL);
+     if (ret) {
+             dev_err(dev, "failed to add MFD devices: %d\n", ret);
+             goto err_disable;
+     }

      return 0;
@@ -504,7 +440,26 @@ static int lm3533_i2c_probe(struct i2c_client *i2c)
              return PTR_ERR(lm3533->regmap);

      lm3533->dev = &i2c->dev;
-     lm3533->irq = i2c->irq;
+
+     lm3533->hwen = devm_gpiod_get_optional(lm3533->dev, "enable",
+                                            GPIOD_OUT_LOW);
+     if (IS_ERR(lm3533->hwen))
+             return dev_err_probe(lm3533->dev, PTR_ERR(lm3533->hwen),
+                                  "failed to get HWEN GPIO\n");
Please use brackets around multline statements for readability
throughout.
Checkpatch does not complain on style issue, hence this is not prohibited.
quoted
+
+     device_property_read_u32(lm3533->dev, "ti,boost-ovp-microvolt",
+                              &lm3533->boost_ovp);
+
+     lm3533->boost_ovp = clamp(lm3533->boost_ovp, LM3533_BOOST_OVP_MIN,
+                               LM3533_BOOST_OVP_MAX);
+     lm3533->boost_ovp = lm3533->boost_ovp / (8 * MICRO) - 2;
+
+     device_property_read_u32(lm3533->dev, "ti,boost-freq-hz",
+                              &lm3533->boost_freq);
+
+     lm3533->boost_freq = clamp(lm3533->boost_freq, LM3533_BOOST_FREQ_MIN,
+                                LM3533_BOOST_FREQ_MAX);
+     lm3533->boost_freq = lm3533->boost_freq / (500 * KILO) - 1;
Again, why clamp instead of failing probe?
According to OF schema default lower margin is set to
LM3533_BOOST_FREQ_MIN so clamping seems a good option here, even
though it will clamp max value.
quoted
      return lm3533_device_init(lm3533);
 }
@@ -518,6 +473,12 @@ static void lm3533_i2c_remove(struct i2c_client *i2c)
      lm3533_device_exit(lm3533);
 }

+static const struct of_device_id lm3533_match_table[] = {
+     { .compatible = "ti,lm3533" },
+     { }
+};
+MODULE_DEVICE_TABLE(of, lm3533_match_table);
+
 static const struct i2c_device_id lm3533_i2c_ids[] = {
      { "lm3533" },
      { }
@@ -528,6 +489,7 @@ static struct i2c_driver lm3533_i2c_driver = {
      .driver = {
                 .name = "lm3533",
                 .dev_groups = lm3533_attribute_groups,
+                .of_match_table = lm3533_match_table,
      },
      .id_table       = lm3533_i2c_ids,
      .probe          = lm3533_i2c_probe,
diff --git a/drivers/mfd/lm3533-ctrlbank.c b/drivers/mfd/lm3533-ctrlbank.c
index 91e13cfa3cf0..3aab8ece4e8c 100644
--- a/drivers/mfd/lm3533-ctrlbank.c
+++ b/drivers/mfd/lm3533-ctrlbank.c
@@ -13,11 +13,6 @@

 #include <linux/mfd/lm3533.h>

-
-#define LM3533_MAX_CURRENT_MIN               5000
-#define LM3533_MAX_CURRENT_MAX               29800
-#define LM3533_MAX_CURRENT_STEP              800
-
 #define LM3533_PWM_MAX                       0x3f

 #define LM3533_REG_PWM_BASE          0x14
diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
index 9ef171d3aaea..2c24647fc17a 100644
--- a/drivers/video/backlight/lm3533_bl.c
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -9,7 +9,9 @@

 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/backlight.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
@@ -29,6 +31,9 @@ struct lm3533_bl {
      struct backlight_device *bd;
      int id;

+     u32 max_current;
+     u32 pwm;
+
      bool have_als;
 };
@@ -242,25 +247,25 @@ static const struct attribute_group *lm3533_bl_attribute_groups[] = {
      NULL,
 };

-static int lm3533_bl_setup(struct lm3533_bl *bl,
-                                     struct lm3533_bl_platform_data *pdata)
+static int lm3533_bl_setup(struct lm3533_bl *bl)
 {
      int ret;

-     ret = lm3533_ctrlbank_set_max_current(&bl->cb, pdata->max_current);
+     ret = lm3533_ctrlbank_set_max_current(&bl->cb, bl->max_current);
      if (ret)
              return ret;

-     return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);
+     return lm3533_ctrlbank_set_pwm(&bl->cb, bl->pwm);
 }

 static int lm3533_bl_probe(struct platform_device *pdev)
 {
      struct lm3533 *lm3533;
-     struct lm3533_bl_platform_data *pdata;
      struct lm3533_bl *bl;
      struct backlight_device *bd;
      struct backlight_properties props;
+     char *name = NULL;
+     u32 default_brightness = LM3533_BL_MAX_BRIGHTNESS;
      int ret;

      dev_dbg(&pdev->dev, "%s\n", __func__);
@@ -269,12 +274,6 @@ static int lm3533_bl_probe(struct platform_device *pdev)
      if (!lm3533)
              return -EINVAL;

-     pdata = dev_get_platdata(&pdev->dev);
-     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);
              return -EINVAL;
@@ -292,13 +291,21 @@ static int lm3533_bl_probe(struct platform_device *pdev)
      bl->cb.id = lm3533_bl_get_ctrlbank_id(bl);
      bl->cb.dev = NULL;                      /* until registered */

+     name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s-%d",
+                           pdev->name, pdev->id);
Unique enough (e.g. backlight-0)?
lm3533-backlight-0
quoted
+     if (!name)
+             return -ENOMEM;
+
+     device_property_read_u32(&pdev->dev, "default-brightness",
+                              &default_brightness);
+
      memset(&props, 0, sizeof(props));
      props.type = BACKLIGHT_RAW;
      props.max_brightness = LM3533_BL_MAX_BRIGHTNESS;
-     props.brightness = pdata->default_brightness;
-     bd = devm_backlight_device_register(&pdev->dev, pdata->name,
-                                     pdev->dev.parent, bl, &lm3533_bl_ops,
-                                     &props);
+     props.brightness = default_brightness;
+
+     bd = devm_backlight_device_register(&pdev->dev, name, &pdev->dev,
+                                         bl, &lm3533_bl_ops, &props);
Here too you are reparenting, which results in an ABI break.
quoted
      if (IS_ERR(bd)) {
              dev_err(&pdev->dev, "failed to register backlight device\n");
              return PTR_ERR(bd);
@@ -309,12 +316,19 @@ static int lm3533_bl_probe(struct platform_device *pdev)

      platform_set_drvdata(pdev, bl);

-     backlight_update_status(bd);
+     device_property_read_u32(&pdev->dev, "led-max-microamp",
+                              &bl->max_current);
+     bl->max_current = clamp(bl->max_current, LM3533_MAX_CURRENT_MIN,
+                             LM3533_MAX_CURRENT_MAX);
Clamping instead of failing.
quoted
-     ret = lm3533_bl_setup(bl, pdata);
+     device_property_read_u32(&pdev->dev, "ti,pwm-config-mask", &bl->pwm);
+
+     ret = lm3533_bl_setup(bl);
      if (ret)
              return ret;

+     backlight_update_status(bd);
+
      ret = lm3533_ctrlbank_enable(&bl->cb);
      if (ret)
              return ret;
@@ -366,11 +380,18 @@ static void lm3533_bl_shutdown(struct platform_device *pdev)
      lm3533_ctrlbank_disable(&bl->cb);
 }

+static const struct of_device_id lm3533_bl_match_table[] = {
+     { .compatible = "ti,lm3533-backlight" },
+     { }
+};
+MODULE_DEVICE_TABLE(of, lm3533_bl_match_table);
+
 static struct platform_driver lm3533_bl_driver = {
      .driver = {
              .name   = "lm3533-backlight",
              .pm     = &lm3533_bl_pm_ops,
              .dev_groups = lm3533_bl_attribute_groups,
+             .of_match_table = lm3533_bl_match_table,
      },
      .probe          = lm3533_bl_probe,
      .remove         = lm3533_bl_remove,
Drop platform module alias below.

Johan
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help