soc: mediatek: Support reset bit mapping in mmsys driver

- Reset ID must starts from 0 and be consecutive, but
  the reset bits in our hardware design is not continuous,
  some bits are left unused, we need a map to solve the problem
- Use old style 1-to-1 mapping if .rst_tb is not defined

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.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 e95bb118cd9874f749de0912ef69cb062a93fd97..ae8d7076c42c164b8407b47e3c4d4a92b3bf0d87 100644 (file)
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -324,6 +324,15 @@ static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned l
        u32 offset;
        u32 reg;
 
+       if (mmsys->data->rst_tb) {
+               if (id >= mmsys->data->num_resets) {
+                       dev_err(rcdev->dev, "Invalid reset ID: %lu (>=%u)\n",
+                               id, mmsys->data->num_resets);
+                       return -EINVAL;
+               }
+               id = mmsys->data->rst_tb[id];
+       }
+
        offset = (id / MMSYS_SW_RESET_PER_REG) * sizeof(u32);
        id = id % MMSYS_SW_RESET_PER_REG;
        reg = mmsys->data->sw0_rst_offset + offset;

diff --git a/drivers/soc/mediatek/mtk-mmsys.h b/drivers/soc/mediatek/mtk-mmsys.h
index 9d8507f98b7a32629c51476be580c55caeee521d..d370192737ca45ed480f2167dfb1ac94dd16baad 100644 (file)
--- a/drivers/soc/mediatek/mtk-mmsys.h
+++ b/drivers/soc/mediatek/mtk-mmsys.h
@@ -78,6 +78,8 @@
 #define DSI_SEL_IN_RDMA                                0x1
 #define DSI_SEL_IN_MASK                                0x1
 
+#define MMSYS_RST_NR(bank, bit) (((bank) * 32) + (bit))
+
 struct mtk_mmsys_routes {
        u32 from_comp;
        u32 to_comp;
@@ -119,6 +121,7 @@ struct mtk_mmsys_driver_data {
        const struct mtk_mmsys_routes *routes;
        const unsigned int num_routes;
        const u16 sw0_rst_offset;
+       const u8 *rst_tb;
        const u32 num_resets;
        const bool is_vppsys;
        const u8 vsync_len;