Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 363932cd authored by Honghui Zhang's avatar Honghui Zhang Committed by Joerg Roedel
Browse files

memory: mtk-smi: add larbid handle routine 



In the commit 3c8f4ad8 ("memory/mediatek: add support for mt2701"),
the larb->larbid was added but not initialized.
Mediatek's gen1 smi need this hardware larbid information to get the
register offset which controls whether enable iommu for this larb.
This patch add the initialize routine for larbid.

Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: default avatarHonghui Zhang <honghui.zhang@mediatek.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 75487860

drivers/memory/mtk-smi.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ 
#define SMI_SECUR_CON_VAL_DOMAIN(id)	(0x3 << ((((id) & 0x7) << 2) + 1))

#define SMI_SECUR_CON_VAL_DOMAIN(id)	(0x3 << ((((id) & 0x7) << 2) + 1))





struct mtk_smi_larb_gen {

struct mtk_smi_larb_gen {

	bool need_larbid;

	int port_in_larb[MTK_LARB_NR_MAX + 1];

	int port_in_larb[MTK_LARB_NR_MAX + 1];

	void (*config_port)(struct device *);

	void (*config_port)(struct device *);

};

};
@@ -214,6 +215,7 @@ static const struct mtk_smi_larb_gen mtk_smi_larb_mt8173 = { 
};

};





static const struct mtk_smi_larb_gen mtk_smi_larb_mt2701 = {

static const struct mtk_smi_larb_gen mtk_smi_larb_mt2701 = {

	.need_larbid = true,

	.port_in_larb = {

	.port_in_larb = {

		LARB0_PORT_OFFSET, LARB1_PORT_OFFSET,

		LARB0_PORT_OFFSET, LARB1_PORT_OFFSET,

		LARB2_PORT_OFFSET, LARB3_PORT_OFFSET

		LARB2_PORT_OFFSET, LARB3_PORT_OFFSET
@@ -240,6 +242,7 @@ static int mtk_smi_larb_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device *dev = &pdev->dev;

	struct device_node *smi_node;

	struct device_node *smi_node;

	struct platform_device *smi_pdev;

	struct platform_device *smi_pdev;

	int err;





	if (!dev->pm_domain)

	if (!dev->pm_domain)

		return -EPROBE_DEFER;

		return -EPROBE_DEFER;
@@ -263,6 +266,15 @@ static int mtk_smi_larb_probe(struct platform_device *pdev) 
		return PTR_ERR(larb->smi.clk_smi);

		return PTR_ERR(larb->smi.clk_smi);

	larb->smi.dev = dev;

	larb->smi.dev = dev;





	if (larb->larb_gen->need_larbid) {

		err = of_property_read_u32(dev->of_node, "mediatek,larb-id",

					   &larb->larbid);

		if (err) {

			dev_err(dev, "missing larbid property\n");

			return err;

		}

	}



	smi_node = of_parse_phandle(dev->of_node, "mediatek,smi", 0);

	smi_node = of_parse_phandle(dev->of_node, "mediatek,smi", 0);

	if (!smi_node)

	if (!smi_node)

		return -EINVAL;

		return -EINVAL;