2020-01-08 06:42:38

by Ming-Fan Chen

Subject: [PATCH v3 2/3] memory: mtk-smi: Add basic support for MT6779

Add smi-larb and smi-common nodes and config_port for MT6779.

changelog since v2:
Split basic nodes and config_port support from initial golden setting patch

Signed-off-by: Ming-Fan Chen <[email protected]>
---
drivers/memory/mtk-smi.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index 439d7d8..d0b747a 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -239,6 +239,13 @@ static void mtk_smi_larb_config_port_gen1(struct device *dev)
.larb_direct_to_common_mask = BIT(8) | BIT(9), /* bdpsys */
};

+static const struct mtk_smi_larb_gen mtk_smi_larb_mt6779 = {
+ .config_port = mtk_smi_larb_config_port_gen2_general,
+ .larb_direct_to_common_mask =
+ BIT(4) | BIT(6) | BIT(11) | BIT(12) | BIT(13),
+ /* DUMMY | IPU0 | IPU1 | CCU | MDLA */
+};
+
static const struct mtk_smi_larb_gen mtk_smi_larb_mt8183 = {
.has_gals = true,
.config_port = mtk_smi_larb_config_port_gen2_general,
@@ -260,6 +267,10 @@ static void mtk_smi_larb_config_port_gen1(struct device *dev)
.data = &mtk_smi_larb_mt2712
},
{
+ .compatible = "mediatek,mt6779-smi-larb",
+ .data = &mtk_smi_larb_mt6779
+ },
+ {
.compatible = "mediatek,mt8183-smi-larb",
.data = &mtk_smi_larb_mt8183
},
@@ -386,6 +397,13 @@ static int __maybe_unused mtk_smi_larb_suspend(struct device *dev)
.gen = 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),
+};
+
static const struct mtk_smi_common_plat mtk_smi_common_mt8183 = {
.gen = MTK_SMI_GEN2,
.has_gals = true,
@@ -407,6 +425,10 @@ static int __maybe_unused mtk_smi_larb_suspend(struct device *dev)
.data = &mtk_smi_common_gen2,
},
{
+ .compatible = "mediatek,mt6779-smi-common",
+ .data = &mtk_smi_common_mt6779,
+ },
+ {
.compatible = "mediatek,mt8183-smi-common",
.data = &mtk_smi_common_mt8183,
},
--
1.7.9.5

2020-02-12 11:24:28

by Matthias Brugger

Subject: Re: [PATCH v3 2/3] memory: mtk-smi: Add basic support for MT6779

On 08/01/2020 07:41, Ming-Fan Chen wrote:
> Add smi-larb and smi-common nodes and config_port for MT6779.
>
> changelog since v2:
> Split basic nodes and config_port support from initial golden setting patch
>
> Signed-off-by: Ming-Fan Chen <[email protected]>

Reviewed-by: Matthias Brugger <[email protected]>

> ---
> drivers/memory/mtk-smi.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
> index 439d7d8..d0b747a 100644
> --- a/drivers/memory/mtk-smi.c
> +++ b/drivers/memory/mtk-smi.c
> @@ -239,6 +239,13 @@ static void mtk_smi_larb_config_port_gen1(struct device *dev)
> .larb_direct_to_common_mask = BIT(8) | BIT(9), /* bdpsys */
> };
>
> +static const struct mtk_smi_larb_gen mtk_smi_larb_mt6779 = {
> + .config_port = mtk_smi_larb_config_port_gen2_general,
> + .larb_direct_to_common_mask =
> + BIT(4) | BIT(6) | BIT(11) | BIT(12) | BIT(13),
> + /* DUMMY | IPU0 | IPU1 | CCU | MDLA */
> +};
> +
> static const struct mtk_smi_larb_gen mtk_smi_larb_mt8183 = {
> .has_gals = true,
> .config_port = mtk_smi_larb_config_port_gen2_general,
> @@ -260,6 +267,10 @@ static void mtk_smi_larb_config_port_gen1(struct device *dev)
> .data = &mtk_smi_larb_mt2712
> },
> {
> + .compatible = "mediatek,mt6779-smi-larb",
> + .data = &mtk_smi_larb_mt6779
> + },
> + {
> .compatible = "mediatek,mt8183-smi-larb",
> .data = &mtk_smi_larb_mt8183
> },
> @@ -386,6 +397,13 @@ static int __maybe_unused mtk_smi_larb_suspend(struct device *dev)
> .gen = 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),
> +};
> +
> static const struct mtk_smi_common_plat mtk_smi_common_mt8183 = {
> .gen = MTK_SMI_GEN2,
> .has_gals = true,
> @@ -407,6 +425,10 @@ static int __maybe_unused mtk_smi_larb_suspend(struct device *dev)
> .data = &mtk_smi_common_gen2,
> },
> {
> + .compatible = "mediatek,mt6779-smi-common",
> + .data = &mtk_smi_common_mt6779,
> + },
> + {
> .compatible = "mediatek,mt8183-smi-common",
> .data = &mtk_smi_common_mt8183,
> },
>