Commit 827abdd0 authored by Wangyan Wang's avatar Wangyan Wang Committed by CK Hu

drm/mediatek: remove flag CLK_SET_RATE_PARENT for MT2701 hdmi phy

This is the first step to make MT2701 hdmi stable.
The parent rate of hdmi phy had set by DPI driver.
We should not set or change the parent rate of MT2701 hdmi phy,
as a result we should remove the flags of "CLK_SET_RATE_PARENT"
from the clock of MT2701 hdmi phy.
Signed-off-by: default avatarWangyan Wang <wangyan.wang@mediatek.com>
Signed-off-by: default avatarCK Hu <ck.hu@mediatek.com>
parent 321b628e
...@@ -102,13 +102,11 @@ mtk_hdmi_phy_dev_get_ops(const struct mtk_hdmi_phy *hdmi_phy) ...@@ -102,13 +102,11 @@ mtk_hdmi_phy_dev_get_ops(const struct mtk_hdmi_phy *hdmi_phy)
return NULL; return NULL;
} }
static void mtk_hdmi_phy_clk_get_ops(struct mtk_hdmi_phy *hdmi_phy, static void mtk_hdmi_phy_clk_get_data(struct mtk_hdmi_phy *hdmi_phy,
const struct clk_ops **ops) struct clk_init_data *clk_init)
{ {
if (hdmi_phy && hdmi_phy->conf && hdmi_phy->conf->hdmi_phy_clk_ops) clk_init->flags = hdmi_phy->conf->flags;
*ops = hdmi_phy->conf->hdmi_phy_clk_ops; clk_init->ops = hdmi_phy->conf->hdmi_phy_clk_ops;
else
dev_err(hdmi_phy->dev, "Failed to get clk ops of phy\n");
} }
static int mtk_hdmi_phy_probe(struct platform_device *pdev) static int mtk_hdmi_phy_probe(struct platform_device *pdev)
...@@ -121,7 +119,6 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev) ...@@ -121,7 +119,6 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev)
struct clk_init_data clk_init = { struct clk_init_data clk_init = {
.num_parents = 1, .num_parents = 1,
.parent_names = (const char * const *)&ref_clk_name, .parent_names = (const char * const *)&ref_clk_name,
.flags = CLK_SET_RATE_PARENT | CLK_SET_RATE_GATE,
}; };
struct phy *phy; struct phy *phy;
...@@ -159,7 +156,7 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev) ...@@ -159,7 +156,7 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev)
hdmi_phy->dev = dev; hdmi_phy->dev = dev;
hdmi_phy->conf = hdmi_phy->conf =
(struct mtk_hdmi_phy_conf *)of_device_get_match_data(dev); (struct mtk_hdmi_phy_conf *)of_device_get_match_data(dev);
mtk_hdmi_phy_clk_get_ops(hdmi_phy, &clk_init.ops); mtk_hdmi_phy_clk_get_data(hdmi_phy, &clk_init);
hdmi_phy->pll_hw.init = &clk_init; hdmi_phy->pll_hw.init = &clk_init;
hdmi_phy->pll = devm_clk_register(dev, &hdmi_phy->pll_hw); hdmi_phy->pll = devm_clk_register(dev, &hdmi_phy->pll_hw);
if (IS_ERR(hdmi_phy->pll)) { if (IS_ERR(hdmi_phy->pll)) {
......
...@@ -21,6 +21,7 @@ struct mtk_hdmi_phy; ...@@ -21,6 +21,7 @@ struct mtk_hdmi_phy;
struct mtk_hdmi_phy_conf { struct mtk_hdmi_phy_conf {
bool tz_disabled; bool tz_disabled;
unsigned long flags;
const struct clk_ops *hdmi_phy_clk_ops; const struct clk_ops *hdmi_phy_clk_ops;
void (*hdmi_phy_enable_tmds)(struct mtk_hdmi_phy *hdmi_phy); void (*hdmi_phy_enable_tmds)(struct mtk_hdmi_phy *hdmi_phy);
void (*hdmi_phy_disable_tmds)(struct mtk_hdmi_phy *hdmi_phy); void (*hdmi_phy_disable_tmds)(struct mtk_hdmi_phy *hdmi_phy);
......
...@@ -232,6 +232,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy) ...@@ -232,6 +232,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)
struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf = { struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf = {
.tz_disabled = true, .tz_disabled = true,
.flags = CLK_SET_RATE_GATE,
.hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops, .hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops,
.hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds, .hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds,
.hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds, .hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,
......
...@@ -317,6 +317,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy) ...@@ -317,6 +317,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy)
} }
struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf = { struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf = {
.flags = CLK_SET_RATE_PARENT | CLK_SET_RATE_GATE,
.hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops, .hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops,
.hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds, .hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds,
.hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds, .hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment