Commit 025cf4dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Removed Drivers:
   - Toshiba Sharp SL-6000 LCD and Backlight

  Fix-ups:
   - Provide some profiling optimisations with respect to
     pwm_get_state() and pwm_apply_state()
   - Make use of the dev_err_probe() API
   - Provide some Device Tree documentation additions / adaptions
   - Drop fall-back legacy PWM probing support
   - Convert over to new I2C probing API
   - Fix incorrect documentation
   - Make use of backlight_get_brightness() API

  Bug Fixes:
   - Fix disabling backlight on i.MX6 when inverted PWMs are used"

* tag 'backlight-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: ktz8866: Convert to i2c's .probe_new()
  backlight: ktz8866: Add support for Kinetic KTZ8866 backlight
  dt-bindings: leds: backlight: Add Kinetic KTZ8866 backlight
  backlight: pwm_bl: Don't rely on a disabled PWM emiting inactive state
  backlight: pwm_bl: Configure pwm only once per backlight toggle
  backlight: Remove pxa tosa support
  backlight: aat2870: Use backlight helper
  backlight: ipaq_micro: Use backlight helper
  backlight: arcxcnn: Use backlight helper
  backlight: sky81452: Fix sky81452_bl_platform_data kernel-doc
  backlight: pwm_bl: Drop support for legacy PWM probing
  dt-bindings: backlight: qcom-wled: Add PMI8950 compatible
  backlight: ktd253: Switch to use dev_err_probe() helper
  backlight: backlight: Fix doc for backlight_device_get_by_name
parents c2c23dc7 ad614f81

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

0 → 100644
+76 −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,ktz8866.yaml#

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



title: Kinetic Technologies KTZ8866 backlight



maintainers:

  - Jianhua Lu <lujianhua000@gmail.com>



description: |

  The Kinetic Technologies KTZ8866 is a high efficiency 6-channels-current-sinks

  led backlight with dual lcd bias power.

  https://www.kinet-ic.com/ktz8866/



allOf:

  - $ref: common.yaml#



properties:

  compatible:

    const: kinetic,ktz8866



  vddpos-supply:

    description: positive boost supply regulator.



  vddneg-supply:

    description: negative boost supply regulator.



  enable-gpios:

    description: GPIO to use to enable/disable the backlight (HWEN pin).

    maxItems: 1



  current-num-sinks:

    description: number of the LED current sinks' channels.

    enum: [1, 2, 3, 4, 5, 6]



  kinetic,current-ramp-delay-ms:

    description: |

      LED current ramping delay time in milliseconds, note that the

      case 1 will be mapped to 1μs.

    enum: [1, 2, 4, 8, 16, 32, 64, 128, 192, 256, 320, 384, 448, 512, 576, 640]



  kinetic,led-enable-ramp-delay-ms:

    description: |

      LED on/off ramping delay time in milliseconds, note that the case 0 will be

      mapped to 512μs because ktz8866 can't ramp faster than it.

    enum: [0, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384]



  kinetic,enable-lcd-bias:

    description: Set if we want to output bias power supply for LCD.

    type: boolean



required:

  - compatible

  - vddpos-supply

  - vddneg-supply

  - enable-gpios



unevaluatedProperties: false



examples:

  - |

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



    backlight {

        compatible = "kinetic,ktz8866";



        vddpos-supply = <&bl_vddpos_5p5>;

        vddneg-supply = <&bl_vddneg_5p5>;

        enable-gpios = <&tlmm 139 GPIO_ACTIVE_HIGH>;

        current-num-sinks = <5>;

        kinetic,current-ramp-delay-ms = <128>;

        kinetic,led-enable-ramp-delay-ms = <1>;

        kinetic,enable-lcd-bias;

    };

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
  compatible:

    enum:

      - qcom,pm8941-wled

      - qcom,pmi8950-wled

      - qcom,pmi8994-wled

      - qcom,pmi8998-wled

      - qcom,pm660l-wled

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -11572,6 +11572,12 @@ M: John Hawley <warthog9@eaglescrag.net> 
S:	Maintained

F:	tools/testing/ktest









KTZ8866 BACKLIGHT DRIVER









M:	Jianhua Lu <lujianhua000@gmail.com>









S:	Maintained









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









F:	drivers/video/backlight/ktz8866.c

















L3MDEV









M:	David Ahern <dsahern@kernel.org>









L:	netdev@vger.kernel.org
































drivers/video/backlight/Kconfig



+8
−14






























Original line number
Diff line number
Diff line







@@ -90,13 +90,6 @@ config LCD_PLATFORM







	  This driver provides a platform-device registered LCD power









	  control interface.



















config LCD_TOSA









	tristate "Sharp SL-6000 LCD Driver"









	depends on I2C && SPI && MACH_TOSA









	help









	  If you have an Sharp SL-6000 Zaurus say Y to enable a driver









	  for its LCD.



















config LCD_HP700









	tristate "HP Jornada 700 series LCD Driver"









	depends on SA1100_JORNADA720_SSP && !PREEMPTION








@@ -190,6 +183,14 @@ config BACKLIGHT_KTD253







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









	  phones.



















config BACKLIGHT_KTZ8866









	tristate "Backlight Driver for Kinetic KTZ8866"









	depends on I2C









	select REGMAP_I2C









	help









		Say Y to enable the backlight driver for the Kinetic KTZ8866









		found in Xiaomi Mi Pad 5 series.



















config BACKLIGHT_LM3533









	tristate "Backlight Driver for LM3533"









	depends on MFD_LM3533








@@ -288,13 +289,6 @@ config BACKLIGHT_APPLE







	  If you have an Intel-based Apple say Y to enable a driver for its









	  backlight.



















config BACKLIGHT_TOSA









	tristate "Sharp SL-6000 Backlight Driver"









	depends on I2C && MACH_TOSA && LCD_TOSA









	help









	  If you have an Sharp SL-6000 Zaurus say Y to enable a driver









	  for its backlight



















config BACKLIGHT_QCOM_WLED









	tristate "Qualcomm PMIC WLED Driver"









	select REGMAP
































drivers/video/backlight/Makefile



+1
−2






























Original line number
Diff line number
Diff line







@@ -15,7 +15,6 @@ obj-$(CONFIG_LCD_LTV350QV)		+= ltv350qv.o







obj-$(CONFIG_LCD_OTM3225A)		+= otm3225a.o









obj-$(CONFIG_LCD_PLATFORM)		+= platform_lcd.o









obj-$(CONFIG_LCD_TDO24M)		+= tdo24m.o









obj-$(CONFIG_LCD_TOSA)			+= tosa_lcd.o









obj-$(CONFIG_LCD_VGG2432A4)		+= vgg2432a4.o



















obj-$(CONFIG_BACKLIGHT_88PM860X)	+= 88pm860x_bl.o








@@ -36,6 +35,7 @@ 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_KTZ8866)		+= ktz8866.o









obj-$(CONFIG_BACKLIGHT_LM3533)		+= lm3533_bl.o









obj-$(CONFIG_BACKLIGHT_LM3630A)		+= lm3630a_bl.o









obj-$(CONFIG_BACKLIGHT_LM3639)		+= lm3639_bl.o








@@ -53,7 +53,6 @@ obj-$(CONFIG_BACKLIGHT_QCOM_WLED)	+= qcom-wled.o







obj-$(CONFIG_BACKLIGHT_RT4831)		+= rt4831-backlight.o









obj-$(CONFIG_BACKLIGHT_SAHARA)		+= kb3886_bl.o









obj-$(CONFIG_BACKLIGHT_SKY81452)	+= sky81452-backlight.o









obj-$(CONFIG_BACKLIGHT_TOSA)		+= tosa_bl.o









obj-$(CONFIG_BACKLIGHT_TPS65217)	+= tps65217_bl.o









obj-$(CONFIG_BACKLIGHT_WM831X)		+= wm831x_bl.o









obj-$(CONFIG_BACKLIGHT_ARCXCNN) 	+= arcxcnn_bl.o