Commit 2fb7eb3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:

 - Improve handling of LCD power states and interactions with the fbdev
   subsystem

 - Introduce new LCD_POWER_ constants to decouple the LCD subsystem from
   fbdev

 - Update several drivers to use the new LCD_POWER_ constants

 - Clarify the semantics of the lcd_ops.controls_device callback

 - Remove unnecessary includes and dependencies

 - Remove unused notifier functionality

 - Simplify code with scoped for-each loops

 - Fix module autoloading for the ktz8866 driver

 - Update device tree bindings to yaml format

 - Minor cleanups and improvements in various drivers

* tag 'backlight-next-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: (33 commits)
  MAINTAINERS: Use Daniel Thompson's korg address for Backlight work
  dt-bindings: backlight: Convert zii,rave-sp-backlight.txt to yaml
  backlight: Remove notifier
  backlight: ktz8866: Fix module autoloading
  backlight: 88pm860x_bl: Simplify with scoped for each OF child loop
  backlight: lcd: Do not include <linux/fb.h> in lcd header
  backlight: lcd: Remove struct fb_videomode from set_mode callback
  backlight: lcd: Replace check_fb with controls_device
  HID: picoLCD: Replace check_fb in favor of struct fb_info.lcd_dev
  fbdev: omap: Use lcd power constants
  fbdev: imxfb: Use lcd power constants
  fbdev: imxfb: Replace check_fb in favor of struct fb_info.lcd_dev
  fbdev: clps711x-fb: Use lcd power constants
  fbdev: clps711x-fb: Replace check_fb in favor of struct fb_info.lcd_dev
  backlight: tdo24m: Use lcd power constants
  backlight: platform_lcd: Use lcd power constants
  backlight: platform_lcd: Remove match_fb from struct plat_lcd_data
  backlight: platform_lcd: Remove include statement for <linux/backlight.h>
  backlight: otm3225a: Use lcd power constants
  backlight: ltv350qv: Use lcd power constants
  ...
parents 93251bdf 3adec6f9

Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.txt

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
Zodiac Inflight Innovations RAVE Supervisory Processor Backlight Bindings



RAVE SP backlight device is a "MFD cell" device corresponding to

backlight functionality of RAVE Supervisory Processor. It is expected

that its Device Tree node is specified as a child of the node

corresponding to the parent RAVE SP device (as documented in

Documentation/devicetree/bindings/mfd/zii,rave-sp.txt)



Required properties:



- compatible: Should be "zii,rave-sp-backlight"



Example:



	rave-sp {

		compatible = "zii,rave-sp-rdu1";

		current-speed = <38400>;



		backlight {

			compatible = "zii,rave-sp-backlight";

		};

	}

Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.yaml

0 → 100644
+36 −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/zii,rave-sp-backlight.yaml#

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



title: Zodiac Inflight Innovations RAVE Supervisory Processor Backlight



maintainers:

  - Frank Li <Frank.Li@nxp.com>



description:

  RAVE SP backlight device is a "MFD cell" device corresponding to

  backlight functionality of RAVE Supervisory Processor. It is expected

  that its Device Tree node is specified as a child of the node

  corresponding to the parent RAVE SP device (as documented in

  Documentation/devicetree/bindings/mfd/zii,rave-sp.yaml)



properties:

  compatible:

    const: zii,rave-sp-backlight



required:

  - compatible



allOf:

  - $ref: common.yaml



unevaluatedProperties: false



examples:

  - |

    backlight {

        compatible = "zii,rave-sp-backlight";

    };

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3812,7 +3812,7 @@ F: drivers/net/wireless/broadcom/b43legacy/ 








BACKLIGHT CLASS/SUBSYSTEM









M:	Lee Jones <lee@kernel.org>









M:	Daniel Thompson <daniel.thompson@linaro.org>









M:	Daniel Thompson <danielt@kernel.org>









M:	Jingoo Han <jingoohan1@gmail.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained
































drivers/hid/hid-picolcd_fb.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -497,6 +497,10 @@ int picolcd_init_framebuffer(struct picolcd_data *data)







#endif









#endif



















#ifdef CONFIG_HID_PICOLCD_LCD









	info->lcd_dev = data->lcd;









#endif



















	fbdata = info->par;









	spin_lock_init(&fbdata->lock);









	fbdata->picolcd = data;
































drivers/hid/hid-picolcd_lcd.c



+0
−6






























Original line number
Diff line number
Diff line







@@ -41,15 +41,9 @@ static int picolcd_set_contrast(struct lcd_device *ldev, int contrast)







	return 0;









}



















static int picolcd_check_lcd_fb(struct lcd_device *ldev, struct fb_info *fb)









{









	return fb && fb == picolcd_fbinfo((struct picolcd_data *)lcd_get_data(ldev));









}



















static const struct lcd_ops picolcd_lcdops = {









	.get_contrast   = picolcd_get_contrast,









	.set_contrast   = picolcd_set_contrast,









	.check_fb       = picolcd_check_lcd_fb,









};



















int picolcd_init_lcd(struct picolcd_data *data, struct hid_report *report)