Commit 299a9c72 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Vinod Koul
Browse files

phy: mediatek: hdmi: remove register access helpers 



Remove private register access helpers, use the common ones instead.

Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220920090038.15133-13-chunfeng.yun@mediatek.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 0fb5e57e

drivers/phy/mediatek/phy-mtk-hdmi.c

+0 −33
Original line number Diff line number Diff line
@@ -15,39 +15,6 @@ static const struct phy_ops mtk_hdmi_phy_dev_ops = { 
	.owner = THIS_MODULE,

};



void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,

			     u32 bits)

{

	void __iomem *reg = hdmi_phy->regs + offset;

	u32 tmp;



	tmp = readl(reg);

	tmp &= ~bits;

	writel(tmp, reg);

}



void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,

			   u32 bits)

{

	void __iomem *reg = hdmi_phy->regs + offset;

	u32 tmp;



	tmp = readl(reg);

	tmp |= bits;

	writel(tmp, reg);

}



void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,

		       u32 val, u32 mask)

{

	void __iomem *reg = hdmi_phy->regs + offset;

	u32 tmp;



	tmp = readl(reg);

	tmp = (tmp & ~mask) | (val & mask);

	writel(tmp, reg);

}



inline struct mtk_hdmi_phy *to_mtk_hdmi_phy(struct clk_hw *hw)

{

	return container_of(hw, struct mtk_hdmi_phy, pll_hw);

drivers/phy/mediatek/phy-mtk-hdmi.h

+0 −7
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of_device.h>
@@ -42,12 +41,6 @@ struct mtk_hdmi_phy { 
	unsigned int ibias_up;

};



void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,

			     u32 bits);

void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset,

			   u32 bits);

void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset,

		       u32 val, u32 mask);

struct mtk_hdmi_phy *to_mtk_hdmi_phy(struct clk_hw *hw);



extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf;