Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS

1 files changed, 147 insertions, 63 deletions

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 9b80ad36dbba..ba1a872b221e 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -41,6 +41,9 @@
 
 #define OMAP2_MCSPI_MAX_FREQ            48000000
 
+/* OMAP2 has 3 SPI controllers, while OMAP3 has 4 */
+#define OMAP2_MCSPI_MAX_CTRL            4
+
 #define OMAP2_MCSPI_REVISION            0x00
 #define OMAP2_MCSPI_SYSCONFIG           0x10
 #define OMAP2_MCSPI_SYSSTATUS           0x14
@@ -59,40 +62,40 @@
 
 /* per-register bitmasks: */
 
-#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE (2 << 3)
-#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP (1 << 2)
-#define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE  (1 << 0)
-#define OMAP2_MCSPI_SYSCONFIG_SOFTRESET (1 << 1)
+#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE BIT(4)
+#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP BIT(2)
+#define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE  BIT(0)
+#define OMAP2_MCSPI_SYSCONFIG_SOFTRESET BIT(1)
 
-#define OMAP2_MCSPI_SYSSTATUS_RESETDONE (1 << 0)
+#define OMAP2_MCSPI_SYSSTATUS_RESETDONE BIT(0)
 
-#define OMAP2_MCSPI_MODULCTRL_SINGLE    (1 << 0)
-#define OMAP2_MCSPI_MODULCTRL_MS        (1 << 2)
-#define OMAP2_MCSPI_MODULCTRL_STEST     (1 << 3)
+#define OMAP2_MCSPI_MODULCTRL_SINGLE    BIT(0)
+#define OMAP2_MCSPI_MODULCTRL_MS        BIT(2)
+#define OMAP2_MCSPI_MODULCTRL_STEST     BIT(3)
 
-#define OMAP2_MCSPI_CHCONF_PHA          (1 << 0)
-#define OMAP2_MCSPI_CHCONF_POL          (1 << 1)
+#define OMAP2_MCSPI_CHCONF_PHA          BIT(0)
+#define OMAP2_MCSPI_CHCONF_POL          BIT(1)
 #define OMAP2_MCSPI_CHCONF_CLKD_MASK    (0x0f << 2)
-#define OMAP2_MCSPI_CHCONF_EPOL         (1 << 6)
+#define OMAP2_MCSPI_CHCONF_EPOL         BIT(6)
 #define OMAP2_MCSPI_CHCONF_WL_MASK      (0x1f << 7)
-#define OMAP2_MCSPI_CHCONF_TRM_RX_ONLY  (0x01 << 12)
-#define OMAP2_MCSPI_CHCONF_TRM_TX_ONLY  (0x02 << 12)
+#define OMAP2_MCSPI_CHCONF_TRM_RX_ONLY  BIT(12)
+#define OMAP2_MCSPI_CHCONF_TRM_TX_ONLY  BIT(13)
 #define OMAP2_MCSPI_CHCONF_TRM_MASK     (0x03 << 12)
-#define OMAP2_MCSPI_CHCONF_DMAW         (1 << 14)
-#define OMAP2_MCSPI_CHCONF_DMAR         (1 << 15)
-#define OMAP2_MCSPI_CHCONF_DPE0         (1 << 16)
-#define OMAP2_MCSPI_CHCONF_DPE1         (1 << 17)
-#define OMAP2_MCSPI_CHCONF_IS           (1 << 18)
-#define OMAP2_MCSPI_CHCONF_TURBO        (1 << 19)
-#define OMAP2_MCSPI_CHCONF_FORCE        (1 << 20)
+#define OMAP2_MCSPI_CHCONF_DMAW         BIT(14)
+#define OMAP2_MCSPI_CHCONF_DMAR         BIT(15)
+#define OMAP2_MCSPI_CHCONF_DPE0         BIT(16)
+#define OMAP2_MCSPI_CHCONF_DPE1         BIT(17)
+#define OMAP2_MCSPI_CHCONF_IS           BIT(18)
+#define OMAP2_MCSPI_CHCONF_TURBO        BIT(19)
+#define OMAP2_MCSPI_CHCONF_FORCE        BIT(20)
 
-#define OMAP2_MCSPI_CHSTAT_RXS          (1 << 0)
-#define OMAP2_MCSPI_CHSTAT_TXS          (1 << 1)
-#define OMAP2_MCSPI_CHSTAT_EOT          (1 << 2)
+#define OMAP2_MCSPI_CHSTAT_RXS          BIT(0)
+#define OMAP2_MCSPI_CHSTAT_TXS          BIT(1)
+#define OMAP2_MCSPI_CHSTAT_EOT          BIT(2)
 
-#define OMAP2_MCSPI_CHCTRL_EN           (1 << 0)
+#define OMAP2_MCSPI_CHCTRL_EN           BIT(0)
 
