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

Commit 7385d6fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight changes from Lee Jones:
  Changes to existing drivers:
   - remove get brightness implementations in via-pmu-backlight
     samsung-q10 aat2870_bl ams369fg06 bd6107 gpio_backlight ld9040
     lp855x_bl lp8788_bl lv5207lp pandora_bl pwm_bl s6e63m0 tps65217_bl
     aty128fb atyfb_base radeon_backlight s6e8ax0 nv_backlight
     riva/fbdev
   - improve error handling in jornada720_lcd
   - make use of new 'get optional' GPIO command in pwm_bl
   - fix sparse warning in ipaq_micro_bl

  New drivers/supported devices:
   - new driver for iPAQ"

* tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: ipaq_micro: Fix sparse non static symbol warning
  backlight: Add driver for iPAQ micro backlight
  backlight: pwm-backlight: Use devm_gpiod_get_optional()
  backlight: jornada720: Minimise code duplication and handle errors better
  backlight: Show brightness even if get_brightness is not implemented
  backlight: Remove trivial get_brightness implementations
parents e0b8b786 87464cdb

drivers/macintosh/via-pmu-backlight.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -110,13 +110,7 @@ static int pmu_backlight_update_status(struct backlight_device *bd) 
}

}









static int pmu_backlight_get_brightness(struct backlight_device *bd)

{

	return bd->props.brightness;

}



static const struct backlight_ops pmu_backlight_data = {

static const struct backlight_ops pmu_backlight_data = {

	.get_brightness	= pmu_backlight_get_brightness,

	.update_status	= pmu_backlight_update_status,

	.update_status	= pmu_backlight_update_status,





};

};

drivers/platform/x86/samsung-q10.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -46,13 +46,7 @@ static int samsungq10_bl_set_intensity(struct backlight_device *bd) 
	return 0;

	return 0;

}

}





static int samsungq10_bl_get_intensity(struct backlight_device *bd)

{

	return bd->props.brightness;

}



static const struct backlight_ops samsungq10_bl_ops = {

static const struct backlight_ops samsungq10_bl_ops = {

	.get_brightness = samsungq10_bl_get_intensity,

	.update_status	= samsungq10_bl_set_intensity,

	.update_status	= samsungq10_bl_set_intensity,

};

};

drivers/video/backlight/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -207,6 +207,15 @@ config BACKLIGHT_GENERIC 
	  known as the Corgi backlight driver. If you have a Sharp Zaurus

	  known as the Corgi backlight driver. If you have a Sharp Zaurus

	  SL-C7xx, SL-Cxx00 or SL-6000x say y.

	  SL-C7xx, SL-Cxx00 or SL-6000x say y.





config BACKLIGHT_IPAQ_MICRO

	tristate "iPAQ microcontroller backlight driver"

	depends on MFD_IPAQ_MICRO

	default y

	help

	  Say y to enable the backlight driver for Compaq iPAQ handheld

	  computers. Say yes if you have one of the h3100/h3600/h3700

	  machines.



config BACKLIGHT_LM3533

config BACKLIGHT_LM3533

	tristate "Backlight Driver for LM3533"

	tristate "Backlight Driver for LM3533"

	depends on BACKLIGHT_CLASS_DEVICE

	depends on BACKLIGHT_CLASS_DEVICE

drivers/video/backlight/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ obj-$(CONFIG_BACKLIGHT_GENERIC) += generic_bl.o 
obj-$(CONFIG_BACKLIGHT_GPIO)		+= gpio_backlight.o

obj-$(CONFIG_BACKLIGHT_GPIO)		+= gpio_backlight.o

obj-$(CONFIG_BACKLIGHT_HP680)		+= hp680_bl.o

obj-$(CONFIG_BACKLIGHT_HP680)		+= hp680_bl.o

obj-$(CONFIG_BACKLIGHT_HP700)		+= jornada720_bl.o

obj-$(CONFIG_BACKLIGHT_HP700)		+= jornada720_bl.o

obj-$(CONFIG_BACKLIGHT_IPAQ_MICRO)	+= ipaq_micro_bl.o

obj-$(CONFIG_BACKLIGHT_LM3533)		+= lm3533_bl.o

obj-$(CONFIG_BACKLIGHT_LM3533)		+= lm3533_bl.o

obj-$(CONFIG_BACKLIGHT_LM3630A)		+= lm3630a_bl.o

obj-$(CONFIG_BACKLIGHT_LM3630A)		+= lm3630a_bl.o

obj-$(CONFIG_BACKLIGHT_LM3639)		+= lm3639_bl.o

obj-$(CONFIG_BACKLIGHT_LM3639)		+= lm3639_bl.o

drivers/video/backlight/aat2870_bl.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -67,11 +67,6 @@ static inline int aat2870_bl_disable(struct aat2870_bl_driver_data *aat2870_bl) 
	return aat2870->write(aat2870, AAT2870_BL_CH_EN, 0x0);

	return aat2870->write(aat2870, AAT2870_BL_CH_EN, 0x0);

}

}





static int aat2870_bl_get_brightness(struct backlight_device *bd)

{

	return bd->props.brightness;

}



static int aat2870_bl_update_status(struct backlight_device *bd)

static int aat2870_bl_update_status(struct backlight_device *bd)

{

{

	struct aat2870_bl_driver_data *aat2870_bl = bl_get_data(bd);

	struct aat2870_bl_driver_data *aat2870_bl = bl_get_data(bd);
@@ -120,7 +115,6 @@ static int aat2870_bl_check_fb(struct backlight_device *bd, struct fb_info *fi) 




static const struct backlight_ops aat2870_bl_ops = {

static const struct backlight_ops aat2870_bl_ops = {

	.options = BL_CORE_SUSPENDRESUME,

	.options = BL_CORE_SUSPENDRESUME,

	.get_brightness = aat2870_bl_get_brightness,

	.update_status = aat2870_bl_update_status,

	.update_status = aat2870_bl_update_status,

	.check_fb = aat2870_bl_check_fb,

	.check_fb = aat2870_bl_check_fb,

};

};