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

Commit e28870f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:
 - Clean-up leaky resources; pwm_bl
 - Simplify Device Tree initialisation; lp855x_bl
 - Add Regulator support; lp855x
 - Remove Bryan from the Maintainer list -- new baby, no time :)

* tag 'backlight-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  MAINTAINERS: Remove my name from Backlight subsystem
  backlight: lp855x: Add supply regulator to lp855x
  backlight: lp855x: Refactor DT parsing code
  backlight: pwm: Clean-up pwm requested using legacy API
parents c1b30e4d 3d6969a6

Documentation/devicetree/bindings/video/backlight/lp855x.txt

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Optional properties: 
  - pwm-period: PWM period value. Set only PWM input mode used (u32)

  - rom-addr: Register address of ROM area to be updated (u8)

  - rom-val: Register value to be updated (u8)

  - power-supply: Regulator which controls the 3V rail



Example:
@@ -56,6 +57,7 @@ Example: 
	backlight@2c {

		compatible = "ti,lp8557";

		reg = <0x2c>;

		power-supply = <&backlight_vdd>;



		dev-ctrl = /bits/ 8 <0x41>;

		init-brt = /bits/ 8 <0x0a>;

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,6 @@ F: drivers/net/wireless/b43legacy/ 


BACKLIGHT CLASS/SUBSYSTEM

M:	Jingoo Han <jg1.han@samsung.com>

M:	Bryan Wu <cooloney@gmail.com>

M:	Lee Jones <lee.jones@linaro.org>

S:	Maintained

F:	drivers/video/backlight/

drivers/video/backlight/lp855x_bl.c

+36 −19
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/of.h>

#include <linux/platform_data/lp855x.h>

#include <linux/pwm.h>

#include <linux/regulator/consumer.h>



/* LP8550/1/2/3/6 Registers */

#define LP855X_BRIGHTNESS_CTRL		0x00
@@ -341,8 +342,10 @@ static const struct attribute_group lp855x_attr_group = { 
};



#ifdef CONFIG_OF

static int lp855x_parse_dt(struct device *dev, struct device_node *node)

static int lp855x_parse_dt(struct lp855x *lp)

{

	struct device *dev = lp->dev;

	struct device_node *node = dev->of_node;

	struct lp855x_platform_data *pdata;

	int rom_length;
@@ -381,12 +384,19 @@ static int lp855x_parse_dt(struct device *dev, struct device_node *node) 
		pdata->rom_data = &rom[0];

	}



	dev->platform_data = pdata;

	pdata->supply = devm_regulator_get(dev, "power");

	if (IS_ERR(pdata->supply)) {

		if (PTR_ERR(pdata->supply) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		pdata->supply = NULL;

	}



	lp->pdata = pdata;



	return 0;

}

#else

static int lp855x_parse_dt(struct device *dev, struct device_node *node)

static int lp855x_parse_dt(struct lp855x *lp)

{

	return -EINVAL;

}
@@ -395,18 +405,8 @@ static int lp855x_parse_dt(struct device *dev, struct device_node *node) 
static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)

{

	struct lp855x *lp;

	struct lp855x_platform_data *pdata = dev_get_platdata(&cl->dev);

	struct device_node *node = cl->dev.of_node;

	int ret;



	if (!pdata) {

		ret = lp855x_parse_dt(&cl->dev, node);

		if (ret < 0)

			return ret;



		pdata = dev_get_platdata(&cl->dev);

	}



	if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))

		return -EIO;
@@ -414,16 +414,31 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) 
	if (!lp)

		return -ENOMEM;



	if (pdata->period_ns > 0)

		lp->mode = PWM_BASED;

	else

		lp->mode = REGISTER_BASED;



	lp->client = cl;

	lp->dev = &cl->dev;

	lp->pdata = pdata;

	lp->chipname = id->name;

	lp->chip_id = id->driver_data;

	lp->pdata = dev_get_platdata(&cl->dev);



	if (!lp->pdata) {

		ret = lp855x_parse_dt(lp);

		if (ret < 0)

			return ret;

	}



	if (lp->pdata->period_ns > 0)

		lp->mode = PWM_BASED;

	else

		lp->mode = REGISTER_BASED;



	if (lp->pdata->supply) {

		ret = regulator_enable(lp->pdata->supply);

		if (ret < 0) {

			dev_err(&cl->dev, "failed to enable supply: %d\n", ret);

			return ret;

		}

	}



	i2c_set_clientdata(cl, lp);



	ret = lp855x_configure(lp);
@@ -455,6 +470,8 @@ static int lp855x_remove(struct i2c_client *cl) 


	lp->bl->props.brightness = 0;

	backlight_update_status(lp->bl);

	if (lp->pdata->supply)

		regulator_disable(lp->pdata->supply);

	sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group);



	return 0;

drivers/video/backlight/pwm_bl.c

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct pwm_bl_data { 
	struct regulator	*power_supply;

	struct gpio_desc	*enable_gpio;

	unsigned int		scale;

	bool			legacy;

	int			(*notify)(struct device *,

					  int brightness);

	void			(*notify_after)(struct device *,
@@ -274,7 +275,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) 
	pb->pwm = devm_pwm_get(&pdev->dev, NULL);

	if (IS_ERR(pb->pwm)) {

		dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n");



		pb->legacy = true;

		pb->pwm = pwm_request(data->pwm_id, "pwm-backlight");

		if (IS_ERR(pb->pwm)) {

			dev_err(&pdev->dev, "unable to request legacy PWM\n");
@@ -339,6 +340,8 @@ static int pwm_backlight_remove(struct platform_device *pdev) 


	if (pb->exit)

		pb->exit(&pdev->dev);

	if (pb->legacy)

		pwm_free(pb->pwm);



	return 0;

}

include/linux/platform_data/lp855x.h

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ struct lp855x_rom_data { 
		Only valid when mode is PWM_BASED.

 * @size_program : total size of lp855x_rom_data

 * @rom_data : list of new eeprom/eprom registers

 * @supply : regulator that supplies 3V input

 */

struct lp855x_platform_data {

	const char *name;
@@ -144,6 +145,7 @@ struct lp855x_platform_data { 
	unsigned int period_ns;

	int size_program;

	struct lp855x_rom_data *rom_data;

	struct regulator *supply;

};



#endif