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

Commit 45a81df0 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

memory: tegra: Register SMMU after MC driver became ready 



Memory Controller driver invokes SMMU driver registration and MC's
registers mapping is shared with SMMU. This mapping goes away if MC
driver probing fails after SMMU registration.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 273d7600

drivers/memory/tegra/mc.c

+9 −9
Original line number Diff line number Diff line
@@ -672,15 +672,6 @@ static int tegra_mc_probe(struct platform_device *pdev) 
		return err;

	}



	if (IS_ENABLED(CONFIG_TEGRA_IOMMU_SMMU)) {

		mc->smmu = tegra_smmu_probe(&pdev->dev, mc->soc->smmu, mc);

		if (IS_ERR(mc->smmu)) {

			dev_err(&pdev->dev, "failed to probe SMMU: %ld\n",

				PTR_ERR(mc->smmu));

			return PTR_ERR(mc->smmu);

		}

	}



	err = tegra_mc_reset_setup(mc);

	if (err < 0) {

		dev_err(&pdev->dev, "failed to register reset controller: %d\n",
@@ -706,6 +697,15 @@ static int tegra_mc_probe(struct platform_device *pdev) 
		return err;

	}



	if (IS_ENABLED(CONFIG_TEGRA_IOMMU_SMMU)) {

		mc->smmu = tegra_smmu_probe(&pdev->dev, mc->soc->smmu, mc);

		if (IS_ERR(mc->smmu)) {

			dev_err(&pdev->dev, "failed to probe SMMU: %ld\n",

				PTR_ERR(mc->smmu));

			return PTR_ERR(mc->smmu);

		}

	}



	return 0;

}