Commit a5c18986 authored by Yong Wu's avatar Yong Wu Committed by Krzysztof Kozlowski
Browse files

memory: mtk-smi: Rename smi_gen to smi_type 



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: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarIkjoon Jang <ikjn@chromium.org>
Link: https://lore.kernel.org/r/20210914113703.31466-5-yong.wu@mediatek.com


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
parent 0e14917c

drivers/memory/mtk-smi.c

+14 −14
Original line number Diff line number Diff line
@@ -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,7 +75,7 @@ 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;

	enum mtk_smi_type	type;

	bool			has_gals;

	u32			bus_sel; /* Balance some larbs to enter mmu0 or mmu1 */

};
@@ -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,

	.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;

}