提交 62dc3015 编写于 作者: R Rex-BC Chen 提交者: Matthias Brugger

soc: mediatek: mmsys: add sw0_rst_offset in mmsys driver data

There are different software reset registers for difference MTK SoCs.
Therefore, we add a new variable "sw0_rst_offset" to control it.
Signed-off-by: NRex-BC Chen <rex-bc.chen@mediatek.com>
Reviewed-by: NAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220217082626.15728-2-rex-bc.chen@mediatek.comSigned-off-by: NMatthias Brugger <matthias.bgg@gmail.com>
上级 eb1b02be
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#define MT8183_RDMA0_SOUT_COLOR0 0x1 #define MT8183_RDMA0_SOUT_COLOR0 0x1
#define MT8183_RDMA1_SOUT_DSI0 0x1 #define MT8183_RDMA1_SOUT_DSI0 0x1
#define MT8183_MMSYS_SW0_RST_B 0x140
static const struct mtk_mmsys_routes mmsys_mt8183_routing_table[] = { static const struct mtk_mmsys_routes mmsys_mt8183_routing_table[] = {
{ {
DDP_COMPONENT_OVL0, DDP_COMPONENT_OVL_2L0, DDP_COMPONENT_OVL0, DDP_COMPONENT_OVL_2L0,
......
...@@ -49,12 +49,14 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = { ...@@ -49,12 +49,14 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
.clk_driver = "clk-mt8173-mm", .clk_driver = "clk-mt8173-mm",
.routes = mmsys_default_routing_table, .routes = mmsys_default_routing_table,
.num_routes = ARRAY_SIZE(mmsys_default_routing_table), .num_routes = ARRAY_SIZE(mmsys_default_routing_table),
.sw0_rst_offset = MT8183_MMSYS_SW0_RST_B,
}; };
static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
.clk_driver = "clk-mt8183-mm", .clk_driver = "clk-mt8183-mm",
.routes = mmsys_mt8183_routing_table, .routes = mmsys_mt8183_routing_table,
.num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table), .num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table),
.sw0_rst_offset = MT8183_MMSYS_SW0_RST_B,
}; };
static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = { static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = {
...@@ -129,14 +131,14 @@ static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned l ...@@ -129,14 +131,14 @@ static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned l
spin_lock_irqsave(&mmsys->lock, flags); spin_lock_irqsave(&mmsys->lock, flags);
reg = readl_relaxed(mmsys->regs + MMSYS_SW0_RST_B); reg = readl_relaxed(mmsys->regs + mmsys->data->sw0_rst_offset);
if (assert) if (assert)
reg &= ~BIT(id); reg &= ~BIT(id);
else else
reg |= BIT(id); reg |= BIT(id);
writel_relaxed(reg, mmsys->regs + MMSYS_SW0_RST_B); writel_relaxed(reg, mmsys->regs + mmsys->data->sw0_rst_offset);
spin_unlock_irqrestore(&mmsys->lock, flags); spin_unlock_irqrestore(&mmsys->lock, flags);
......
...@@ -78,8 +78,6 @@ ...@@ -78,8 +78,6 @@
#define DSI_SEL_IN_RDMA 0x1 #define DSI_SEL_IN_RDMA 0x1
#define DSI_SEL_IN_MASK 0x1 #define DSI_SEL_IN_MASK 0x1
#define MMSYS_SW0_RST_B 0x140
struct mtk_mmsys_routes { struct mtk_mmsys_routes {
u32 from_comp; u32 from_comp;
u32 to_comp; u32 to_comp;
...@@ -92,6 +90,7 @@ struct mtk_mmsys_driver_data { ...@@ -92,6 +90,7 @@ struct mtk_mmsys_driver_data {
const char *clk_driver; const char *clk_driver;
const struct mtk_mmsys_routes *routes; const struct mtk_mmsys_routes *routes;
const unsigned int num_routes; const unsigned int num_routes;
const u16 sw0_rst_offset;
}; };
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册