mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAltHcXYTHHRyZWRpbmdA bnZpZGlhLmNvbQAKCRDdI6zXfz6zoduGD/4z8pv473qajbb4fEyULrbJR5byEN+U 1jco6IpvOj/WPWEedAjZkDI7rTmJ3s2qSfM2rGxQw/PEw7XG7efULUxPk9ZHDzIo QdNn8N3JcL/DrsoP2DWRSgD2rSKzZQl2DCjwHgYFgqiRdx9iNsS3FmjNl2XucAZm ZarFgTGl+BWOv1NszFhhHI3t4W06uAc1QQUq7gMzAvNo8MflrqWu+2NjUJmaalnV LTrtO95cuX/u9zavFxJEnriWpqNTYhdeeCvXX69Q4onQ3s7N6TChcfsCrYewuXEr 2CpLqhJg79Xcmu/DwKFwhwqiWUDa7IwBqo+vondHvyAcFRrzXS9xwu5JziHzgWtk WEb2xsE8eAWZl+lGjkjLUIBRoTer/LWJdq9wV4cvAdJCP0rwbDW2pbptjEiYT6HX hcBESouqlolSBoHJUuKbIbucg5gkkvz5mBdUB/sPvbFDHWBWIT9KcfazLu81CjFr C5Lqkri+TPJnOlWObVKQHWvBIORTY01lnBttBAVkaEl+5FCdjfz9GSNaQq88unWU 4FDu3Dn+HtsPXLVl7CeuTdLYsdblLPFeJC9lvOcepOS678fOofl1Ga0ZY99bEMcy M85D7vkfd8/8Xg62kOKgEXtfIm1Kkrl2U5PW0BrKgUq+vFLbPjz/5uqGyL0jgZSG cMNew5daRkiMhw== =7m8q -----END PGP SIGNATURE----- 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: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
7af239f0c9
1 changed files with 6 additions and 10 deletions
|
@ -672,13 +672,6 @@ static int tegra_mc_probe(struct platform_device *pdev)
|
|||
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);
|
||||
if (mc->irq < 0) {
|
||||
dev_err(&pdev->dev, "interrupt not specified\n");
|
||||
|
@ -697,13 +690,16 @@ static int tegra_mc_probe(struct platform_device *pdev)
|
|||
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)) {
|
||||
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",
|
||||
PTR_ERR(mc->smmu));
|
||||
return PTR_ERR(mc->smmu);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue