Commit 96f970fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:
 "Core Framework:
   - Trivial: Code refactoring
   - New API backlight_is_blank()
   - New API backlight_get_brightness()
   - Additional/reworked documentation
   - Remove 'extern' labels from prototypes
   - Drop backlight_put()
   - Staticify of_find_backlight()

  Driver Removal:
   - Removal of unused OT200 driver
   - Removal of unused Generic Backlight driver

  Fix-ups
   - Bunch of W=1 warning fixes
   - Convert to GPIO descriptors; sky81452
   - Move platform data handling into driver; sky81452
   - Remove superfluous code; lms501kf03
   - Many instances of using new APIs"

* tag 'backlight-next-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: (34 commits)
  video: backlight: cr_bllcd: Remove unused variable 'intensity'
  backlight: backlight: Make of_find_backlight static
  backlight: backlight: Drop backlight_put()
  backlight: Use backlight_get_brightness() throughout
  backlight: jornada720_bl: Introduce backlight_is_blank()
  backlight: gpio_backlight: Simplify update_status()
  backlight: cr_bllcd: Introduce gpio-backlight semantics
  backlight: as3711_bl: Simplify update_status
  backlight: backlight: Introduce backlight_get_brightness()
  doc-rst: Wire-up Backlight kernel-doc documentation
  backlight: backlight: Add overview and update existing doc
  backlight: backlight: Drop extern from prototypes
  backlight: generic_bl: Remove this driver as it is unused
  backlight: backlight: Document enums in backlight.h
  backlight: backlight: Document inline functions in backlight.h
  backlight: backlight: Improve backlight_device documentation
  backlight: backlight: Improve backlight_properties documentation
  backlight: backlight: Improve backlight_ops documentation
  backlight: backlight: Add backlight_is_blank()
  backlight: backlight: Refactor fb_notifier_callback()
  ...
parents c636eef2 7eb99a39

Documentation/gpu/backlight.rst

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 
=================

Backlight support

=================



.. kernel-doc:: drivers/video/backlight/backlight.c

   :doc: overview



.. kernel-doc:: include/linux/backlight.h

   :internal:



.. kernel-doc:: drivers/video/backlight/backlight.c

   :export:

Documentation/gpu/index.rst

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ Linux GPU Driver Developer's Guide 
   drm-uapi

   drm-uapi

   drm-client

   drm-client

   drivers

   drivers

   backlight

   vga-switcheroo

   vga-switcheroo

   vgaarbiter

   vgaarbiter

   todo

   todo

drivers/mfd/sky81452.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -47,8 +47,6 @@ static int sky81452_probe(struct i2c_client *client, 
	memset(cells, 0, sizeof(cells));

	memset(cells, 0, sizeof(cells));

	cells[0].name = "sky81452-backlight";

	cells[0].name = "sky81452-backlight";

	cells[0].of_compatible = "skyworks,sky81452-backlight";

	cells[0].of_compatible = "skyworks,sky81452-backlight";

	cells[0].platform_data = pdata->bl_pdata;

	cells[0].pdata_size = sizeof(*pdata->bl_pdata);

	cells[1].name = "sky81452-regulator";

	cells[1].name = "sky81452-regulator";

	cells[1].platform_data = pdata->regulator_init_data;

	cells[1].platform_data = pdata->regulator_init_data;

	cells[1].pdata_size = sizeof(*pdata->regulator_init_data);

	cells[1].pdata_size = sizeof(*pdata->regulator_init_data);

drivers/video/backlight/88pm860x_bl.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -121,18 +121,7 @@ out: 




static int pm860x_backlight_update_status(struct backlight_device *bl)

static int pm860x_backlight_update_status(struct backlight_device *bl)

{

{

	int brightness = bl->props.brightness;

	return pm860x_backlight_set(bl, backlight_get_brightness(bl));



	if (bl->props.power != FB_BLANK_UNBLANK)

		brightness = 0;



	if (bl->props.fb_blank != FB_BLANK_UNBLANK)

		brightness = 0;



	if (bl->props.state & BL_CORE_SUSPENDED)

		brightness = 0;



	return pm860x_backlight_set(bl, brightness);

}

}





static int pm860x_backlight_get_brightness(struct backlight_device *bl)

static int pm860x_backlight_get_brightness(struct backlight_device *bl)

drivers/video/backlight/Kconfig

+0 −15
Original line number Original line Diff line number Diff line
@@ -173,14 +173,6 @@ config BACKLIGHT_EP93XX 
	  To compile this driver as a module, choose M here: the module will

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

	  be called ep93xx_bl.

	  be called ep93xx_bl.





config BACKLIGHT_GENERIC

	tristate "Generic (aka Sharp Corgi) Backlight Driver"

	default y

	help

	  Say y to enable the generic platform backlight driver previously

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

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



config BACKLIGHT_IPAQ_MICRO

config BACKLIGHT_IPAQ_MICRO

	tristate "iPAQ microcontroller backlight driver"

	tristate "iPAQ microcontroller backlight driver"

	depends on MFD_IPAQ_MICRO

	depends on MFD_IPAQ_MICRO
@@ -386,13 +378,6 @@ config BACKLIGHT_LP8788 
	help

	help

	  This supports TI LP8788 backlight driver.

	  This supports TI LP8788 backlight driver.





config BACKLIGHT_OT200

	tristate "Backlight driver for ot200 visualisation device"

	depends on CS5535_MFGPT && GPIO_CS5535

	help

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

	  called ot200_bl.



config BACKLIGHT_PANDORA

config BACKLIGHT_PANDORA

	tristate "Backlight driver for Pandora console"

	tristate "Backlight driver for Pandora console"

	depends on TWL4030_CORE

	depends on TWL4030_CORE

CRA Git | Maintained and supported by SUSTech CRA and CCSE