Commit 831462ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull LED updates from Lee Jones:
 "Improvements & Fixes:

   - A fix for QCOM Flash to prevent incorrect register access when the
     driver is re-bound. This is solved by duplicating a static register
     array during the probe function, which prevents register addresses
     from being miscalculated after multiple binds

   - The LP50xx driver now correctly handles the 'reg' property in
     device tree child nodes to ensure the multi_index is set correctly.
     This prevents issues where LEDs could be controlled incorrectly if
     the device tree nodes were processed in a different order. An error
     is returned if the reg property is missing or out of range

   - Add a Kconfig dependency on between TPS6131x and
     V4L2_FLASH_LED_CLASS to prevent a build failure when the driver is
     built-in and the V4L2 flash infrastructure is a loadable module

   - Fix a potential buffer overflow warning in PCA955x reported by
     older GCC versions by using a more precise format specifier when
     creating the default LED label.

  Cleanups & Refactoring:

   - Correct the MAINTAINERS file entry for the TPS6131X flash LED
     driver to point to the correct device tree binding file name

   - Fix a comment in the Flash Class for the flash_timeout setter to
     "flash timeout" from "flash duration" for accuracy

   - The of_led_get() function is no longer exported as it has no users
     outside of its own module.

  Removals:

   - Revert the commit to configure LED blink intervals for hardware
     offload in the Netdev Trigger. This change was found to break
     existing PHY drivers by putting their LEDs into a permanent,
     unconditional blinking state.

  Device Tree Bindings Updates:

   - Update the binding for LP50xx to document that the child reg
     property is the index within the LED bank. The example was also
     updated to use correct values

   - Update the JNCP5623 binding to add 0x39 as a valid I2C address, as
     it is used by the NCP5623C variant"

* tag 'leds-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds:
  dt-bindings: leds: ncp5623: Add 0x39 as a valid I2C address
  Revert "leds: trigger: netdev: Configure LED blink interval for HW offload"
  leds: pca955x: Avoid potential overflow when filling default_label (take 2)
  leds: Unexport of_led_get()
  leds: tps6131x: Add V4L2_FLASH_LED_CLASS dependency
  dt-bindings: leds: lp50xx: Document child reg, fix example
  leds: leds-lp50xx: Handle reg to get correct multi_index
  leds: led-class-flash:: Fix flash_timeout comment
  MAINTAINERS: Adjust file entry in TPS6131X FLASH LED DRIVER
  leds: flash: leds-qcom-flash: Fix registry access after re-bind
parents 24e5c324 4903924a

Documentation/devicetree/bindings/leds/leds-lp50xx.yaml

+12 −7
Original line number Diff line number Diff line
@@ -81,7 +81,12 @@ patternProperties: 


        properties:

          reg:

            maxItems: 1

            items:

              - minimum: 0

                maximum: 2



            description:

              This property denotes the index within the LED bank.



        required:

          - reg
@@ -138,18 +143,18 @@ examples: 
                color = <LED_COLOR_ID_RGB>;

                function = LED_FUNCTION_STANDBY;



                led@3 {

                    reg = <0x3>;

                led@0 {

                    reg = <0x0>;

                    color = <LED_COLOR_ID_RED>;

                };



                led@4 {

                    reg = <0x4>;

                led@1 {

                    reg = <0x1>;

                    color = <LED_COLOR_ID_GREEN>;

                };



                led@5 {

                    reg = <0x5>;

                led@2 {

                    reg = <0x2>;

                    color = <LED_COLOR_ID_BLUE>;

                };

            };

Documentation/devicetree/bindings/leds/onnn,ncp5623.yaml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ properties: 
      - onnn,ncp5623



  reg:

    const: 0x38

    enum:

      - 0x38

      - 0x39



  multi-led:

    type: object

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -24813,7 +24813,7 @@ TEXAS INSTRUMENTS TPS6131X FLASH LED DRIVER 
M:	Matthias Fend <matthias.fend@emfend.at>

L:	linux-leds@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/leds/ti,tps6131x.yaml

F:	Documentation/devicetree/bindings/leds/ti,tps61310.yaml

F:	drivers/leds/flash/leds-tps6131x.c









TEXAS INSTRUMENTS' DAC7612 DAC DRIVER

























drivers/leds/flash/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -136,6 +136,7 @@ config LEDS_TPS6131X







	tristate "LED support for TI TPS6131x flash LED driver"









	depends on I2C && OF









	depends on GPIOLIB









	depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS









	select REGMAP_I2C









	help









	  This option enables support for Texas Instruments TPS61310/TPS61311
































drivers/leds/flash/leds-qcom-flash.c



+11
−4






























Original line number
Diff line number
Diff line







@@ -117,7 +117,7 @@ enum {







	REG_MAX_COUNT,









};



















static struct reg_field mvflash_3ch_regs[REG_MAX_COUNT] = {









static const struct reg_field mvflash_3ch_regs[REG_MAX_COUNT] = {









	REG_FIELD(0x08, 0, 7),			/* status1	*/









	REG_FIELD(0x09, 0, 7),                  /* status2	*/









	REG_FIELD(0x0a, 0, 7),                  /* status3	*/








@@ -132,7 +132,7 @@ static struct reg_field mvflash_3ch_regs[REG_MAX_COUNT] = {







	REG_FIELD(0x58, 0, 2),			/* therm_thrsh3 */









};



















static struct reg_field mvflash_4ch_regs[REG_MAX_COUNT] = {









static const struct reg_field mvflash_4ch_regs[REG_MAX_COUNT] = {









	REG_FIELD(0x06, 0, 7),			/* status1	*/









	REG_FIELD(0x07, 0, 6),			/* status2	*/









	REG_FIELD(0x09, 0, 7),			/* status3	*/








@@ -854,11 +854,17 @@ static int qcom_flash_led_probe(struct platform_device *pdev)







	if (val == FLASH_SUBTYPE_3CH_PM8150_VAL || val == FLASH_SUBTYPE_3CH_PMI8998_VAL) {









		flash_data->hw_type = QCOM_MVFLASH_3CH;









		flash_data->max_channels = 3;









		regs = mvflash_3ch_regs;









		regs = devm_kmemdup(dev, mvflash_3ch_regs, sizeof(mvflash_3ch_regs),









				    GFP_KERNEL);









		if (!regs)









			return -ENOMEM;









	} else if (val == FLASH_SUBTYPE_4CH_VAL) {









		flash_data->hw_type = QCOM_MVFLASH_4CH;









		flash_data->max_channels = 4;









		regs = mvflash_4ch_regs;









		regs = devm_kmemdup(dev, mvflash_4ch_regs, sizeof(mvflash_4ch_regs),









				    GFP_KERNEL);









		if (!regs)









			return -ENOMEM;



















		rc = regmap_read(regmap, reg_base + FLASH_REVISION_REG, &val);









		if (rc < 0) {








@@ -880,6 +886,7 @@ static int qcom_flash_led_probe(struct platform_device *pdev)







		dev_err(dev, "Failed to allocate regmap field, rc=%d\n", rc);









		return rc;









	}









	devm_kfree(dev, regs); /* devm_regmap_field_bulk_alloc() makes copies */



















	platform_set_drvdata(pdev, flash_data);









	mutex_init(&flash_data->lock);