On Mon, Nov 7, 2022 at 3:23 PM Nancy.Lin <nancy....@mediatek.com> wrote:
>
> Simplify code for update mmsys reg.
>
> Signed-off-by: Nancy.Lin <nancy....@mediatek.com>
> Reviewed-by: AngeloGioacchino Del Regno
> <angelogioacchino.delre...@collabora.com>
> Reviewed-by: CK Hu <ck...@mediatek.com>
> Tested-by: AngeloGioacchino Del Regno
> <angelogioacchino.delre...@collabora.com>
> Tested-by: Bo-Chen Chen <rex-bc.c...@mediatek.com>
> Reviewed-by: Nícolas F. R. A. Prado <nfrapr...@collabora.com>
> ---
> drivers/soc/mediatek/mtk-mmsys.c | 45 ++++++++++++--------------------
> 1 file changed, 16 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c
> b/drivers/soc/mediatek/mtk-mmsys.c
> index 9a327eb5d9d7..73c8bd27e6ae 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c
[...]
> @@ -124,27 +129,14 @@ void mtk_mmsys_ddp_disconnect(struct device *dev,
> {
> struct mtk_mmsys *mmsys = dev_get_drvdata(dev);
> const struct mtk_mmsys_routes *routes = mmsys->data->routes;
> - u32 reg;
> int i;
>
> for (i = 0; i < mmsys->data->num_routes; i++)
> - if (cur == routes[i].from_comp && next == routes[i].to_comp) {
> - reg = readl_relaxed(mmsys->regs + routes[i].addr);
> - reg &= ~routes[i].mask;
> - writel_relaxed(reg, mmsys->regs + routes[i].addr);
> - }
> + if (cur == routes[i].from_comp && next == routes[i].to_comp)
> + mtk_mmsys_update_bits(mmsys, routes[i].addr,
> routes[i].mask, 0);
> }
> EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_disconnect);
>
> -static void mtk_mmsys_update_bits(struct mtk_mmsys *mmsys, u32 offset, u32
> mask, u32 val)
> -{
> - u32 tmp;
> -
> - tmp = readl_relaxed(mmsys->regs + offset);
> - tmp = (tmp & ~mask) | val;
> - writel_relaxed(tmp, mmsys->regs + offset);
> -}
> -
> void mtk_mmsys_ddp_dpi_fmt_config(struct device *dev, u32 val)
> {
> if (val)
This hunk now doesn't apply due to
soc: mediatek: Add all settings to mtk_mmsys_ddp_dpi_fmt_config func
touching mtk_mmsys_ddp_dpi_fmt_config() as well. It's trivial to resolve
though.
ChenYu
