Skip to content

Commit 8960088

Browse files
lscorciagregkh
authored andcommitted
soc: mediatek: mtk-mmsys: Restore MT8167 routing masks lost during merge
[ Upstream commit 7d462de ] The original patch that was sent to the mailing lists included the values for the route masks, but they got lost during merge: add back the full register masks where missing. Fixes: 060f787 ("soc: mediatek: mmsys: Add support for MT8167 SoC") Signed-off-by: Luca Leonardo Scorcia <l.scorcia@gmail.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 0dd1cf4 commit 8960088

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

drivers/soc/mediatek/mt8167-mmsys.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,29 @@
1010
#define MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN 0x06c
1111

1212
#define MT8167_DITHER_MOUT_EN_RDMA0 0x1
13+
#define MT8167_DITHER_MOUT_EN_MASK 0x7
14+
1315
#define MT8167_RDMA0_SOUT_DSI0 0x2
16+
#define MT8167_RDMA0_SOUT_MASK 0x3
17+
1418
#define MT8167_DSI0_SEL_IN_RDMA0 0x1
19+
#define MT8167_DSI0_SEL_IN_MASK 0x3
1520

1621
static const struct mtk_mmsys_routes mt8167_mmsys_routing_table[] = {
1722
MMSYS_ROUTE(OVL0, COLOR0,
1823
MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN, OVL0_MOUT_EN_COLOR0,
1924
OVL0_MOUT_EN_COLOR0),
2025
MMSYS_ROUTE(DITHER0, RDMA0,
21-
MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN, MT8167_DITHER_MOUT_EN_RDMA0,
26+
MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN, MT8167_DITHER_MOUT_EN_MASK,
2227
MT8167_DITHER_MOUT_EN_RDMA0),
2328
MMSYS_ROUTE(OVL0, COLOR0,
2429
MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN, COLOR0_SEL_IN_OVL0,
2530
COLOR0_SEL_IN_OVL0),
2631
MMSYS_ROUTE(RDMA0, DSI0,
27-
MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN, MT8167_DSI0_SEL_IN_RDMA0,
32+
MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN, MT8167_DSI0_SEL_IN_MASK,
2833
MT8167_DSI0_SEL_IN_RDMA0),
2934
MMSYS_ROUTE(RDMA0, DSI0,
30-
MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN, MT8167_RDMA0_SOUT_DSI0,
35+
MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN, MT8167_RDMA0_SOUT_MASK,
3136
MT8167_RDMA0_SOUT_DSI0),
3237
};
3338

0 commit comments

Comments
 (0)