From: Yongqiang Niu <yongqiang.niu@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Mark Rutland <mark.rutland@arm.com>,
<dri-devel@lists.freedesktop.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Yongqiang Niu <yongqiang.niu@mediatek.com>
Subject: [PATCH v3, 7/8] soc: mediatek: mmsys: Use function call for setting mmsys ovl mout register
Date: Mon, 28 Dec 2020 16:37:09 +0800 [thread overview]
Message-ID: <1609144630-14721-8-git-send-email-yongqiang.niu@mediatek.com> (raw)
In-Reply-To: <1609144630-14721-1-git-send-email-yongqiang.niu@mediatek.com>
Use function call for setting mmsys ovl mout register
Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
---
drivers/soc/mediatek/mmsys/mtk-mmsys.c | 20 ++++++++++++++++++++
include/linux/soc/mediatek/mtk-mmsys.h | 3 +++
2 files changed, 23 insertions(+)
diff --git a/drivers/soc/mediatek/mmsys/mtk-mmsys.c b/drivers/soc/mediatek/mmsys/mtk-mmsys.c
index dae665b..ea36a11 100644
--- a/drivers/soc/mediatek/mmsys/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mmsys/mtk-mmsys.c
@@ -74,6 +74,17 @@ void mtk_mmsys_ddp_connect(struct device *dev,
reg = readl_relaxed(mmsys->regs + addr) | value;
writel_relaxed(reg, mmsys->regs + addr);
}
+
+ if (!funcs->ovl_mout_en)
+ return;
+
+ if (funcs->ovl_mout_en) {
+ value = funcs->ovl_mout_en(cur, next, &addr);
+ if (value) {
+ reg = readl_relaxed(mmsys->regs + addr) | value;
+ writel_relaxed(reg, mmsys->regs + addr);
+ }
+ }
}
EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_connect);
@@ -99,6 +110,15 @@ void mtk_mmsys_ddp_disconnect(struct device *dev,
reg = readl_relaxed(mmsys->regs + addr) & ~value;
writel_relaxed(reg, mmsys->regs + addr);
}
+
+ if (!funcs->ovl_mout_en)
+ return;
+
+ value = funcs->ovl_mout_en(cur, next, &addr);
+ if (value) {
+ reg = readl_relaxed(mmsys->regs + addr) & ~value;
+ writel_relaxed(reg, mmsys->regs + addr);
+ }
}
EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_disconnect);
diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h
index aa4f60e..220203d 100644
--- a/include/linux/soc/mediatek/mtk-mmsys.h
+++ b/include/linux/soc/mediatek/mtk-mmsys.h
@@ -49,6 +49,9 @@ struct mtk_mmsys_conn_funcs {
u32 (*mout_en)(enum mtk_ddp_comp_id cur,
enum mtk_ddp_comp_id next,
unsigned int *addr);
+ u32 (*ovl_mout_en)(enum mtk_ddp_comp_id cur,
+ enum mtk_ddp_comp_id next,
+ unsigned int *addr);
u32 (*sel_in)(enum mtk_ddp_comp_id cur,
enum mtk_ddp_comp_id next,
unsigned int *addr);
--
1.8.1.1.dirty
next prev parent reply other threads:[~2020-12-28 8:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 8:37 soc: mediatek: Prepare MMSYS for DDP routing using function call Yongqiang Niu
2020-12-28 8:37 ` [PATCH v3, 1/8] soc: mediatek: mmsys: create mmsys folder Yongqiang Niu
2020-12-31 1:21 ` Nicolas Boichat
2021-01-04 3:08 ` Yongqiang Niu
2021-01-04 5:57 ` Yongqiang Niu
2020-12-28 8:37 ` [PATCH v3, 2/8] soc: mediatek: mmsys: Use function call for setting the routing registers Yongqiang Niu
2020-12-28 8:37 ` [PATCH v3, 3/8] soc: mediatek: mmsys: add mt8183 " Yongqiang Niu
2020-12-28 8:37 ` [PATCH v3, 4/8] soc: mediatek: mmsys: add component OVL_2L2 Yongqiang Niu
2020-12-29 15:23 ` Chun-Kuang Hu
2021-03-22 15:05 ` Chun-Kuang Hu
2020-12-28 8:37 ` [PATCH v3, 5/8] soc: mediatek: mmsys: add component POSTMASK Yongqiang Niu
2020-12-28 8:37 ` [PATCH v3, 6/8] soc: mediatek: mmsys: add component RDMA4 Yongqiang Niu
2020-12-29 15:24 ` Chun-Kuang Hu
2020-12-28 8:37 ` Yongqiang Niu [this message]
2020-12-28 16:38 ` [PATCH v3, 7/8] soc: mediatek: mmsys: Use function call for setting mmsys ovl mout register Chun-Kuang Hu
2020-12-29 0:52 ` Yongqiang Niu
2020-12-29 1:34 ` Yongqiang Niu
2020-12-28 8:37 ` [PATCH v3, 8/8] soc: mediatek: mmsys: add mt8192 mmsys support Yongqiang Niu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609144630-14721-8-git-send-email-yongqiang.niu@mediatek.com \
--to=yongqiang.niu@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=airlied@linux.ie \
--cc=ck.hu@mediatek.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).