Commit 21c91bb9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:
 "New Drivers:
   - Add support for Monolithic Power Systems MP3309C WLED Step-up Converter

  Fix-ups:
   - Use/convert to new/better APIs/helpers/MACROs instead of
     hand-rolling implementations
   - Device Tree Binding updates
   - Demote non-kerneldoc header comments
   - Improve error handling; return proper error values, simplify, avoid
     duplicates, etc
   - Convert over to the new (kinda) GPIOD API

  Bug Fixes:
   - Fix uninitialised local variable"

* tag 'backlight-next-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: hx8357: Convert to agnostic GPIO API
  backlight: ili922x: Add an error code check in ili922x_write()
  backlight: ili922x: Drop kernel-doc for local macros
  backlight: mp3309c: Fix uninitialized local variable
  backlight: pwm_bl: Use dev_err_probe
  backlight: mp3309c: Add support for MPS MP3309C
  dt-bindings: backlight: mp3309c: Remove two required properties
parents 17e232b6 7d84a63a

Documentation/devicetree/bindings/leds/backlight/mps,mp3309c.yaml

+4 −6
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ description: | 
  programmable switching frequency to optimize efficiency.

  It supports two different dimming modes:



  - analog mode, via I2C commands (default)

  - PWM controlled mode.

  - analog mode, via I2C commands, as default mode (32 dimming levels)

  - PWM controlled mode (optional)



  The datasheet is available at:

  https://www.monolithicpower.com/en/mp3309c.html
@@ -50,8 +50,6 @@ properties: 
required:

  - compatible

  - reg

  - max-brightness

  - default-brightness



unevaluatedProperties: false
@@ -66,8 +64,8 @@ examples: 
            compatible = "mps,mp3309c";

            reg = <0x17>;

            pwms = <&pwm1 0 3333333 0>; /* 300 Hz --> (1/f) * 1*10^9 */

            max-brightness = <100>;

            default-brightness = <80>;

            brightness-levels = <0 4 8 16 32 64 128 255>;

            default-brightness = <6>;

            mps,overvoltage-protection-microvolt = <24000000>;

        };

    };

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -14804,6 +14804,13 @@ S: Maintained 
F:	Documentation/driver-api/tty/moxa-smartio.rst

F:	drivers/tty/mxser.*









MP3309C BACKLIGHT DRIVER









M:	Flavio Suligoi <f.suligoi@asem.it>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









F:	Documentation/devicetree/bindings/leds/backlight/mps,mp3309c.yaml









F:	drivers/video/backlight/mp3309c.c

















MR800 AVERMEDIA USB FM RADIO DRIVER









M:	Alexey Klimov <klimov.linux@gmail.com>









L:	linux-media@vger.kernel.org
































drivers/gpio/gpiolib-of.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -184,7 +184,7 @@ static void of_gpio_try_fixup_polarity(const struct device_node *np,







		const char *propname;









		bool active_high;









	} gpios[] = {









#if !IS_ENABLED(CONFIG_LCD_HX8357)









#if IS_ENABLED(CONFIG_LCD_HX8357)









		/*









		 * Himax LCD controllers used incorrectly named









		 * "gpios-reset" property and also specified wrong








@@ -478,7 +478,7 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np,







		 */









		const char *compatible;









	} gpios[] = {









#if !IS_ENABLED(CONFIG_LCD_HX8357)









#if IS_ENABLED(CONFIG_LCD_HX8357)









		/* Himax LCD controllers used "gpios-reset" */









		{ "reset",	"gpios-reset",	"himax,hx8357" },









		{ "reset",	"gpios-reset",	"himax,hx8369" },
































drivers/video/backlight/Kconfig



+11
−0






























Original line number
Diff line number
Diff line







@@ -395,6 +395,17 @@ config BACKLIGHT_LP8788







	help









	  This supports TI LP8788 backlight driver.



















config BACKLIGHT_MP3309C









	tristate "Backlight Driver for MPS MP3309C"









	depends on I2C && PWM









	select REGMAP_I2C









	help









	  This supports MPS MP3309C backlight WLED driver in both PWM and









	  analog/I2C dimming modes.



















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









	  be called mp3309c.



















config BACKLIGHT_PANDORA









	tristate "Backlight driver for Pandora console"









	depends on TWL4030_CORE
































drivers/video/backlight/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -43,6 +43,7 @@ obj-$(CONFIG_BACKLIGHT_LP855X)		+= lp855x_bl.o







obj-$(CONFIG_BACKLIGHT_LP8788)		+= lp8788_bl.o









obj-$(CONFIG_BACKLIGHT_LV5207LP)	+= lv5207lp.o









obj-$(CONFIG_BACKLIGHT_MAX8925)		+= max8925_bl.o









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