Merge tag 'backlight-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

Pull backlight updates from Lee Jones:
 "Fix-ups:
   - Remove unused BACKLIGHT_LCD_SUPPORT symbol
   - Remove unused BACKLIGHT_CLASS_DEVICE dependencies
   - Add DT support to lm3630a_bl

  Bug Fixes:
   - Fix error path issues in lm3630a_bl"

* tag 'backlight-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: lm3630a: Add firmware node support
  dt-bindings: backlight: Add lm3630a bindings
  backlight: lm3630a: Return 0 on success in update_status functions
  video: lcd: Remove useless BACKLIGHT_CLASS_DEVICE dependencies
  video: backlight: Remove useless BACKLIGHT_LCD_SUPPORT kernel symbol

12 files changed, 160 insertions, 44 deletions

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 2267e84d5cb4..e360a4a131e1 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -200,7 +200,6 @@ config DRM_RADEON
         select POWER_SUPPLY
         select HWMON
         select BACKLIGHT_CLASS_DEVICE
-        select BACKLIGHT_LCD_SUPPORT
         select INTERVAL_TREE
         help
           Choose this option if you have an ATI Radeon graphics card.  There
@@ -221,7 +220,6 @@ config DRM_AMDGPU
         select POWER_SUPPLY
         select HWMON
         select BACKLIGHT_CLASS_DEVICE
-        select BACKLIGHT_LCD_SUPPORT
         select INTERVAL_TREE
         select CHASH
         help
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 8840f396a7b6..3dff9997f5e3 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -76,7 +76,6 @@ config DRM_PARADE_PS8622
         depends on OF
         select DRM_PANEL
         select DRM_KMS_HELPER
-        select BACKLIGHT_LCD_SUPPORT
         select BACKLIGHT_CLASS_DEVICE
         ---help---
           Parade eDP-LVDS bridge chip driver.
diff --git a/drivers/gpu/drm/fsl-dcu/Kconfig b/drivers/gpu/drm/fsl-dcu/Kconfig
index 14a72c4c496d..dc825883400d 100644
--- a/drivers/gpu/drm/fsl-dcu/Kconfig
+++ b/drivers/gpu/drm/fsl-dcu/Kconfig
@@ -2,7 +2,6 @@ config DRM_FSL_DCU
         tristate "DRM Support for Freescale DCU"
         depends on DRM && OF && ARM && COMMON_CLK
         select BACKLIGHT_CLASS_DEVICE
-        select BACKLIGHT_LCD_SUPPORT
         select DRM_KMS_HELPER
         select DRM_KMS_CMA_HELPER
         select DRM_PANEL
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 148be8e1a090..3d5f1cb6a76c 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -15,7 +15,6 @@ config DRM_I915
         select IRQ_WORK
         # i915 depends on ACPI_VIDEO when ACPI is enabled
         # but for select to work, need to select ACPI_VIDEO's dependencies, ick
-        select BACKLIGHT_LCD_SUPPORT if ACPI
         select BACKLIGHT_CLASS_DEVICE if ACPI
         select INPUT if ACPI
         select ACPI_VIDEO if ACPI
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 553c7da5e8e0..1f1395148ff0 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -5,14 +5,12 @@ config DRM_NOUVEAU
         select DRM_KMS_HELPER
         select DRM_TTM
         select BACKLIGHT_CLASS_DEVICE if DRM_NOUVEAU_BACKLIGHT
-        select BACKLIGHT_LCD_SUPPORT if DRM_NOUVEAU_BACKLIGHT
         select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && INPUT
         select X86_PLATFORM_DEVICES if ACPI && X86
         select ACPI_WMI if ACPI && X86
         select MXM_WMI if ACPI && X86
         select POWER_SUPPLY
         # Similar to i915, we need to select ACPI_VIDEO and it's dependencies
-        select BACKLIGHT_LCD_SUPPORT if ACPI && X86
         select BACKLIGHT_CLASS_DEVICE if ACPI && X86
         select INPUT if ACPI && X86
         select THERMAL if ACPI && X86
diff --git a/drivers/gpu/drm/shmobile/Kconfig b/drivers/gpu/drm/shmobile/Kconfig
index 61bbe8e8bcc5..e2a6c82c8252 100644
--- a/drivers/gpu/drm/shmobile/Kconfig
+++ b/drivers/gpu/drm/shmobile/Kconfig
@@ -4,7 +4,6 @@ config DRM_SHMOBILE
         depends on DRM && ARM
         depends on ARCH_SHMOBILE || COMPILE_TEST
         select BACKLIGHT_CLASS_DEVICE
