Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f105cf4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:
 "Core Frameworks
   - Provide helpers to enable/disable backlight
   - Provide standard and devres versions OF find helpers

  New Drivers:
   - Add support for the Zodiac Inflight Innovations RAVE Supervisory
     Processor

  New Functionality:
   - Allow pwm-on/pwm-off delay to be specified via DT

  Bug Fixes:
   - Fix ordering of the power {en,dis}able and PWM {en,dis}able
     signals
   - Fix Device Tree node look-up"

* tag 'backlight-next-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: as3711_bl: Fix Device Tree node leaks
  backlight: tps65217_bl: Fix Device Tree node lookup
  backlight: max8925_bl: Fix Device Tree node lookup
  backlight: as3711_bl: Fix Device Tree node lookup
  MAINTAINERS: Add dri-devel for backlight subsystem patches
  backlight: Nuke BL_CORE_DRIVER1
  staging: fbtft: Stop using BL_CORE_DRIVER1
  backlight: pandora: Stop using BL_CORE_DRIVER1
  backlight: generic-bl: Remove DRIVER1 state
  backlight: Nuke unused backlight.props.state states
  backlight: otm3225a: Add support for ORISE OTM3225A LCD SoC
  backlight: pwm_bl: Don't use GPIOF_* with gpiod_get_direction
  pwm-backlight: Add support for PWM delays proprieties.
  dt-bindings: pwm-backlight: Add PWM delay proprieties.
  pwm-backlight: Enable/disable the PWM before/after LCD enable toggle.
  dt-bindings: backlight: Add binding for RAVE SP backlight driver
  backlight: Add RAVE SP backlight driver
parents 883cad5b d5318d30

Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ Optional properties: 
               "pwms" property (see PWM binding[0])

  - enable-gpios: contains a single GPIO specifier for the GPIO which enables

                  and disables the backlight (see GPIO binding[1])

  - post-pwm-on-delay-ms: Delay in ms between setting an initial (non-zero) PWM

                          and enabling the backlight using GPIO.

  - pwm-off-delay-ms: Delay in ms between disabling the backlight using GPIO

                      and setting PWM value to 0.



[0]: Documentation/devicetree/bindings/pwm/pwm.txt

[1]: Documentation/devicetree/bindings/gpio/gpio.txt
@@ -32,4 +36,6 @@ Example: 


		power-supply = <&vdd_bl_reg>;

		enable-gpios = <&gpio 58 0>;

		post-pwm-on-delay-ms = <10>;

		pwm-off-delay-ms = <10>;

	};

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

0 → 100644
+23 −0
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";

		};

	}

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2606,6 +2606,7 @@ BACKLIGHT CLASS/SUBSYSTEM 
M:	Lee Jones <lee.jones@linaro.org>

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

M:	Jingoo Han <jingoohan1@gmail.com>

L:	dri-devel@lists.freedesktop.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git

S:	Maintained

F:	drivers/video/backlight/

drivers/staging/fbtft/fbtft-core.c

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int fbtft_request_gpios_dt(struct fbtft_par *par) 
static int fbtft_backlight_update_status(struct backlight_device *bd)

{

	struct fbtft_par *par = bl_get_data(bd);

	bool polarity = !!(bd->props.state & BL_CORE_DRIVER1);

	bool polarity = par->polarity;



	fbtft_par_dbg(DEBUG_BACKLIGHT, par,

		"%s: polarity=%d, power=%d, fb_blank=%d\n",
@@ -296,7 +296,7 @@ void fbtft_register_backlight(struct fbtft_par *par) 
	/* Assume backlight is off, get polarity from current state of pin */

	bl_props.power = FB_BLANK_POWERDOWN;

	if (!gpio_get_value(par->gpio.led[0]))

		bl_props.state |= BL_CORE_DRIVER1;

		par->polarity = true;



	bd = backlight_device_register(dev_driver_string(par->info->device),

				       par->info->device, par,

drivers/staging/fbtft/fbtft.h

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ struct fbtft_par { 
	ktime_t update_time;

	bool bgr;

	void *extra;

	bool polarity;

};



#define NUMARGS(...)  (sizeof((int[]){__VA_ARGS__})/sizeof(int))