Revert "HACK (do not mainline): mtd: nand: atmel: Save/restore SMC regs"

This reverts commit 700fa87.

Author: claudiubeznea

drivers/mtd/nand/atmel/nand-controller.c

@@ -2525,35 +2525,11 @@ static int atmel_nand_controller_remove(struct platform_device *pdev)
 	return nc->caps->ops->remove(nc);
 }
 
-static __maybe_unused int atmel_nand_controller_suspend(struct device *dev)
-{
-	struct atmel_nand_controller *nc = dev_get_drvdata(dev);
-	struct atmel_pmecc *pmecc = nc->pmecc;
-
-	if (pmecc && pmecc->regs.timing) {
-		pmecc->suspend.setup = readl(pmecc->regs.timing);
-		pmecc->suspend.pulse = readl(pmecc->regs.timing + 0x4);
-		pmecc->suspend.cycle = readl(pmecc->regs.timing + 0x8);
-		pmecc->suspend.timings = readl(pmecc->regs.timing + 0xc);
-		pmecc->suspend.mode = readl(pmecc->regs.timing + 0x10);
-	}
-
-	return 0;
-}
 static __maybe_unused int atmel_nand_controller_resume(struct device *dev)
 {
 	struct atmel_nand_controller *nc = dev_get_drvdata(dev);
-	struct atmel_pmecc *pmecc = nc->pmecc;
 	struct atmel_nand *nand;
 
-	if (pmecc && pmecc->regs.timing) {
-		writel(pmecc->suspend.setup, pmecc->regs.timing);
-		writel(pmecc->suspend.pulse, pmecc->regs.timing + 0x4);
-		writel(pmecc->suspend.cycle, pmecc->regs.timing + 0x8);
-		writel(pmecc->suspend.timings, pmecc->regs.timing + 0xc);
-		writel(pmecc->suspend.mode, pmecc->regs.timing + 0x10);
-	}
-
 	list_for_each_entry(nand, &nc->chips, node) {
 		int i;
 
@@ -2564,8 +2540,7 @@ static __maybe_unused int atmel_nand_controller_resume(struct device *dev)
 	return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(atmel_nand_controller_pm_ops,
-			 atmel_nand_controller_suspend,
+static SIMPLE_DEV_PM_OPS(atmel_nand_controller_pm_ops, NULL,
 			 atmel_nand_controller_resume);
 
 static struct platform_driver atmel_nand_controller_driver = {

drivers/mtd/nand/atmel/pmecc.c

@@ -148,6 +148,18 @@ struct atmel_pmecc_caps {
 	bool correct_erased_chunks;
 };
 
+struct atmel_pmecc {
+	struct device *dev;
+	const struct atmel_pmecc_caps *caps;
+
+	struct {
+		void __iomem *base;
+		void __iomem *errloc;
+	} regs;
+
+	struct mutex lock;
+};
+
 struct atmel_pmecc_user_conf_cache {
 	u32 cfg;
 	u32 sarea;
@@ -817,8 +829,7 @@ EXPORT_SYMBOL_GPL(atmel_pmecc_wait_rdy);
 
 static struct atmel_pmecc *atmel_pmecc_create(struct platform_device *pdev,
 					const struct atmel_pmecc_caps *caps,
-					int pmecc_res_idx, int errloc_res_idx,
-					int timing_res_idx)
+					int pmecc_res_idx, int errloc_res_idx)
 {
 	struct device *dev = &pdev->dev;
 	struct atmel_pmecc *pmecc;
@@ -842,11 +853,6 @@ static struct atmel_pmecc *atmel_pmecc_create(struct platform_device *pdev,
 	if (IS_ERR(pmecc->regs.errloc))
 		return ERR_CAST(pmecc->regs.errloc);
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, timing_res_idx);
-	pmecc->regs.timing = devm_ioremap_resource(dev, res);
-	if (IS_ERR(pmecc->regs.timing))
-		return ERR_CAST(pmecc->regs.timing);
-
 	/* Disable all interrupts before registering the PMECC handler. */
 	writel(0xffffffff, pmecc->regs.base + ATMEL_PMECC_IDR);
 
@@ -954,7 +960,7 @@ struct atmel_pmecc *devm_atmel_pmecc_get(struct device *userdev)
 		if (match && match->data)
 			caps = match->data;
 
-		pmecc = atmel_pmecc_create(pdev, caps, 1, 2, 4);
+		pmecc = atmel_pmecc_create(pdev, caps, 1, 2);
 	}
 
 	return pmecc;
@@ -981,7 +987,7 @@ static int atmel_pmecc_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	pmecc = atmel_pmecc_create(pdev, caps, 0, 1, 2);
+	pmecc = atmel_pmecc_create(pdev, caps, 0, 1);
 	if (IS_ERR(pmecc))
 		return PTR_ERR(pmecc);
 

drivers/mtd/nand/atmel/pmecc.h

@@ -54,29 +54,6 @@ struct atmel_pmecc_user_req {
 	} ecc;
 };
 
-struct atmel_pmecc_suspend_ctx {
-	u32 setup;
-	u32 pulse;
-	u32 cycle;
-	u32 timings;
-	u32 mode;
-};
-
-struct atmel_pmecc {
-	struct device *dev;
-	const struct atmel_pmecc_caps *caps;
-
-	struct {
-		void __iomem *base;
-		void __iomem *errloc;
-		void __iomem *timing;
-	} regs;
-
-	struct mutex lock;
-
-	struct atmel_pmecc_suspend_ctx suspend;
-};
-
 struct atmel_pmecc *devm_atmel_pmecc_get(struct device *dev);
 
 struct atmel_pmecc_user *