Commit 94255d98 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Vinod Koul

phy: mediatek: mipi-dsi: Convert to register clk_hw

Instead of registering a struct clk, directly register clk_hw: this
allows us to cleanup a pointer to struct clk from struct mtk_mipi_tx.
Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230525115258.90091-2-angelogioacchino.delregno@collabora.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent e464a318
...@@ -36,7 +36,7 @@ static int mtk_mipi_tx_power_on(struct phy *phy) ...@@ -36,7 +36,7 @@ static int mtk_mipi_tx_power_on(struct phy *phy)
int ret; int ret;
/* Power up core and enable PLL */ /* Power up core and enable PLL */
ret = clk_prepare_enable(mipi_tx->pll); ret = clk_prepare_enable(mipi_tx->pll_hw.clk);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -53,7 +53,7 @@ static int mtk_mipi_tx_power_off(struct phy *phy) ...@@ -53,7 +53,7 @@ static int mtk_mipi_tx_power_off(struct phy *phy)
mipi_tx->driver_data->mipi_tx_disable_signal(phy); mipi_tx->driver_data->mipi_tx_disable_signal(phy);
/* Disable PLL and power down core */ /* Disable PLL and power down core */
clk_disable_unprepare(mipi_tx->pll); clk_disable_unprepare(mipi_tx->pll_hw.clk);
return 0; return 0;
} }
...@@ -158,9 +158,9 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev) ...@@ -158,9 +158,9 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev)
clk_init.ops = mipi_tx->driver_data->mipi_tx_clk_ops; clk_init.ops = mipi_tx->driver_data->mipi_tx_clk_ops;
mipi_tx->pll_hw.init = &clk_init; mipi_tx->pll_hw.init = &clk_init;
mipi_tx->pll = devm_clk_register(dev, &mipi_tx->pll_hw); ret = devm_clk_hw_register(dev, &mipi_tx->pll_hw);
if (IS_ERR(mipi_tx->pll)) if (ret)
return dev_err_probe(dev, PTR_ERR(mipi_tx->pll), "Failed to register PLL\n"); return dev_err_probe(dev, ret, "Failed to register PLL\n");
phy = devm_phy_create(dev, NULL, &mtk_mipi_tx_ops); phy = devm_phy_create(dev, NULL, &mtk_mipi_tx_ops);
if (IS_ERR(phy)) if (IS_ERR(phy))
...@@ -176,8 +176,7 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev) ...@@ -176,8 +176,7 @@ static int mtk_mipi_tx_probe(struct platform_device *pdev)
mtk_mipi_tx_get_calibration_datal(mipi_tx); mtk_mipi_tx_get_calibration_datal(mipi_tx);
return of_clk_add_provider(dev->of_node, of_clk_src_simple_get, return of_clk_add_hw_provider(dev->of_node, of_clk_hw_simple_get, &mipi_tx->pll_hw);
mipi_tx->pll);
} }
static void mtk_mipi_tx_remove(struct platform_device *pdev) static void mtk_mipi_tx_remove(struct platform_device *pdev)
......
...@@ -32,7 +32,6 @@ struct mtk_mipi_tx { ...@@ -32,7 +32,6 @@ struct mtk_mipi_tx {
u32 rt_code[5]; u32 rt_code[5];
const struct mtk_mipitx_data *driver_data; const struct mtk_mipitx_data *driver_data;
struct clk_hw pll_hw; struct clk_hw pll_hw;
struct clk *pll;
}; };
struct mtk_mipi_tx *mtk_mipi_tx_from_clk_hw(struct clk_hw *hw); struct mtk_mipi_tx *mtk_mipi_tx_from_clk_hw(struct clk_hw *hw);
......
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