diff options
| -rw-r--r-- | Documentation/devicetree/bindings/fb/mdss-dsi-ctrl.txt | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi.c | 25 |
2 files changed, 16 insertions, 12 deletions
diff --git a/Documentation/devicetree/bindings/fb/mdss-dsi-ctrl.txt b/Documentation/devicetree/bindings/fb/mdss-dsi-ctrl.txt index 851513469ebc..b4294c17d7b1 100644 --- a/Documentation/devicetree/bindings/fb/mdss-dsi-ctrl.txt +++ b/Documentation/devicetree/bindings/fb/mdss-dsi-ctrl.txt @@ -11,7 +11,6 @@ Required properties: - reg-names: A list of strings that map in order to the list of regs. "dsi_ctrl" - MDSS DSI controller register region "dsi_phy" - MDSS DSI PHY register region - "dsi_phy_regulator" - MDSS DSI PHY REGULATOR region "mmss_misc_phys" - Register region for MMSS DSI clamps - vdd-supply: Phandle for vdd regulator device node. - vddio-supply: Phandle for vdd-io regulator device node. @@ -33,6 +32,8 @@ Required properties: Optional properties: - label: A string used to describe the controller used. +- reg-names: A list of strings that map in order to the list of regs. + "dsi_phy_regulator" - MDSS DSI PHY REGULATOR region - vcca-supply: Phandle for vcca regulator device node. - qcom,ctrl-supply-entries: A node that lists the elements of the supply used by the DSI controller and PHY. There can be more than one instance diff --git a/drivers/video/fbdev/msm/mdss_dsi.c b/drivers/video/fbdev/msm/mdss_dsi.c index f6f26dceb0ff..2f43e834bfb9 100644 --- a/drivers/video/fbdev/msm/mdss_dsi.c +++ b/drivers/video/fbdev/msm/mdss_dsi.c @@ -1727,18 +1727,18 @@ int mdss_dsi_retrieve_ctrl_resources(struct platform_device *pdev, int mode, rc = msm_dss_ioremap_byname(pdev, &ctrl->shared_ctrl_data->phy_regulator_io, "dsi_phy_regulator"); - if (rc) { - pr_err("%s:%d unable to remap dsi phy regulator resources\n", + if (rc) + pr_debug("%s:%d unable to remap dsi phy regulator resources\n", __func__, __LINE__); - return rc; - } + else + pr_info("%s: phy_regulator_base=%p phy_regulator_size=%x\n", + __func__, + ctrl->shared_ctrl_data->phy_regulator_io.base, + ctrl->shared_ctrl_data->phy_regulator_io.len); pr_info("%s: ctrl_base=%p ctrl_size=%x phy_base=%p phy_size=%x\n", __func__, ctrl->ctrl_base, ctrl->reg_size, ctrl->phy_io.base, ctrl->phy_io.len); - pr_info("%s: phy_regulator_base=%p phy_regulator_size=%x\n", __func__, - ctrl->shared_ctrl_data->phy_regulator_io.base, - ctrl->shared_ctrl_data->phy_regulator_io.len); rc = msm_dss_ioremap_byname(pdev, &ctrl->mmss_misc_io, "mmss_misc_phys"); @@ -1847,6 +1847,7 @@ int dsi_panel_device_register(struct device_node *pan_node, __func__, __LINE__); return -EINVAL; } + for (i = 0; i < len; i++) { pinfo->mipi.dsi_phy_db.bistctrl[i] = data[i]; } @@ -2046,14 +2047,16 @@ int dsi_panel_device_register(struct device_node *pan_node, if (pinfo->pdest == DISPLAY_1) { mdss_debug_register_io("dsi0_ctrl", &ctrl_pdata->ctrl_io); mdss_debug_register_io("dsi0_phy", &ctrl_pdata->phy_io); - mdss_debug_register_io("dsi0_phy_regulator", - &ctrl_pdata->shared_ctrl_data->phy_regulator_io); + if (ctrl_pdata->shared_ctrl_data->phy_regulator_io.len) + mdss_debug_register_io("dsi0_phy_regulator", + &ctrl_pdata->shared_ctrl_data->phy_regulator_io); ctrl_pdata->ndx = 0; } else { mdss_debug_register_io("dsi1_ctrl", &ctrl_pdata->ctrl_io); mdss_debug_register_io("dsi1_phy", &ctrl_pdata->phy_io); - mdss_debug_register_io("dsi1_phy_regulator", - &ctrl_pdata->shared_ctrl_data->phy_regulator_io); + if (ctrl_pdata->shared_ctrl_data->phy_regulator_io.len) + mdss_debug_register_io("dsi1_phy_regulator", + &ctrl_pdata->shared_ctrl_data->phy_regulator_io); ctrl_pdata->ndx = 1; } |