diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 12:33:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 12:33:16 +1000 |
| commit | 86de4fc8939e76f6aacb0622e319a4ae01c1e23c (patch) | |
| tree | a13839034ba779d7658426fb50b6578e26449bb6 | |
| parent | 735fc3496d7018e2f33090ebbbb8abdec54208bc (diff) | |
| parent | 8c03a937ca9988245783a369f8d0645863a670f2 (diff) | |
Merge remote-tracking branch 'backlight/for-backlight-next'
| -rw-r--r-- | drivers/video/backlight/lm3630a_bl.c | 5 | ||||
| -rw-r--r-- | drivers/video/backlight/pwm_bl.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/backlight/lm3630a_bl.c b/drivers/video/backlight/lm3630a_bl.c index 60d6c2ac87aa..2030a6b77a09 100644 --- a/drivers/video/backlight/lm3630a_bl.c +++ b/drivers/video/backlight/lm3630a_bl.c @@ -31,7 +31,8 @@ #define REG_FAULT 0x0B #define REG_PWM_OUTLOW 0x12 #define REG_PWM_OUTHIGH 0x13 -#define REG_MAX 0x1F +#define REG_FILTER_STRENGTH 0x50 +#define REG_MAX 0x50 #define INT_DEBOUNCE_MSEC 10 struct lm3630a_chip { @@ -80,7 +81,7 @@ static int lm3630a_chip_init(struct lm3630a_chip *pchip) usleep_range(1000, 2000); /* set Filter Strength Register */ - rval = lm3630a_write(pchip, 0x50, 0x03); + rval = lm3630a_write(pchip, REG_FILTER_STRENGTH, 0x03); /* set Cofig. register */ rval |= lm3630a_update(pchip, REG_CONFIG, 0x07, pdata->pwm_ctrl); /* set boost control */ diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 002f1ce22bd0..9bd17682655a 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -178,7 +178,7 @@ static int pwm_backlight_parse_dt(struct device *dev, return 0; } -static struct of_device_id pwm_backlight_of_match[] = { +static const struct of_device_id pwm_backlight_of_match[] = { { .compatible = "pwm-backlight" }, { } }; |