Commit f3d8f29d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:
 "New Drivers:
   - Add support for Kinetic KTD2801 Backlight

  Fix-ups:
   - Fix include lists; alphabetise, remove unused, explicitly add used
   - Device Tree binding adaptions/conversions/creation
   - Use dev_err_probe() to clean-up error paths
   - Use/convert to new/better APIs/helpers/MACROs instead of hand-rolling implementations

  Bug Fixes:
   - Fix changes of NULL pointer dereference
   - Remedy a bunch of logic errors
   - Initialise (zero) Backlight properties data structures"

* tag 'backlight-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: (32 commits)
  backlight: pandora_bl: Drop unneeded ENOMEM error message
  backlight: lm3630a_bl: Simplify probe return on gpio request error
  backlight: lm3630a_bl: Handle deferred probe
  backlight: as3711_bl: Handle deferred probe
  backlight: bd6107: Handle deferred probe
  backlight: l4f00242t03: Simplify with dev_err_probe()
  backlight: gpio: Simplify with dev_err_probe()
  backlight: lp8788: Fully initialize backlight_properties during probe
  backlight: lm3639: Fully initialize backlight_properties during probe
  backlight: da9052: Fully initialize backlight_properties during probe
  backlight: lm3630a: Use backlight_get_brightness helper in update_status
  backlight: lm3630a: Don't set bl->props.brightness in get_brightness
  backlight: lm3630a: Initialize backlight_properties on init
  backlight: mp3309c: Fully initialize backlight_properties during probe
  backlight: mp3309c: Utilise temporary variable for struct device
  backlight: mp3309c: Use dev_err_probe() instead of dev_err()
  backlight: mp3309c: Make use of device properties
  dt-bindings: backlight: qcom-wled: Fix bouncing email addresses
  backlight: hx8357: Utilise temporary variable for struct device
  backlight: hx8357: Make use of dev_err_probe()
  ...
parents 8403ce70 b49c1cac

Documentation/devicetree/bindings/leds/backlight/kinetic,ktd2801.yaml

0 → 100644
+46 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/leds/backlight/kinetic,ktd2801.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Kinetic Technologies KTD2801 one-wire backlight



maintainers:

  - Duje Mihanović <duje.mihanovic@skole.hr>



description: |

  The Kinetic Technologies KTD2801 is a LED backlight driver controlled

  by a single GPIO line. The driver can be controlled with a PWM signal

  or by pulsing the GPIO line to set the backlight level. This is called

  "ExpressWire".



allOf:

  - $ref: common.yaml#



properties:

  compatible:

    const: kinetic,ktd2801



  ctrl-gpios:

    maxItems: 1



  default-brightness: true

  max-brightness: true



required:

  - compatible

  - ctrl-gpios



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    backlight {

        compatible = "kinetic,ktd2801";

        ctrl-gpios = <&gpio 97 GPIO_ACTIVE_HIGH>;

        max-brightness = <210>;

        default-brightness = <100>;

    };

Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Qualcomm Technologies, Inc. WLED driver



maintainers:

  - Bjorn Andersson <bjorn.andersson@linaro.org>

  - Kiran Gunda <kgunda@codeaurora.org>

  - Bjorn Andersson <andersson@kernel.org>

  - Kiran Gunda <quic_kgunda@quicinc.com>



description: |

  WLED (White Light Emitting Diode) driver is used for controlling display

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -8039,6 +8039,13 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git

F:	fs/exfat/









EXPRESSWIRE PROTOCOL LIBRARY









M:	Duje Mihanović <duje.mihanovic@skole.hr>









L:	linux-leds@vger.kernel.org









S:	Maintained









F:	drivers/leds/leds-expresswire.c









F:	include/linux/leds-expresswire.h

















EXT2 FILE SYSTEM









M:	Jan Kara <jack@suse.com>









L:	linux-ext4@vger.kernel.org








@@ -12103,6 +12110,12 @@ S:	Maintained







F:	Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml









F:	drivers/video/backlight/ktd253-backlight.c

















KTD2801 BACKLIGHT DRIVER









M:	Duje Mihanović <duje.mihanovic@skole.hr>









S:	Maintained









F:	Documentation/devicetree/bindings/leds/backlight/kinetic,ktd2801.yaml









F:	drivers/video/backlight/ktd2801-backlight.c

















KTEST









M:	Steven Rostedt <rostedt@goodmis.org>









M:	John Hawley <warthog9@eaglescrag.net>
































drivers/leds/Kconfig



+4
−0






























Original line number
Diff line number
Diff line







@@ -186,6 +186,10 @@ config LEDS_EL15203000







	  To compile this driver as a module, choose M here: the module









	  will be called leds-el15203000.



















config LEDS_EXPRESSWIRE









	bool









	depends on GPIOLIB



















config LEDS_TURRIS_OMNIA









	tristate "LED support for CZ.NIC's Turris Omnia"









	depends on LEDS_CLASS_MULTICOLOR
































drivers/leds/Makefile



+3
−0






























Original line number
Diff line number
Diff line







@@ -91,6 +91,9 @@ obj-$(CONFIG_LEDS_WM831X_STATUS)	+= leds-wm831x-status.o







obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o









obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o



















# Kinetic ExpressWire Protocol









obj-$(CONFIG_LEDS_EXPRESSWIRE)		+= leds-expresswire.o



















# LED SPI Drivers









obj-$(CONFIG_LEDS_CR0014114)		+= leds-cr0014114.o









obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o