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

Commit 5bc23a0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'backlight-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight 

Pull backlight updates from Lee Jones:
 "New Device Support
   - None

  New Functionality:
   - None

  Core Frameworks:
   - Reject legacy PWM request for device defined in DT

  Fix-ups:
   - Remove unnecessary MODULE_ALIAS(); adp8860_bl, adp8870_bl
   - Simplify code: pm8941-wled
   - Supply default-brightness logic; pm8941-wled

  Bug Fixes:
   - Clean up OF node; 88pm860x_bl
   - Ensure struct is zeroed; lp855x_bl"

* tag 'backlight-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: pm8941-wled: Add default-brightness property
  backlight: pm8941-wled: Fix ptr_ret.cocci warnings
  backlight: pwm: Reject legacy PWM request for device defined in DT
  backlight: 88pm860x_bl: Add missing of_node_put
  backlight: adp8870: Remove unnecessary MODULE_ALIAS()
  backlight: adp8860: Remove unnecessary MODULE_ALIAS()
  backlight: lp855x: Make sure props struct is zeroed
parents 4dcee4d8 9d6c2435

Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,8 @@ Required properties: 
- reg: slave address

- reg: slave address





Optional properties:

Optional properties:

- default-brightness: brightness value on boot, value from: 0-4095

	default: 2048

- label: The name of the backlight device

- label: The name of the backlight device

- qcom,cs-out: bool; enable current sink output

- qcom,cs-out: bool; enable current sink output

- qcom,cabc: bool; enable content adaptive backlight control

- qcom,cabc: bool; enable content adaptive backlight control

drivers/video/backlight/88pm860x_bl.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -180,6 +180,7 @@ static int pm860x_backlight_dt_init(struct platform_device *pdev, 
			data->iset = PM8606_WLED_CURRENT(iset);

			data->iset = PM8606_WLED_CURRENT(iset);

			of_property_read_u32(np, "marvell,88pm860x-pwm",

			of_property_read_u32(np, "marvell,88pm860x-pwm",

					     &data->pwm);

					     &data->pwm);

			of_node_put(np);

			break;

			break;

		}

		}

	}

	}

drivers/video/backlight/adp8860_bl.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -819,4 +819,3 @@ module_i2c_driver(adp8860_driver); 
MODULE_LICENSE("GPL v2");

MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_DESCRIPTION("ADP8860 Backlight driver");
 
MODULE_DESCRIPTION("ADP8860 Backlight driver");
 
MODULE_ALIAS("i2c:adp8860-backlight");

drivers/video/backlight/adp8870_bl.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -992,4 +992,3 @@ module_i2c_driver(adp8870_driver); 
MODULE_LICENSE("GPL v2");

MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_DESCRIPTION("ADP8870 Backlight driver");
 
MODULE_DESCRIPTION("ADP8870 Backlight driver");
 
MODULE_ALIAS("i2c:adp8870-backlight");

drivers/video/backlight/lp855x_bl.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -283,6 +283,7 @@ static int lp855x_backlight_register(struct lp855x *lp) 
	struct lp855x_platform_data *pdata = lp->pdata;

	struct lp855x_platform_data *pdata = lp->pdata;

	const char *name = pdata->name ? : DEFAULT_BL_NAME;

	const char *name = pdata->name ? : DEFAULT_BL_NAME;





	memset(&props, 0, sizeof(props));

	props.type = BACKLIGHT_PLATFORM;

	props.type = BACKLIGHT_PLATFORM;

	props.max_brightness = MAX_BRIGHTNESS;

	props.max_brightness = MAX_BRIGHTNESS;