Merge "clk: qcom: mdss: remove DSI1 PLL configuration from DSI0 PLL" into msm-4.8
diff --git a/drivers/clk/qcom/mdss/mdss-pll.c b/drivers/clk/qcom/mdss/mdss-pll.c
index 7d2c43f..89f0a50 100644
--- a/drivers/clk/qcom/mdss/mdss-pll.c
+++ b/drivers/clk/qcom/mdss/mdss-pll.c
@@ -310,8 +310,6 @@
if (pll_res->phy_base)
iounmap(pll_res->phy_base);
phy_io_error:
- if (pll_res->pll_1_base)
- iounmap(pll_res->pll_1_base);
mdss_pll_resource_release(pdev, pll_res);
res_parse_error:
iounmap(pll_res->pll_base);
diff --git a/drivers/clk/qcom/mdss/mdss-pll.h b/drivers/clk/qcom/mdss/mdss-pll.h
index 50f8467..c93cda3 100644
--- a/drivers/clk/qcom/mdss/mdss-pll.h
+++ b/drivers/clk/qcom/mdss/mdss-pll.h
@@ -48,7 +48,6 @@
* register mapping
*/
void __iomem *pll_base;
- void __iomem *pll_1_base;
void __iomem *phy_base;
void __iomem *gdsc_base;
void __iomem *dyn_pll_base;