-#define OMAP2_MCSPI_WAKEUPENABLE_WKEN   (1 << 0)
+#define OMAP2_MCSPI_WAKEUPENABLE_WKEN   BIT(0)
 
 /* We have 2 DMA channels per CS, one for RX and one for TX */
 struct omap2_mcspi_dma {
@@ -131,8 +134,23 @@ struct omap2_mcspi_cs {
         void __iomem            *base;
         unsigned long           phys;
         int                     word_len;
+        struct list_head        node;
+        /* Context save and restore shadow register */
+        u32                     chconf0;
+};
+
+/* used for context save and restore, structure members to be updated whenever
+ * corresponding registers are modified.
+ */
+struct omap2_mcspi_regs {
+        u32 sysconfig;
+        u32 modulctrl;
+        u32 wakeupenable;
+        struct list_head cs;
 };
 
+static struct omap2_mcspi_regs omap2_mcspi_ctx[OMAP2_MCSPI_MAX_CTRL];
+
 static struct workqueue_struct *omap2_mcspi_wq;
 
 #define MOD_REG_BIT(val, mask, set) do { \
@@ -172,12 +190,27 @@ static inline u32 mcspi_read_cs_reg(const struct spi_device *spi, int idx)
         return __raw_readl(cs->base + idx);
 }
 
+static inline u32 mcspi_cached_chconf0(const struct spi_device *spi)
+{
+        struct omap2_mcspi_cs *cs = spi->controller_state;
+
+        return cs->chconf0;
+}
+
+static inline void mcspi_write_chconf0(const struct spi_device *spi, u32 val)
+{
+        struct omap2_mcspi_cs *cs = spi->controller_state;
+
+        cs->chconf0 = val;
+        mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, val);
+}
+
 static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
                 int is_read, int enable)
 {
         u32 l, rw;
 
-        l = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+        l = mcspi_cached_chconf0(spi);
 
         if (is_read) /* 1 is read, 0 write */
                 rw = OMAP2_MCSPI_CHCONF_DMAR;
@@ -185,7 +218,7 @@ static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
                 rw = OMAP2_MCSPI_CHCONF_DMAW;
 
         MOD_REG_BIT(l, rw, enable);
-        mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, l);
+        mcspi_write_chconf0(spi, l);
 }
 
 static void omap2_mcspi_set_enable(const struct spi_device *spi, int enable)
@@ -200,9 +233,9 @@ static void omap2_mcspi_force_cs(struct spi_device *spi, int cs_active)
 {
         u32 l;
 
-        l = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+        l = mcspi_cached_chconf0(spi);
         MOD_REG_BIT(l, OMAP2_MCSPI_CHCONF_FORCE, cs_active);
-        mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, l);
+        mcspi_write_chconf0(spi, l);
 }
 
 static void omap2_mcspi_set_master_mode(struct spi_master *master)
@@ -217,6 +250,46 @@ static void omap2_mcspi_set_master_mode(struct spi_master *master)
         MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_MS, 0);
         MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_SINGLE, 1);
         mcspi_write_reg(master, OMAP2_MCSPI_MODULCTRL, l);
+
+        omap2_mcspi_ctx[master->bus_num - 1].modulctrl = l;
+}
+
+static void omap2_mcspi_restore_ctx(struct omap2_mcspi *mcspi)
+{
+        struct spi_master *spi_cntrl;
+        struct omap2_mcspi_cs *cs;
+        spi_cntrl = mcspi->master;
+
+        /* McSPI: context restore */
+        mcspi_write_reg(spi_cntrl, OMAP2_MCSPI_MODULCTRL,
+                        omap2_mcspi_ctx[spi_cntrl->bus_num - 1].modulctrl);
+
+        mcspi_write_reg(spi_cntrl, OMAP2_MCSPI_SYSCONFIG,
+                        omap2_mcspi_ctx[spi_cntrl->bus_num - 1].sysconfig);
+
+        mcspi_write_reg(spi_cntrl, OMAP2_MCSPI_WAKEUPENABLE,
+                        omap2_mcspi_ctx[spi_cntrl->bus_num - 1].wakeupenable);
+
+        list_for_each_entry(cs, &omap2_mcspi_ctx[spi_cntrl->bus_num - 1].cs,
+                        node)
+                __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
+}
+static void omap2_mcspi_disable_clocks(struct omap2_mcspi *mcspi)
+{
+        clk_disable(mcspi->ick);
+        clk_disable(mcspi->fck);
+}
+
+static int omap2_mcspi_enable_clocks(struct omap2_mcspi *mcspi)
+{
+        if (clk_enable(mcspi->ick))
+                return -ENODEV;
+        if (clk_enable(mcspi->fck))
+                return -ENODEV;
+
+        omap2_mcspi_restore_ctx(mcspi);
+
+        return 0;
 }
 
 static unsigned
@@ -357,7 +430,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
         c = count;
         word_len = cs->word_len;
 
-        l = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+        l = mcspi_cached_chconf0(spi);
         l &= ~OMAP2_MCSPI_CHCONF_TRM_MASK;
 
         /* We store the pre-calculated register addresses on stack to speed
@@ -397,8 +470,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                  * more word i/o: switch to rx+tx
                                  */
                                 if (c == 0 && tx == NULL)
-                                        mcspi_write_cs_reg(spi,
-                                                        OMAP2_MCSPI_CHCONF0, l);
+                                        mcspi_write_chconf0(spi, l);
                                 *rx++ = __raw_readl(rx_reg);
 #ifdef VERBOSE
                                 dev_dbg(&spi->dev, "read-%d %02x\n",
@@ -436,8 +508,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                  * more word i/o: switch to rx+tx
                                  */
                                 if (c == 0 && tx == NULL)
-                                        mcspi_write_cs_reg(spi,
-                                                        OMAP2_MCSPI_CHCONF0, l);
+                                        mcspi_write_chconf0(spi, l);
                                 *rx++ = __raw_readl(rx_reg);
 #ifdef VERBOSE
                                 dev_dbg(&spi->dev, "read-%d %04x\n",
@@ -475,8 +546,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                  * more word i/o: switch to rx+tx
                                  */
                                 if (c == 0 && tx == NULL)
-                                        mcspi_write_cs_reg(spi,
-                                                        OMAP2_MCSPI_CHCONF0, l);
+                                        mcspi_write_chconf0(spi, l);
                                 *rx++ = __raw_readl(rx_reg);
 #ifdef VERBOSE
                                 dev_dbg(&spi->dev, "read-%d %04x\n",
@@ -505,10 +575,12 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
 {
         struct omap2_mcspi_cs *cs = spi->controller_state;
         struct omap2_mcspi *mcspi;
+        struct spi_master *spi_cntrl;
         u32 l = 0, div = 0;
         u8 word_len = spi->bits_per_word;
 
         mcspi = spi_master_get_devdata(spi->master);
+        spi_cntrl = mcspi->master;
 
         if (t != NULL && t->bits_per_word)
                 word_len = t->bits_per_word;
@@ -522,7 +594,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
         } else
                 div = 15;
 
-        l = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+        l = mcspi_cached_chconf0(spi);
 
         /* standard 4-wire master mode:  SCK, MOSI/out, MISO/in, nCS
          * REVISIT: this controller could support SPI_3WIRE mode.
@@ -554,7 +626,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
         else
                 l &= ~OMAP2_MCSPI_CHCONF_PHA;
 
-        mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, l);
+        mcspi_write_chconf0(spi, l);
 
         dev_dbg(&spi->dev, "setup: speed %d, sample %s edge, clk %s\n",
                         OMAP2_MCSPI_MAX_FREQ / (1 << div),
@@ -647,7 +719,11 @@ static int omap2_mcspi_setup(struct spi_device *spi)
                         return -ENOMEM;
                 cs->base = mcspi->base + spi->chip_select * 0x14;
                 cs->phys = mcspi->phys + spi->chip_select * 0x14;
+                cs->chconf0 = 0;
                 spi->controller_state = cs;
+                /* Link this to context save list */
+                list_add_tail(&cs->node,
+                        &omap2_mcspi_ctx[mcspi->master->bus_num - 1].cs);
         }
 
         if (mcspi_dma->dma_rx_channel == -1
@@ -657,11 +733,11 @@ static int omap2_mcspi_setup(struct spi_device *spi)
                         return ret;
         }
 
-        clk_enable(mcspi->ick);
-        clk_enable(mcspi->fck);
+        if (omap2_mcspi_enable_clocks(mcspi))
+                return -ENODEV;
+
         ret = omap2_mcspi_setup_transfer(spi, NULL);
-        clk_disable(mcspi->fck);
-        clk_disable(mcspi->ick);
+        omap2_mcspi_disable_clocks(mcspi);
 
         return ret;
 }
@@ -670,10 +746,15 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
 {
         struct omap2_mcspi      *mcspi;
         struct omap2_mcspi_dma  *mcspi_dma;
+        struct omap2_mcspi_cs   *cs;
 
         mcspi = spi_master_get_devdata(spi->master);
         mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
+        /* Unlink controller state from context save list */
+        cs = spi->controller_state;
+        list_del(&cs->node);
+
         kfree(spi->controller_state);
 
         if (mcspi_dma->dma_rx_channel != -1) {
@@ -693,8 +774,8 @@ static void omap2_mcspi_work(struct work_struct *work)
         mcspi = container_of(work, struct omap2_mcspi, work);
         spin_lock_irq(&mcspi->lock);
 
-        clk_enable(mcspi->ick);
-        clk_enable(mcspi->fck);
+        if (omap2_mcspi_enable_clocks(mcspi))
+                goto out;
 
         /* We only enable one channel at a time -- the one whose message is
          * at the head of the queue -- although this controller would gladly
@@ -741,13 +822,13 @@ static void omap2_mcspi_work(struct work_struct *work)
                                 cs_active = 1;
                         }
 
-                        chconf = mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
+                        chconf = mcspi_cached_chconf0(spi);
                         chconf &= ~OMAP2_MCSPI_CHCONF_TRM_MASK;
                         if (t->tx_buf == NULL)
                                 chconf |= OMAP2_MCSPI_CHCONF_TRM_RX_ONLY;
                         else if (t->rx_buf == NULL)
                                 chconf |= OMAP2_MCSPI_CHCONF_TRM_TX_ONLY;
-                        mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, chconf);
+                        mcspi_write_chconf0(spi, chconf);
 
                         if (t->len) {
                                 unsigned        count;
@@ -796,9 +877,9 @@ static void omap2_mcspi_work(struct work_struct *work)
                 spin_lock_irq(&mcspi->lock);
         }
 
-        clk_disable(mcspi->fck);
-        clk_disable(mcspi->ick);
+        omap2_mcspi_disable_clocks(mcspi);
 
+out:
         spin_unlock_irq(&mcspi->lock);
 }
 
@@ -885,8 +966,8 @@ static int __init omap2_mcspi_reset(struct omap2_mcspi *mcspi)
         struct spi_master       *master = mcspi->master;
         u32                     tmp;
 
-        clk_enable(mcspi->ick);
-        clk_enable(mcspi->fck);
+        if (omap2_mcspi_enable_clocks(mcspi))
+                return -1;
 
         mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG,
                         OMAP2_MCSPI_SYSCONFIG_SOFTRESET);
@@ -894,18 +975,18 @@ static int __init omap2_mcspi_reset(struct omap2_mcspi *mcspi)
                 tmp = mcspi_read_reg(master, OMAP2_MCSPI_SYSSTATUS);
         } while (!(tmp & OMAP2_MCSPI_SYSSTATUS_RESETDONE));
 
-        mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG,
-                        OMAP2_MCSPI_SYSCONFIG_AUTOIDLE |
-                        OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP |
-                        OMAP2_MCSPI_SYSCONFIG_SMARTIDLE);
+        tmp = OMAP2_MCSPI_SYSCONFIG_AUTOIDLE |
+                OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP |
+                OMAP2_MCSPI_SYSCONFIG_SMARTIDLE;
+        mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG, tmp);
+        omap2_mcspi_ctx[master->bus_num - 1].sysconfig = tmp;
 
-        mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE,
-                        OMAP2_MCSPI_WAKEUPENABLE_WKEN);
+        tmp = OMAP2_MCSPI_WAKEUPENABLE_WKEN;
+        mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE, tmp);
+        omap2_mcspi_ctx[master->bus_num - 1].wakeupenable = tmp;
 
         omap2_mcspi_set_master_mode(master);
-
-        clk_disable(mcspi->fck);
-        clk_disable(mcspi->ick);
+        omap2_mcspi_disable_clocks(mcspi);
         return 0;
 }
 
@@ -933,7 +1014,8 @@ static u8 __initdata spi2_txdma_id[] = {
         OMAP24XX_DMA_SPI2_TX1,
 };
 
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) \
+        || defined(CONFIG_ARCH_OMAP4)
 static u8 __initdata spi3_rxdma_id[] = {
         OMAP24XX_DMA_SPI3_RX0,
         OMAP24XX_DMA_SPI3_RX1,
@@ -945,7 +1027,7 @@ static u8 __initdata spi3_txdma_id[] = {
 };
 #endif
 
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 static u8 __initdata spi4_rxdma_id[] = {
         OMAP34XX_DMA_SPI4_RX0,
 };
@@ -975,14 +1057,15 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
                 txdma_id = spi2_txdma_id;
                 num_chipselect = 2;
                 break;
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
+        || defined(CONFIG_ARCH_OMAP4)
         case 3:
                 rxdma_id = spi3_rxdma_id;
                 txdma_id = spi3_txdma_id;
                 num_chipselect = 2;
                 break;
 #endif
-#ifdef CONFIG_ARCH_OMAP3
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
         case 4:
                 rxdma_id = spi4_rxdma_id;
                 txdma_id = spi4_txdma_id;
@@ -1038,6 +1121,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
 
         spin_lock_init(&mcspi->lock);
         INIT_LIST_HEAD(&mcspi->msg_queue);
+        INIT_LIST_HEAD(&omap2_mcspi_ctx[master->bus_num - 1].cs);
 
         mcspi->ick = clk_get(&pdev->dev, "ick");
         if (IS_ERR(mcspi->ick)) {