diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-07 19:44:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-07 19:44:52 -0700 |
| commit | b574beb6257a21c231a6c2c272a0aeb84b655437 (patch) | |
| tree | 97af0e8d95f8c4876c65731bfeec0aa12cf17782 /include/linux | |
| parent | 38e2c63ec3d323310ba873601e864af79b90b457 (diff) | |
| parent | ee0c8e494cc3c135350cd5c4752e82af3feae1ab (diff) | |
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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pwm_backlight.h | 2 | ||||
| -rw-r--r-- | include/linux/spi/corgi_lcd.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/pwm_backlight.h b/include/linux/pwm_backlight.h index 8ea265a022fd..06086cb93b6f 100644 --- a/include/linux/pwm_backlight.h +++ b/include/linux/pwm_backlight.h @@ -16,8 +16,6 @@ struct platform_pwm_backlight_data { unsigned int *levels; unsigned int post_pwm_on_delay; unsigned int pwm_off_delay; - /* TODO remove once all users are switched to gpiod_* API */ - int enable_gpio; int (*init)(struct device *dev); int (*notify)(struct device *dev, int brightness); void (*notify_after)(struct device *dev, int brightness); diff --git a/include/linux/spi/corgi_lcd.h b/include/linux/spi/corgi_lcd.h index edf4beccdadb..0b857616919c 100644 --- a/include/linux/spi/corgi_lcd.h +++ b/include/linux/spi/corgi_lcd.h @@ -11,9 +11,6 @@ struct corgi_lcd_platform_data { int default_intensity; int limit_mask; - int gpio_backlight_on; /* -1 if n/a */ - int gpio_backlight_cont; /* -1 if n/a */ - void (*notify)(int intensity); void (*kick_battery)(void); }; |