Commit 93d52288 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:

 - Apple DWI Backlight:
    - Added devicetree bindings for backlight controllers on Apple's DWI
      interface.
    - Added a new driver (apple_dwi_bl) for these controllers found on
      some Apple mobile devices.
    - Added MAINTAINERS entries for the new driver.

 - led_bl: Fixed a locking issue by holding the led_access lock when
   calling led_sysfs_disable() during device removal to prevent
   potential warnings.

 - Removed unnecessary <linux/fb.h> includes from a bunch of drivers.

 - tdo24m: Removed redundant whitespace in Kconfig description.

 - pcf50633-backlight: Removed the driver as the underlying pcf50633 MFD
   and s3c24xx platform support were removed.

* tag 'backlight-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: (22 commits)
  backlight: pcf50633-backlight: Remove unused driver
  backlight: tdo24m: Eliminate redundant whitespace
  MAINTAINERS: Add entries for Apple DWI backlight controller
  backlight: apple_dwi_bl: Add Apple DWI backlight driver
  dt-bindings: leds: backlight: apple,dwi-bl: Add Apple DWI backlight
  backlight: led_bl: Hold led_access lock when calling led_sysfs_disable()
  backlight: wm831x_bl: Do not include <linux/fb.h>
  backlight: vgg2432a4: Do not include <linux/fb.h>
  backlight: tps65217_bl: Do not include <linux/fb.h>
  backlight: max8925_bl: Do not include <linux/fb.h>
  backlight: lv5207lp: Do not include <linux/fb.h>
  backlight: locomolcd: Do not include <linux/fb.h>
  backlight: hp680_bl: Do not include <linux/fb.h>
  backlight: ep93xx_bl: Do not include <linux/fb.h>
  backlight: da9052_bl: Do not include <linux/fb.h>
  backlight: da903x_bl: Do not include <linux/fb.h>
  backlight: bd6107_bl: Do not include <linux/fb.h>
  backlight: as3711_bl: Do not include <linux/fb.h>
  backlight: adp8870_bl: Do not include <linux/fb.h>
  backlight: adp8860_bl: Do not include <linux/fb.h>
  ...
parents cb9b4c34 dfc034a0

Documentation/devicetree/bindings/leds/backlight/apple,dwi-bl.yaml

0 → 100644
+57 −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/apple,dwi-bl.yaml#

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



title: Apple DWI 2-Wire Interface Backlight Controller



maintainers:

  - Nick Chan <towinchenmi@gmail.com>



description:

  Apple SoCs contain a 2-wire interface called DWI. On some Apple iPhones,

  iPads and iPod touches with a LCD display, 1-2 backlight controllers

  are connected via DWI. Interfacing with DWI controls all backlight

  controllers at the same time. As such, the backlight controllers are

  treated as a single controller regardless of the underlying

  configuration.



allOf:

  - $ref: common.yaml#



properties:

  compatible:

    items:

      - enum:

          - apple,s5l8960x-dwi-bl

          - apple,t7000-dwi-bl

          - apple,s8000-dwi-bl

          - apple,t8010-dwi-bl

          - apple,t8015-dwi-bl

      - const: apple,dwi-bl



  reg:

    maxItems: 1



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    soc {

      #address-cells = <2>;

      #size-cells = <2>;



      dwi_bl: backlight@20e200010 {

        compatible = "apple,s5l8960x-dwi-bl", "apple,dwi-bl";

        reg = <0x2 0x0e200010 0x0 0x8>;

        power-domains = <&ps_dwi>;

      };

    };

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -2232,6 +2232,7 @@ F: Documentation/devicetree/bindings/i2c/apple,i2c.yaml 
F:	Documentation/devicetree/bindings/interrupt-controller/apple,*

F:	Documentation/devicetree/bindings/iommu/apple,dart.yaml

F:	Documentation/devicetree/bindings/iommu/apple,sart.yaml

F:	Documentation/devicetree/bindings/leds/backlight/apple,dwi-bl.yaml

F:	Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml

F:	Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml

F:	Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
@@ -2259,6 +2260,7 @@ F: drivers/pinctrl/pinctrl-apple-gpio.c 
F:	drivers/pwm/pwm-apple.c

F:	drivers/soc/apple/*

F:	drivers/spi/spi-apple.c

F:	drivers/video/backlight/apple_dwi_bl.c

F:	drivers/watchdog/apple_wdt.c

F:	include/dt-bindings/interrupt-controller/apple-aic.h

F:	include/dt-bindings/pinctrl/apple.h

drivers/video/backlight/88pm860x_bl.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/fb.h>

#include <linux/i2c.h>

#include <linux/backlight.h>

#include <linux/mfd/88pm860x.h>

drivers/video/backlight/Kconfig

+12 −8
Original line number Diff line number Diff line
@@ -290,6 +290,17 @@ config BACKLIGHT_APPLE 
	  If you have an Intel-based Apple say Y to enable a driver for its

	  backlight.



config BACKLIGHT_APPLE_DWI

	tristate "Apple DWI 2-Wire Interface Backlight Driver"

	depends on ARCH_APPLE || COMPILE_TEST

	help

	  Say Y to enable the backlight driver for backlight controllers

	  attached via the Apple DWI 2-wire interface which is found in some

	  Apple iPhones, iPads and iPod touches.



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

	  be called apple_dwi_bl.



config BACKLIGHT_QCOM_WLED

	tristate "Qualcomm PMIC WLED Driver"

	select REGMAP
@@ -359,13 +370,6 @@ config BACKLIGHT_88PM860X 
	help

	  Say Y to enable the backlight driver for Marvell 88PM8606.



config BACKLIGHT_PCF50633

	tristate "Backlight driver for NXP PCF50633 MFD"

	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 MFD_AAT2870_CORE

drivers/video/backlight/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ obj-$(CONFIG_BACKLIGHT_ADP5520) += adp5520_bl.o 
obj-$(CONFIG_BACKLIGHT_ADP8860)		+= adp8860_bl.o

obj-$(CONFIG_BACKLIGHT_ADP8870)		+= adp8870_bl.o

obj-$(CONFIG_BACKLIGHT_APPLE)		+= apple_bl.o

obj-$(CONFIG_BACKLIGHT_APPLE_DWI)	+= apple_dwi_bl.o

obj-$(CONFIG_BACKLIGHT_AS3711)		+= as3711_bl.o

obj-$(CONFIG_BACKLIGHT_BD6107)		+= bd6107.o

obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE)	+= backlight.o
@@ -49,7 +50,6 @@ obj-$(CONFIG_BACKLIGHT_MP3309C) += mp3309c.o 
obj-$(CONFIG_BACKLIGHT_MT6370)		+= mt6370-backlight.o

obj-$(CONFIG_BACKLIGHT_OMAP1)		+= omap1_bl.o

obj-$(CONFIG_BACKLIGHT_PANDORA)		+= pandora_bl.o

obj-$(CONFIG_BACKLIGHT_PCF50633)	+= pcf50633-backlight.o

obj-$(CONFIG_BACKLIGHT_PWM)		+= pwm_bl.o

obj-$(CONFIG_BACKLIGHT_QCOM_WLED)	+= qcom-wled.o

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