Commit 6448cbf6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:
 "New Drivers:
   - Add support for KTD253

  Fix-ups:
   - Add Device Tree documentation; common, kinetic,ktd253
   - Use correct header(s); tosa_lcd, tosa_bl

  Bug Fixes:
   - Fix refcount imbalance; sky81452-backlight"

* tag 'backlight-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: tosa_bl: Include the right header
  backlight: tosa_lcd: Include the right header
  backlight: Add Kinetic KTD253 backlight driver
  dt-bindings: backlight: Add Kinetic KTD253 bindings
  dt-bindings: backlight: Add some common backlight properties
  backlight: sky81452-backlight: Fix refcount imbalance on error
parents 1a31c123 97ecfda1

Documentation/devicetree/bindings/leds/backlight/common.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/leds/backlight/common.yaml#

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



title: Common backlight properties



maintainers:

  - Lee Jones <lee.jones@linaro.org>

  - Daniel Thompson <daniel.thompson@linaro.org>

  - Jingoo Han <jingoohan1@gmail.com>



description:

  Backlight devices provide backlight for different types of graphical

  displays. They are typically but not necessarily implemented using a white

  LED powered by a boost converter.



properties:

  default-brightness:

    description:

      The default brightness that should be applied to the LED by the operating

      system on start-up. The brightness should not exceed the brightness the

      LED can provide.

    $ref: /schemas/types.yaml#definitions/uint32



  max-brightness:

    description:

      Normally the maximum brightness is determined by the hardware and this

      property is not required. This property is used to put a software limit

      on the brightness apart from what the driver says, as it could happen

      that a LED can be made so bright that it gets damaged or causes damage

      due to restrictions in a specific system, such as mounting conditions.

    $ref: /schemas/types.yaml#definitions/uint32

Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.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,ktd253.yaml#

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



title: Kinetic Technologies KTD253 one-wire backlight



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>



description: |

  The Kinetic Technologies KTD253 is a white LED backlight that is

  controlled by a single GPIO line. If you just turn on the backlight

  it goes to maximum backlight then you can set the level of backlight

  using pulses on the enable wire. This is sometimes referred to as

  "expresswire".



allOf:

  - $ref: common.yaml#



properties:

  compatible:

    const: kinetic,ktd253



  enable-gpios:

    description: GPIO to use to enable/disable and dim the backlight.

    maxItems: 1



  default-brightness: true

  max-brightness: true



required:

  - compatible

  - enable-gpios



additionalProperties: false



examples:

  - |

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

    backlight {

        compatible = "kinetic,ktd253";

        enable-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;

        default-brightness = <13>;

    };

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -9760,6 +9760,12 @@ F: Documentation/admin-guide/auxdisplay/ks0108.rst 
F:	drivers/auxdisplay/ks0108.c

F:	include/linux/ks0108.h













KTD253 BACKLIGHT DRIVER













M:	Linus Walleij <linus.walleij@linaro.org>













S:	Maintained













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













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



























L3MDEV















M:	David Ahern <dsahern@kernel.org>















L:	netdev@vger.kernel.org

































drivers/video/backlight/Kconfig



+8
−0






























Original line number
Diff line number
Diff line








@@ -182,6 +182,14 @@ config BACKLIGHT_IPAQ_MICRO













	  computers. Say yes if you have one of the h3100/h3600/h3700















	  machines.





























config BACKLIGHT_KTD253













	tristate "Backlight Driver for Kinetic KTD253"













	depends on GPIOLIB || COMPILE_TEST













	help













	  Say y to enabled the backlight driver for the Kinetic KTD253













	  which is a 1-wire GPIO-controlled backlight found in some mobile













	  phones.





























config BACKLIGHT_LM3533















	tristate "Backlight Driver for LM3533"















	depends on MFD_LM3533

































drivers/video/backlight/Makefile



+1
−0






























Original line number
Diff line number
Diff line








@@ -35,6 +35,7 @@ obj-$(CONFIG_BACKLIGHT_GPIO)		+= gpio_backlight.o













obj-$(CONFIG_BACKLIGHT_HP680)		+= hp680_bl.o















obj-$(CONFIG_BACKLIGHT_HP700)		+= jornada720_bl.o















obj-$(CONFIG_BACKLIGHT_IPAQ_MICRO)	+= ipaq_micro_bl.o













obj-$(CONFIG_BACKLIGHT_KTD253)		+= ktd253-backlight.o















obj-$(CONFIG_BACKLIGHT_LM3533)		+= lm3533_bl.o















obj-$(CONFIG_BACKLIGHT_LM3630A)		+= lm3630a_bl.o















obj-$(CONFIG_BACKLIGHT_LM3639)		+= lm3639_bl.o









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE