Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC driver updates from Olof Johansson:
 "Some of the larger changes this merge window:

   - Removal of drivers for Exynos5440, a Samsung SoC that never saw
     widespread use.

   - Uniphier support for USB3 and SPI reset handling

   - Syste control and SRAM drivers and bindings for Allwinner platforms

   - Qualcomm AOSS (Always-on subsystem) reset controller drivers

   - Raspberry Pi hwmon driver for voltage

   - Mediatek pwrap (pmic) support for MT6797 SoC"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (52 commits)
  drivers/firmware: psci_checker: stash and use topology_core_cpumask for hotplug tests
  soc: fsl: cleanup Kconfig menu
  soc: fsl: dpio: Convert DPIO documentation to .rst
  staging: fsl-mc: Remove remaining files
  staging: fsl-mc: Move DPIO from staging to drivers/soc/fsl
  staging: fsl-dpaa2: eth: move generic FD defines to DPIO
  soc: fsl: qe: gpio: Add qe_gpio_set_multiple
  usb: host: exynos: Remove support for Exynos5440
  clk: samsung: Remove support for Exynos5440
  soc: sunxi: Add the A13, A23 and H3 system control compatibles
  reset: uniphier: add reset control support for SPI
  cpufreq: exynos: Remove support for Exynos5440
  ata: ahci-platform: Remove support for Exynos5440
  soc: imx6qp: Use GENPD_FLAG_ALWAYS_ON for PU errata
  soc: mediatek: pwrap: add mt6351 driver for mt6797 SoCs
  soc: mediatek: pwrap: add pwrap driver for mt6797 SoCs
  soc: mediatek: pwrap: fix cipher init setting error
  dt-bindings: pwrap: mediatek: add pwrap support for MT6797
  reset: uniphier: add USB3 core reset control
  dt-bindings: reset: uniphier: add USB3 core reset support
  ...

2 files changed, 39 insertions, 10 deletions

diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
index bb93cc53554e..bd25faf6d13d 100644
--- a/drivers/memory/tegra/mc.c
+++ b/drivers/memory/tegra/mc.c
@@ -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;
diff --git a/drivers/memory/ti-emif-pm.c b/drivers/memory/ti-emif-pm.c
index 632651f4b6e8..2250d03ea17f 100644
--- a/drivers/memory/ti-emif-pm.c
+++ b/drivers/memory/ti-emif-pm.c
@@ -249,6 +249,34 @@ static const struct of_device_id ti_emif_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ti_emif_of_match);
 
+#ifdef CONFIG_PM_SLEEP
+static int ti_emif_resume(struct device *dev)
+{
+        unsigned long tmp =
+                        __raw_readl((void *)emif_instance->ti_emif_sram_virt);
+
+        /*
+         * Check to see if what we are copying is already present in the
+         * first byte at the destination, only copy if it is not which
+         * indicates we have lost context and sram no longer contains
+         * the PM code
+         */
+        if (tmp != ti_emif_sram)
+                ti_emif_push_sram(dev, emif_instance);
+
+        return 0;
+}
+
+static int ti_emif_suspend(struct device *dev)
+{
+        /*
+         * The contents will be present in DDR hence no need to
+         * explicitly save
+         */
+        return 0;
+}
+#endif /* CONFIG_PM_SLEEP */
+
 static int ti_emif_probe(struct platform_device *pdev)
 {
         int ret;
@@ -308,12 +336,17 @@ static int ti_emif_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct dev_pm_ops ti_emif_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(ti_emif_suspend, ti_emif_resume)
+};
+
 static struct platform_driver ti_emif_driver = {
         .probe = ti_emif_probe,
         .remove = ti_emif_remove,
         .driver = {
                 .name = KBUILD_MODNAME,
                 .of_match_table = of_match_ptr(ti_emif_of_match),
+                .pm = &ti_emif_pm_ops,
         },
 };
 module_platform_driver(ti_emif_driver);