soc: mediatek: Use pkt_write function pointer for subsys ID compatibility

Switch to pkt_write and reg_write_mask function pointers for register
access, enabling compatibility with platforms regardless of subsys ID
support.

Signed-off-by: Jason-JH Lin <jason-jh.lin@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index bb4639ca0b8cdc0731554cb487e8454cdd31de18..2f3e0778bb175e93b4d0d8cac009b0ddffbce7a5 100644 (file)
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -167,9 +167,11 @@ static void mtk_mmsys_update_bits(struct mtk_mmsys *mmsys, u32 offset, u32 mask,
        u32 tmp;
 
        if (mmsys->cmdq_base.size && cmdq_pkt) {
-               ret = cmdq_pkt_write_mask(cmdq_pkt, mmsys->cmdq_base.subsys,
-                                         mmsys->cmdq_base.offset + offset, val,
-                                         mask);
+               ret = mmsys->cmdq_base.pkt_write_mask(cmdq_pkt,
+                                                     mmsys->cmdq_base.subsys,
+                                                     mmsys->cmdq_base.pa_base,
+                                                     mmsys->cmdq_base.offset + offset,
+                                                     val, mask);
                if (ret)
                        pr_debug("CMDQ unavailable: using CPU write\n");
                else

diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c
index 38179e8cd98f84a6207a57d701383552328d52e0..eb5d381ff5aff6a0e8fc080e9dc474115f5d2d87 100644 (file)
--- a/drivers/soc/mediatek/mtk-mutex.c
+++ b/drivers/soc/mediatek/mtk-mutex.c
@@ -990,6 +990,7 @@ int mtk_mutex_enable_by_cmdq(struct mtk_mutex *mutex, void *pkt)
        struct mtk_mutex_ctx *mtx = container_of(mutex, struct mtk_mutex_ctx,
                                                 mutex[mutex->id]);
        struct cmdq_pkt *cmdq_pkt = (struct cmdq_pkt *)pkt;
+       dma_addr_t en_addr = mtx->addr + DISP_REG_MUTEX_EN(mutex->id);
 
        WARN_ON(&mtx->mutex[mutex->id] != mutex);
 
@@ -998,8 +999,8 @@ int mtk_mutex_enable_by_cmdq(struct mtk_mutex *mutex, void *pkt)
                return -ENODEV;
        }
 
-       cmdq_pkt_write(cmdq_pkt, mtx->cmdq_reg.subsys,
-                      mtx->addr + DISP_REG_MUTEX_EN(mutex->id), 1);
+       mtx->cmdq_reg.pkt_write(cmdq_pkt, mtx->cmdq_reg.subsys, en_addr, en_addr, 1);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(mtk_mutex_enable_by_cmdq);