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

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

Pull backlight updates from Lee Jones:
 "Switch pwm_bl and corgi_lcd drivers to use GPIO descriptors"

* tag 'backlight-next-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: corgi: Convert to use GPIO descriptors
  backlight: pwm_bl: Switch to full GPIO descriptor
parents 38e2c63e ee0c8e49

arch/arm/mach-pxa/cm-x300.c

+0 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ static struct pwm_lookup cm_x300_pwm_lookup[] = { 
static struct platform_pwm_backlight_data cm_x300_backlight_data = {

	.max_brightness	= 100,

	.dft_brightness	= 100,

	.enable_gpio	= -1,

};



static struct platform_device cm_x300_backlight_device = {

arch/arm/mach-pxa/colibri-pxa270-income.c

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ static struct pwm_lookup income_pwm_lookup[] = { 
static struct platform_pwm_backlight_data income_backlight_data = {

	.max_brightness	= 0x3ff,

	.dft_brightness	= 0x1ff,

	.enable_gpio	= -1,

};



static struct platform_device income_backlight = {

arch/arm/mach-pxa/corgi.c

+10 −2
Original line number Diff line number Diff line
@@ -563,13 +563,20 @@ static void corgi_bl_kick_battery(void) 
	}

}



static struct gpiod_lookup_table corgi_lcdcon_gpio_table = {

	.dev_id = "spi1.1",

	.table = {

		GPIO_LOOKUP("gpio-pxa", CORGI_GPIO_BACKLIGHT_CONT,

			    "BL_CONT", GPIO_ACTIVE_HIGH),

		{ },

	},

};



static struct corgi_lcd_platform_data corgi_lcdcon_info = {

	.init_mode		= CORGI_LCD_MODE_VGA,

	.max_intensity		= 0x2f,

	.default_intensity	= 0x1f,

	.limit_mask		= 0x0b,

	.gpio_backlight_cont	= CORGI_GPIO_BACKLIGHT_CONT,

	.gpio_backlight_on	= -1,

	.kick_battery		= corgi_bl_kick_battery,

};
@@ -609,6 +616,7 @@ static struct spi_board_info corgi_spi_devices[] = { 
static void __init corgi_init_spi(void)

{

	pxa2xx_set_spi_info(1, &corgi_spi_info);

	gpiod_add_lookup_table(&corgi_lcdcon_gpio_table);

	spi_register_board_info(ARRAY_AND_SIZE(corgi_spi_devices));

}

#else

arch/arm/mach-pxa/ezx.c

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static struct pwm_lookup ezx_pwm_lookup[] __maybe_unused = { 
static struct platform_pwm_backlight_data ezx_backlight_data = {

	.max_brightness	= 1023,

	.dft_brightness	= 1023,

	.enable_gpio	= -1,

};



static struct platform_device ezx_backlight_device = {

arch/arm/mach-pxa/hx4700.c

+0 −1
Original line number Diff line number Diff line
@@ -556,7 +556,6 @@ static struct platform_device hx4700_lcd = { 
static struct platform_pwm_backlight_data backlight_data = {

	.max_brightness = 200,

	.dft_brightness = 100,

	.enable_gpio    = -1,

};



static struct platform_device backlight = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE