Commit 7af239f0 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'tegra-for-4.19-memory' of...

Merge tag 'tegra-for-4.19-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

memory: tegra: Changes for v4.19-rc1

This contains a single fix for the initialization order of the various
parts of the Tegra memory controller driver.

* tag 'tegra-for-4.19-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  memory: tegra: Correct driver probe order
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 20d87a51 1662dd64
...@@ -672,13 +672,6 @@ static int tegra_mc_probe(struct platform_device *pdev) ...@@ -672,13 +672,6 @@ static int tegra_mc_probe(struct platform_device *pdev)
return err; return err;
} }
err = tegra_mc_reset_setup(mc);
if (err < 0) {
dev_err(&pdev->dev, "failed to register reset controller: %d\n",
err);
return err;
}
mc->irq = platform_get_irq(pdev, 0); mc->irq = platform_get_irq(pdev, 0);
if (mc->irq < 0) { if (mc->irq < 0) {
dev_err(&pdev->dev, "interrupt not specified\n"); dev_err(&pdev->dev, "interrupt not specified\n");
...@@ -697,13 +690,16 @@ static int tegra_mc_probe(struct platform_device *pdev) ...@@ -697,13 +690,16 @@ static int tegra_mc_probe(struct platform_device *pdev)
return err; return err;
} }
err = tegra_mc_reset_setup(mc);
if (err < 0)
dev_err(&pdev->dev, "failed to register reset controller: %d\n",
err);
if (IS_ENABLED(CONFIG_TEGRA_IOMMU_SMMU)) { if (IS_ENABLED(CONFIG_TEGRA_IOMMU_SMMU)) {
mc->smmu = tegra_smmu_probe(&pdev->dev, mc->soc->smmu, mc); mc->smmu = tegra_smmu_probe(&pdev->dev, mc->soc->smmu, mc);
if (IS_ERR(mc->smmu)) { if (IS_ERR(mc->smmu))
dev_err(&pdev->dev, "failed to probe SMMU: %ld\n", dev_err(&pdev->dev, "failed to probe SMMU: %ld\n",
PTR_ERR(mc->smmu)); PTR_ERR(mc->smmu));
return PTR_ERR(mc->smmu);
}
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment