[v3,1/1] OMAP2: Spi: Force CS to be in inactive state after off-mode transition

Commit Message

Gregory CLEMENT Nov. 12, 2010, 4:45 p.m. UTC

None

Patch

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 2a651e6..708990e 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -1305,11 +1305,40 @@  static int __exit omap2_mcspi_remove(struct 
platform_device *pdev)
  /* work with hotplug and coldplug */
  MODULE_ALIAS("platform:omap2_mcspi");
  +#ifdef	CONFIG_PM
+/* When SPI wake up, CS is in wrong state: force it to unactive state*/
+static int omap2_mcspi_resume(struct platform_device *pdev)
+{
+	struct spi_master	*master;
+	struct omap2_mcspi	*mcspi;
+	struct omap2_mcspi_cs *cs;
+
+	master = dev_get_drvdata(&pdev->dev);
+	mcspi = spi_master_get_devdata(master);
+	omap2_mcspi_enable_clocks(master);
+	/* We need to togle CS state for OMAP take this chang in account*/
+
+	list_for_each_entry(cs, &omap2_mcspi_ctx[master->bus_num - 1].cs,
+			    node)
+    {
+        MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 1);
+		__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
+        MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 0);
+		__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
+    }
+	omap2_mcspi_disable_clocks(master);
+    return 0;
+}
+#else
+#define	omap2_mcspi_resume	NULL
+#endif
+
  static struct platform_driver omap2_mcspi_driver = {
  	.driver = {
  		.name =		"omap2_mcspi",
  		.owner =	THIS_MODULE,
  	},
+	.resume =	omap2_mcspi_resume,
  	.remove =	__exit_p(omap2_mcspi_remove),
  };
  -- 1.7.0.4