-        select BACKLIGHT_LCD_SUPPORT
         select DRM_KMS_HELPER
         select DRM_KMS_CMA_HELPER
         select DRM_GEM_CMA_HELPER
diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig
index 52598049c096..cb7df2086aee 100644
--- a/drivers/gpu/drm/tilcdc/Kconfig
+++ b/drivers/gpu/drm/tilcdc/Kconfig
@@ -8,7 +8,6 @@ config DRM_TILCDC
         select DRM_PANEL_BRIDGE
         select VIDEOMODE_HELPERS
         select BACKLIGHT_CLASS_DEVICE
-        select BACKLIGHT_LCD_SUPPORT
         help
           Choose this option if you have an TI SoC with LCDC display
           controller, for example AM33xx in beagle-bone, DA8xx, or
diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig
index 255e266c40e1..f5c716bb3413 100644
--- a/drivers/staging/olpc_dcon/Kconfig
+++ b/drivers/staging/olpc_dcon/Kconfig
@@ -3,7 +3,6 @@ config FB_OLPC_DCON
         tristate "One Laptop Per Child Display CONtroller support"
         depends on OLPC && FB
         depends on I2C
-        depends on BACKLIGHT_LCD_SUPPORT
         depends on (GPIO_CS5535 || GPIO_CS5535=n)
         select BACKLIGHT_CLASS_DEVICE
         help
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index be04c117fe80..c97f270338bf 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -142,7 +142,6 @@ config USB_FTDI_ELAN
 
 config USB_APPLEDISPLAY
         tristate "Apple Cinema Display support"
-        select BACKLIGHT_LCD_SUPPORT
         select BACKLIGHT_CLASS_DEVICE
         help
           Say Y here if you want to control the backlight of Apple Cinema
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 71ee978c848f..3ed1d9084f94 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -2,13 +2,7 @@
 # Backlight & LCD drivers configuration
 #
 
-menuconfig BACKLIGHT_LCD_SUPPORT
-        bool "Backlight & LCD device support"
-        help
-          Enable this to be able to choose the drivers for controlling the
-          backlight and the LCD panel on some platforms, for example on PDAs.
-
-if BACKLIGHT_LCD_SUPPORT
+menu "Backlight & LCD device support"
 
 #
 # LCD
@@ -199,7 +193,6 @@ config BACKLIGHT_IPAQ_MICRO
 
 config BACKLIGHT_LM3533
         tristate "Backlight Driver for LM3533"
-        depends on BACKLIGHT_CLASS_DEVICE
         depends on MFD_LM3533
         help
           Say Y to enable the backlight driver for National Semiconductor / TI
@@ -323,7 +316,7 @@ config BACKLIGHT_ADP5520
 
 config BACKLIGHT_ADP8860
         tristate "Backlight Driver for ADP8860/ADP8861/ADP8863 using WLED"
-        depends on BACKLIGHT_CLASS_DEVICE && I2C
+        depends on I2C
         select NEW_LEDS
         select LEDS_CLASS
         help
@@ -335,7 +328,7 @@ config BACKLIGHT_ADP8860
 
 config BACKLIGHT_ADP8870
         tristate "Backlight Driver for ADP8870 using WLED"
-        depends on BACKLIGHT_CLASS_DEVICE && I2C
+        depends on I2C
         select NEW_LEDS
         select LEDS_CLASS
         help
@@ -353,28 +346,28 @@ config BACKLIGHT_88PM860X
 
 config BACKLIGHT_PCF50633
         tristate "Backlight driver for NXP PCF50633 MFD"
-        depends on BACKLIGHT_CLASS_DEVICE && MFD_PCF50633
+        depends on MFD_PCF50633
         help
           If you have a backlight driven by a NXP PCF50633 MFD, say Y here to
           enable its driver.
 
 config BACKLIGHT_AAT2870
         tristate "AnalogicTech AAT2870 Backlight"
-        depends on BACKLIGHT_CLASS_DEVICE && MFD_AAT2870_CORE
+        depends on MFD_AAT2870_CORE
         help
           If you have a AnalogicTech AAT2870 say Y to enable the
           backlight driver.
 
 config BACKLIGHT_LM3630A
         tristate "Backlight Driver for LM3630A"
-        depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM
+        depends on I2C && PWM
         select REGMAP_I2C
         help
           This supports TI LM3630A Backlight Driver
 
 config BACKLIGHT_LM3639
         tristate "Backlight Driver for LM3639"
-        depends on BACKLIGHT_CLASS_DEVICE && I2C
+        depends on I2C
         select REGMAP_I2C
         select NEW_LEDS
         select LEDS_CLASS
@@ -383,20 +376,20 @@ config BACKLIGHT_LM3639
 
 config BACKLIGHT_LP855X
         tristate "Backlight driver for TI LP855X"
-        depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM
+        depends on I2C && PWM
         help
           This supports TI LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and
           LP8557 backlight driver.
 
 config BACKLIGHT_LP8788
         tristate "Backlight driver for TI LP8788 MFD"
-        depends on BACKLIGHT_CLASS_DEVICE && MFD_LP8788 && PWM
+        depends on MFD_LP8788 && PWM
         help
           This supports TI LP8788 backlight driver.
 
 config BACKLIGHT_OT200
         tristate "Backlight driver for ot200 visualisation device"
-        depends on BACKLIGHT_CLASS_DEVICE && CS5535_MFGPT && GPIO_CS5535
+        depends on CS5535_MFGPT && GPIO_CS5535
         help
           To compile this driver as a module, choose M here: the module will be
           called ot200_bl.
@@ -410,7 +403,7 @@ config BACKLIGHT_PANDORA
 
 config BACKLIGHT_SKY81452
         tristate "Backlight driver for SKY81452"
-        depends on BACKLIGHT_CLASS_DEVICE && MFD_SKY81452
+        depends on MFD_SKY81452
         help
           If you have a Skyworks SKY81452, say Y to enable the
           backlight driver.
@@ -420,14 +413,14 @@ config BACKLIGHT_SKY81452
 
 config BACKLIGHT_TPS65217
         tristate "TPS65217 Backlight"
-        depends on BACKLIGHT_CLASS_DEVICE && MFD_TPS65217
+        depends on MFD_TPS65217
         help
           If you have a Texas Instruments TPS65217 say Y to enable the
           backlight driver.
 
 config BACKLIGHT_AS3711
         tristate "AS3711 Backlight"
-        depends on BACKLIGHT_CLASS_DEVICE && MFD_AS3711
+        depends on MFD_AS3711
         help
           If you have an Austrian Microsystems AS3711 say Y to enable the
           backlight driver.
@@ -466,4 +459,4 @@ config BACKLIGHT_RAVE_SP
 
 endif # BACKLIGHT_CLASS_DEVICE
 
-endif # BACKLIGHT_LCD_SUPPORT
+endmenu
diff --git a/drivers/video/backlight/lm3630a_bl.c b/drivers/video/backlight/lm3630a_bl.c
index 2030a6b77a09..75d996490cf0 100644
--- a/drivers/video/backlight/lm3630a_bl.c
+++ b/drivers/video/backlight/lm3630a_bl.c
@@ -35,6 +35,14 @@
 #define REG_MAX         0x50
 
 #define INT_DEBOUNCE_MSEC       10
+
+#define LM3630A_BANK_0          0
+#define LM3630A_BANK_1          1
+
+#define LM3630A_NUM_SINKS       2
+#define LM3630A_SINK_0          0
+#define LM3630A_SINK_1          1
+
 struct lm3630a_chip {
         struct device *dev;
         struct delayed_work work;
@@ -201,7 +209,7 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl)
                                       LM3630A_LEDA_ENABLE, LM3630A_LEDA_ENABLE);
         if (ret < 0)
                 goto out_i2c_err;
-        return bl->props.brightness;
+        return 0;
 
 out_i2c_err:
         dev_err(pchip->dev, "i2c failed to access\n");
@@ -278,7 +286,7 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl)
                                       LM3630A_LEDB_ENABLE, LM3630A_LEDB_ENABLE);
         if (ret < 0)
                 goto out_i2c_err;
-        return bl->props.brightness;
+        return 0;
 
 out_i2c_err:
         dev_err(pchip->dev, "i2c failed to access REG_CTRL\n");
@@ -329,15 +337,17 @@ static const struct backlight_ops lm3630a_bank_b_ops = {
 
 static int lm3630a_backlight_register(struct lm3630a_chip *pchip)
 {
-        struct backlight_properties props;
         struct lm3630a_platform_data *pdata = pchip->pdata;
+        struct backlight_properties props;
+        const char *label;
 
         props.type = BACKLIGHT_RAW;
         if (pdata->leda_ctrl != LM3630A_LEDA_DISABLE) {
                 props.brightness = pdata->leda_init_brt;
                 props.max_brightness = pdata->leda_max_brt;
+                label = pdata->leda_label ? pdata->leda_label : "lm3630a_leda";
                 pchip->bleda =
-                    devm_backlight_device_register(pchip->dev, "lm3630a_leda",
+                    devm_backlight_device_register(pchip->dev, label,
                                                    pchip->dev, pchip,
                                                    &lm3630a_bank_a_ops, &props);
                 if (IS_ERR(pchip->bleda))
@@ -348,8 +358,9 @@ static int lm3630a_backlight_register(struct lm3630a_chip *pchip)
             (pdata->ledb_ctrl != LM3630A_LEDB_ON_A)) {
                 props.brightness = pdata->ledb_init_brt;
                 props.max_brightness = pdata->ledb_max_brt;
+                label = pdata->ledb_label ? pdata->ledb_label : "lm3630a_ledb";
                 pchip->bledb =
-                    devm_backlight_device_register(pchip->dev, "lm3630a_ledb",
+                    devm_backlight_device_register(pchip->dev, label,
                                                    pchip->dev, pchip,
                                                    &lm3630a_bank_b_ops, &props);
                 if (IS_ERR(pchip->bledb))
@@ -364,6 +375,123 @@ static const struct regmap_config lm3630a_regmap = {
         .max_register = REG_MAX,
 };
 
+static int lm3630a_parse_led_sources(struct fwnode_handle *node,
+                                     int default_led_sources)
+{
+        u32 sources[LM3630A_NUM_SINKS];
+        int ret, num_sources, i;
+
+        num_sources = fwnode_property_read_u32_array(node, "led-sources", NULL,
+                                                     0);
+        if (num_sources < 0)
+                return default_led_sources;
+        else if (num_sources > ARRAY_SIZE(sources))
+                return -EINVAL;
+
+        ret = fwnode_property_read_u32_array(node, "led-sources", sources,
+                                             num_sources);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < num_sources; i++) {
+                if (sources[i] < LM3630A_SINK_0 || sources[i] > LM3630A_SINK_1)
+                        return -EINVAL;
+
+                ret |= BIT(sources[i]);
+        }
+
+        return ret;
+}
+
+static int lm3630a_parse_bank(struct lm3630a_platform_data *pdata,
+                              struct fwnode_handle *node, int *seen_led_sources)
+{
+        int led_sources, ret;
+        const char *label;
+        u32 bank, val;
+        bool linear;
+
+        ret = fwnode_property_read_u32(node, "reg", &bank);
+        if (ret)
+                return ret;
+
+        if (bank < LM3630A_BANK_0 || bank > LM3630A_BANK_1)
+                return -EINVAL;
+
+        led_sources = lm3630a_parse_led_sources(node, BIT(bank));
+        if (led_sources < 0)
+                return led_sources;
+
+        if (*seen_led_sources & led_sources)
+                return -EINVAL;
+
+        *seen_led_sources |= led_sources;
+
+        linear = fwnode_property_read_bool(node,
+                                           "ti,linear-mapping-mode");
+        if (bank) {
+                if (led_sources & BIT(LM3630A_SINK_0) ||
+                    !(led_sources & BIT(LM3630A_SINK_1)))
+                        return -EINVAL;
+
+                pdata->ledb_ctrl = linear ?
+                        LM3630A_LEDB_ENABLE_LINEAR :
+                        LM3630A_LEDB_ENABLE;
+        } else {
+                if (!(led_sources & BIT(LM3630A_SINK_0)))
+                        return -EINVAL;
+
+                pdata->leda_ctrl = linear ?
+                        LM3630A_LEDA_ENABLE_LINEAR :
+                        LM3630A_LEDA_ENABLE;
+
+                if (led_sources & BIT(LM3630A_SINK_1))
+                        pdata->ledb_ctrl = LM3630A_LEDB_ON_A;
+        }
+
+        ret = fwnode_property_read_string(node, "label", &label);
+        if (!ret) {
+                if (bank)
+                        pdata->ledb_label = label;
+                else
+                        pdata->leda_label = label;
+        }
+
+        ret = fwnode_property_read_u32(node, "default-brightness",
+                                       &val);
+        if (!ret) {
+                if (bank)
+                        pdata->ledb_init_brt = val;
+                else
+                        pdata->leda_init_brt = val;
+        }
+
+        ret = fwnode_property_read_u32(node, "max-brightness", &val);
+        if (!ret) {
+                if (bank)
+                        pdata->ledb_max_brt = val;
+                else
+                        pdata->leda_max_brt = val;
+        }
+
+        return 0;
+}
+
+static int lm3630a_parse_node(struct lm3630a_chip *pchip,
+                              struct lm3630a_platform_data *pdata)
+{
+        int ret = -ENODEV, seen_led_sources = 0;
+        struct fwnode_handle *node;
+
+        device_for_each_child_node(pchip->dev, node) {
+                ret = lm3630a_parse_bank(pdata, node, &seen_led_sources);
+                if (ret)
+                        return ret;
+        }
+
+        return ret;
+}
+
 static int lm3630a_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
@@ -396,13 +524,18 @@ static int lm3630a_probe(struct i2c_client *client,
                                      GFP_KERNEL);
                 if (pdata == NULL)
                         return -ENOMEM;
+
                 /* default values */
-                pdata->leda_ctrl = LM3630A_LEDA_ENABLE;
-                pdata->ledb_ctrl = LM3630A_LEDB_ENABLE;
                 pdata->leda_max_brt = LM3630A_MAX_BRIGHTNESS;
                 pdata->ledb_max_brt = LM3630A_MAX_BRIGHTNESS;
                 pdata->leda_init_brt = LM3630A_MAX_BRIGHTNESS;
                 pdata->ledb_init_brt = LM3630A_MAX_BRIGHTNESS;
+
+                rval = lm3630a_parse_node(pchip, pdata);
+                if (rval) {
+                        dev_err(&client->dev, "fail : parse node\n");
+                        return rval;
+                }
         }
         pchip->pdata = pdata;
 
@@ -470,11 +603,17 @@ static const struct i2c_device_id lm3630a_id[] = {
         {}
 };
 
+static const struct of_device_id lm3630a_match_table[] = {
+        { .compatible = "ti,lm3630a", },
+        { },
+};
+
 MODULE_DEVICE_TABLE(i2c, lm3630a_id);
 
 static struct i2c_driver lm3630a_i2c_driver = {
         .driver = {
                    .name = LM3630A_NAME,
+                   .of_match_table = lm3630a_match_table,
                    },
         .probe = lm3630a_probe,
         .remove = lm3630a_remove,
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 47ecf9ad4d51..bf6b77b964f1 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -186,7 +186,6 @@ config FB_MACMODES
 config FB_BACKLIGHT
         tristate
         depends on FB
-        select BACKLIGHT_LCD_SUPPORT
         select BACKLIGHT_CLASS_DEVICE
 
 config FB_MODE_HELPERS
@@ -281,7 +280,6 @@ config FB_ARMCLCD
         select FB_CFB_IMAGEBLIT
         select FB_MODE_HELPERS if OF
         select VIDEOMODE_HELPERS if OF
-        select BACKLIGHT_LCD_SUPPORT if OF
         select BACKLIGHT_CLASS_DEVICE if OF
         help
           This framebuffer device driver is for the ARM PrimeCell PL110
@@ -307,7 +305,6 @@ config FB_ACORN
 config FB_CLPS711X
         tristate "CLPS711X LCD support"
         depends on FB && (ARCH_CLPS711X || COMPILE_TEST)
-        select BACKLIGHT_LCD_SUPPORT
         select FB_MODE_HELPERS
         select FB_SYS_FILLRECT
         select FB_SYS_COPYAREA
@@ -335,7 +332,6 @@ config FB_SA1100
 config FB_IMX
         tristate "Freescale i.MX1/21/25/27 LCD support"
         depends on FB && ARCH_MXC
-        select BACKLIGHT_LCD_SUPPORT
         select LCD_CLASS_DEVICE
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -2184,7 +2180,6 @@ config FB_MX3
         tristate "MX3 Framebuffer support"
         depends on FB && MX3_IPU
         select BACKLIGHT_CLASS_DEVICE
-        select BACKLIGHT_LCD_SUPPORT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT