From: Yong Wu <yong.wu@mediatek.com>
To: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org,
yi.kuo@mediatek.com, srv_heupstream@mediatek.com,
Will Deacon <will@kernel.org>,
linux-kernel@vger.kernel.org,
Krzysztof Kozlowski <krzk@kernel.org>,
iommu@lists.linux-foundation.org,
linux-mediatek@lists.infradead.org, anthony.huang@mediatek.com,
ming-fan.chen@mediatek.com, anan.sun@mediatek.com,
Robin Murphy <robin.murphy@arm.com>,
Ikjoon Jang <ikjn@chromium.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 04/13] memory: mtk-smi: Rename smi_gen to smi_type
Date: Tue, 14 Sep 2021 19:36:54 +0800 [thread overview]
Message-ID: <20210914113703.31466-5-yong.wu@mediatek.com> (raw)
In-Reply-To: <20210914113703.31466-1-yong.wu@mediatek.com>
Prepare for adding smi sub common. Only rename from smi_gen to smi_type.
No functional change.
About the current "smi_gen", we have gen1/gen2 that stand for the
generation number for HW. I plan to add a new type(sub_common), then the
name "gen" is not proper.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Ikjoon Jang <ikjn@chromium.org>
---
drivers/memory/mtk-smi.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index f91eaf5c3ab0..02a584dfb9b1 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -55,7 +55,7 @@
/* All are MMU0 defaultly. Only specialize mmu1 here. */
#define F_MMU1_LARB(larbid) (0x1 << SMI_BUS_LARB_SHIFT(larbid))
-enum mtk_smi_gen {
+enum mtk_smi_type {
MTK_SMI_GEN1,
MTK_SMI_GEN2
};
@@ -75,9 +75,9 @@ static const char * const mtk_smi_common_clks[] = {"apb", "smi", "gals0", "gals1
#define MTK_SMI_COM_GALS_REQ_CLK_NR MTK_SMI_CLK_NR_MAX
struct mtk_smi_common_plat {
- enum mtk_smi_gen gen;
- bool has_gals;
- u32 bus_sel; /* Balance some larbs to enter mmu0 or mmu1 */
+ enum mtk_smi_type type;
+ bool has_gals;
+ u32 bus_sel; /* Balance some larbs to enter mmu0 or mmu1 */
};
struct mtk_smi_larb_gen {
@@ -409,29 +409,29 @@ static struct platform_driver mtk_smi_larb_driver = {
};
static const struct mtk_smi_common_plat mtk_smi_common_gen1 = {
- .gen = MTK_SMI_GEN1,
+ .type = MTK_SMI_GEN1,
};
static const struct mtk_smi_common_plat mtk_smi_common_gen2 = {
- .gen = MTK_SMI_GEN2,
+ .type = MTK_SMI_GEN2,
};
static const struct mtk_smi_common_plat mtk_smi_common_mt6779 = {
- .gen = MTK_SMI_GEN2,
- .has_gals = true,
- .bus_sel = F_MMU1_LARB(1) | F_MMU1_LARB(2) | F_MMU1_LARB(4) |
- F_MMU1_LARB(5) | F_MMU1_LARB(6) | F_MMU1_LARB(7),
+ .type = MTK_SMI_GEN2,
+ .has_gals = true,
+ .bus_sel = F_MMU1_LARB(1) | F_MMU1_LARB(2) | F_MMU1_LARB(4) |
+ F_MMU1_LARB(5) | F_MMU1_LARB(6) | F_MMU1_LARB(7),
};
static const struct mtk_smi_common_plat mtk_smi_common_mt8183 = {
- .gen = MTK_SMI_GEN2,
+ .type = MTK_SMI_GEN2,
.has_gals = true,
.bus_sel = F_MMU1_LARB(1) | F_MMU1_LARB(2) | F_MMU1_LARB(5) |
F_MMU1_LARB(7),
};
static const struct mtk_smi_common_plat mtk_smi_common_mt8192 = {
- .gen = MTK_SMI_GEN2,
+ .type = MTK_SMI_GEN2,
.has_gals = true,
.bus_sel = F_MMU1_LARB(1) | F_MMU1_LARB(2) | F_MMU1_LARB(5) |
F_MMU1_LARB(6),
@@ -494,7 +494,7 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
* clock into emi clock domain, but for mtk smi gen2, there's no smi ao
* base.
*/
- if (common->plat->gen == MTK_SMI_GEN1) {
+ if (common->plat->type == MTK_SMI_GEN1) {
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
common->smi_ao_base = devm_ioremap_resource(dev, res);
if (IS_ERR(common->smi_ao_base))
@@ -534,7 +534,7 @@ static int __maybe_unused mtk_smi_common_resume(struct device *dev)
if (ret)
return ret;
- if (common->plat->gen == MTK_SMI_GEN2 && bus_sel)
+ if (common->plat->type == MTK_SMI_GEN2 && bus_sel)
writel(bus_sel, common->base + SMI_BUS_SEL);
return 0;
}
--
2.18.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-09-14 11:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 11:36 [PATCH v4 00/13] MT8195 SMI support Yong Wu
2021-09-14 11:36 ` [PATCH v4 01/13] dt-bindings: memory: mediatek: Add mt8195 smi binding Yong Wu
2021-09-14 11:36 ` [PATCH v4 02/13] dt-bindings: memory: mediatek: Add mt8195 smi sub common Yong Wu
2021-09-21 20:36 ` Rob Herring
2021-09-14 11:36 ` [PATCH v4 03/13] memory: mtk-smi: Use clk_bulk clock ops Yong Wu
2021-10-15 13:38 ` AngeloGioacchino Del Regno
2021-10-15 13:43 ` Krzysztof Kozlowski
2021-10-15 13:47 ` AngeloGioacchino Del Regno
2021-09-14 11:36 ` Yong Wu [this message]
2021-09-14 11:36 ` [PATCH v4 05/13] memory: mtk-smi: Adjust some code position Yong Wu
2021-09-14 11:36 ` [PATCH v4 06/13] memory: mtk-smi: Add error handle for smi_probe Yong Wu
2021-09-14 11:36 ` [PATCH v4 07/13] memory: mtk-smi: Add device link for smi-sub-common Yong Wu
2021-09-14 11:36 ` [PATCH v4 08/13] memory: mtk-smi: Add clocks " Yong Wu
2021-09-14 11:36 ` [PATCH v4 09/13] memory: mtk-smi: Use devm_platform_ioremap_resource Yong Wu
2021-09-14 11:37 ` [PATCH v4 10/13] memory: mtk-smi: mt8195: Add smi support Yong Wu
2021-09-14 11:37 ` [PATCH v4 11/13] memory: mtk-smi: mt8195: Add initial setting for smi-common Yong Wu
2021-09-14 11:37 ` [PATCH v4 12/13] memory: mtk-smi: mt8195: Add initial setting for smi-larb Yong Wu
2021-09-14 11:37 ` [PATCH v4 13/13] MAINTAINERS: Add entry for MediaTek SMI Yong Wu
2021-09-22 6:44 ` [PATCH v4 00/13] MT8195 SMI support Krzysztof Kozlowski
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=20210914113703.31466-5-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=anan.sun@mediatek.com \
--cc=anthony.huang@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=ikjn@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=krzk@kernel.org \
--cc=krzysztof.kozlowski@canonical.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=ming-fan.chen@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=will@kernel.org \
--cc=yi.kuo@mediatek.com \
--cc=youlin.pei@mediatek.com \
/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).