diff options
| author | Chandan Uddaraju <chandanu@codeaurora.org> | 2014-06-19 16:12:50 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:31:06 -0700 |
| commit | d924defccd85ec806589eb1f4f3dd7274dae3f15 (patch) | |
| tree | 90b09a39c4ebd16b2403aa34c0854ef6a59fa0a3 /drivers/video/fbdev | |
| parent | 6c77f430e641e1ba2100fd300297627835a05726 (diff) | |
msm: mdss: dsi: fix backlight control configuration
Fix the current pwm backlight control implementation
to configure pwm channel only when it is defined
in devicetree.
Change-Id: I8613fa5564f98d3693455f35cf9912b03acf31ce
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi_panel.c | 5 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_panel.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi_panel.c b/drivers/video/fbdev/msm/mdss_dsi_panel.c index f5e68013df2c..ccd8c5078029 100644 --- a/drivers/video/fbdev/msm/mdss_dsi_panel.c +++ b/drivers/video/fbdev/msm/mdss_dsi_panel.c @@ -1158,7 +1158,7 @@ static int mdss_panel_parse_dt(struct device_node *np, rc = of_property_read_u32(np, "qcom,mdss-dsi-border-color", &tmp); pinfo->lcdc.border_clr = (!rc ? tmp : 0); - pinfo->bklt_ctrl = UNKNOWN_CTRL; + ctrl_pdata->bklt_ctrl = UNKNOWN_CTRL; data = of_get_property(np, "qcom,mdss-dsi-bl-pmic-control-type", NULL); if (data) { if (!strncmp(data, "bl_ctrl_wled", 12)) { @@ -1188,8 +1188,11 @@ static int mdss_panel_parse_dt(struct device_node *np, tmp = of_get_named_gpio(np, "qcom,mdss-dsi-pwm-gpio", 0); ctrl_pdata->pwm_pmic_gpio = tmp; + pr_debug("%s: Configured PWM bklt ctrl\n", __func__); } else if (!strncmp(data, "bl_ctrl_dcs", 11)) { ctrl_pdata->bklt_ctrl = BL_DCS_CMD; + pr_debug("%s: Configured DCS_CMD bklt ctrl\n", + __func__); } } rc = of_property_read_u32(np, "qcom,mdss-brightness-max-level", &tmp); diff --git a/drivers/video/fbdev/msm/mdss_panel.h b/drivers/video/fbdev/msm/mdss_panel.h index 71c556ffea37..a7e1c38cd0ba 100644 --- a/drivers/video/fbdev/msm/mdss_panel.h +++ b/drivers/video/fbdev/msm/mdss_panel.h @@ -323,7 +323,6 @@ struct mdss_panel_info { u32 rst_seq_len; u32 vic; /* video identification code */ struct mdss_rect roi; - int bklt_ctrl; /* backlight ctrl */ int pwm_pmic_gpio; int pwm_lpg_chan; int pwm_period; |