From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Brugger Subject: Re: [PATCH v4 04/18] memory: mtk-smi: Use a struct for the platform data for smi-common Date: Fri, 21 Dec 2018 18:49:09 +0100 Message-ID: <7a216644-bc10-c31d-209a-abbcf20a14b6@gmail.com> References: <1544258371-4600-1-git-send-email-yong.wu@mediatek.com> <1544258371-4600-5-git-send-email-yong.wu@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1544258371-4600-5-git-send-email-yong.wu@mediatek.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Yong Wu , Joerg Roedel , Robin Murphy , Rob Herring Cc: Tomasz Figa , Will Deacon , linux-mediatek@lists.infradead.org, srv_heupstream@mediatek.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, arnd@arndb.de, yingjoe.chen@mediatek.com, youlin.pei@mediatek.com, Nicolas Boichat , Arvind Yadav List-Id: devicetree@vger.kernel.org On 08/12/2018 09:39, Yong Wu wrote: > Use a struct as the platform special data instead of the enumeration. > > Also there is a minor change that moving the position of > "enum mtk_smi_gen" definition, this is because we expect define > "struct mtk_smi_common_plat" before it is referred. > > This is a preparing patch for mt8183. > > Signed-off-by: Yong Wu Reviewed-by: Matthias Brugger > --- > drivers/memory/mtk-smi.c | 35 ++++++++++++++++++++++++----------- > 1 file changed, 24 insertions(+), 11 deletions(-) > > diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c > index 3b9ad0e..a5ddd42 100644 > --- a/drivers/memory/mtk-smi.c > +++ b/drivers/memory/mtk-smi.c > @@ -49,6 +49,15 @@ > #define SMI_LARB_NONSEC_CON(id) (0x380 + ((id) * 4)) > #define F_MMU_EN BIT(0) > > +enum mtk_smi_gen { > + MTK_SMI_GEN1, > + MTK_SMI_GEN2 > +}; > + > +struct mtk_smi_common_plat { > + enum mtk_smi_gen gen; > +}; > + > struct mtk_smi_larb_gen { > bool need_larbid; > int port_in_larb[MTK_LARB_NR_MAX + 1]; > @@ -61,6 +70,8 @@ struct mtk_smi { > struct clk *clk_apb, *clk_smi; > struct clk *clk_async; /*only needed by mt2701*/ > void __iomem *smi_ao_base; > + > + const struct mtk_smi_common_plat *plat; > }; > > struct mtk_smi_larb { /* larb: local arbiter */ > @@ -72,11 +83,6 @@ struct mtk_smi_larb { /* larb: local arbiter */ > u32 *mmu; > }; > > -enum mtk_smi_gen { > - MTK_SMI_GEN1, > - MTK_SMI_GEN2 > -}; > - > static int mtk_smi_enable(const struct mtk_smi *smi) > { > int ret; > @@ -351,18 +357,26 @@ static int mtk_smi_larb_remove(struct platform_device *pdev) > } > }; > > +static const struct mtk_smi_common_plat mtk_smi_common_gen1 = { > + .gen = MTK_SMI_GEN1, > +}; > + > +static const struct mtk_smi_common_plat mtk_smi_common_gen2 = { > + .gen = MTK_SMI_GEN2, > +}; > + > static const struct of_device_id mtk_smi_common_of_ids[] = { > { > .compatible = "mediatek,mt8173-smi-common", > - .data = (void *)MTK_SMI_GEN2 > + .data = &mtk_smi_common_gen2, > }, > { > .compatible = "mediatek,mt2701-smi-common", > - .data = (void *)MTK_SMI_GEN1 > + .data = &mtk_smi_common_gen1, > }, > { > .compatible = "mediatek,mt2712-smi-common", > - .data = (void *)MTK_SMI_GEN2 > + .data = &mtk_smi_common_gen2, > }, > {} > }; > @@ -372,13 +386,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev) > struct device *dev = &pdev->dev; > struct mtk_smi *common; > struct resource *res; > - enum mtk_smi_gen smi_gen; > int ret; > > common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL); > if (!common) > return -ENOMEM; > common->dev = dev; > + common->plat = of_device_get_match_data(dev); > > common->clk_apb = devm_clk_get(dev, "apb"); > if (IS_ERR(common->clk_apb)) > @@ -394,8 +408,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. > */ > - smi_gen = (enum mtk_smi_gen)of_device_get_match_data(dev); > - if (smi_gen == MTK_SMI_GEN1) { > + if (common->plat->gen == 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)) >