2 files changed, 105 insertions, 34 deletions

diff --git a/drivers/spi/spi_sh_msiof.c b/drivers/spi/spi_sh_msiof.c
index 56f60c8ea0ab..da6e42ec856e 100644
--- a/drivers/spi/spi_sh_msiof.c
+++ b/drivers/spi/spi_sh_msiof.c
@@ -9,22 +9,22 @@
  *
  */
 
-#include <linux/kernel.h>
-#include <linux/init.h>
+#include <linux/bitmap.h>
+#include <linux/clk.h>
+#include <linux/completion.h>
 #include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <linux/completion.h>
 #include <linux/pm_runtime.h>
-#include <linux/gpio.h>
-#include <linux/bitmap.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/err.h>
 
+#include <linux/spi/sh_msiof.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
-#include <linux/spi/sh_msiof.h>
 
 #include <asm/unaligned.h>
 
@@ -67,7 +67,7 @@ struct sh_msiof_spi_priv {
 #define STR_TEOF  (1 << 23)
 #define STR_REOF  (1 << 7)
 
-static unsigned long sh_msiof_read(struct sh_msiof_spi_priv *p, int reg_offs)
+static u32 sh_msiof_read(struct sh_msiof_spi_priv *p, int reg_offs)
 {
         switch (reg_offs) {
         case TSCR:
@@ -79,7 +79,7 @@ static unsigned long sh_msiof_read(struct sh_msiof_spi_priv *p, int reg_offs)
 }
 
 static void sh_msiof_write(struct sh_msiof_spi_priv *p, int reg_offs,
-                           unsigned long value)
+                           u32 value)
 {
         switch (reg_offs) {
         case TSCR:
@@ -93,10 +93,10 @@ static void sh_msiof_write(struct sh_msiof_spi_priv *p, int reg_offs,
 }
 
 static int sh_msiof_modify_ctr_wait(struct sh_msiof_spi_priv *p,
-                                    unsigned long clr, unsigned long set)
+                                    u32 clr, u32 set)
 {
-        unsigned long mask = clr | set;
-        unsigned long data;
+        u32 mask = clr | set;
+        u32 data;
         int k;
 
         data = sh_msiof_read(p, CTR);
@@ -166,10 +166,10 @@ static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p,
 }
 
 static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
-                                      int cpol, int cpha,
-                                      int tx_hi_z, int lsb_first)
+                                      u32 cpol, u32 cpha,
+                                      u32 tx_hi_z, u32 lsb_first)
 {
-        unsigned long tmp;
+        u32 tmp;
         int edge;
 
         /*
@@ -187,7 +187,7 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
         tmp |= cpol << 30; /* TSCKIZ */
         tmp |= cpol << 28; /* RSCKIZ */
 
-        edge = cpol ? cpha : !cpha;
+        edge = cpol ^ !cpha;
 
         tmp |= edge << 27; /* TEDG */
         tmp |= edge << 26; /* REDG */
@@ -197,11 +197,9 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
 
 static void sh_msiof_spi_set_mode_regs(struct sh_msiof_spi_priv *p,
                                        const void *tx_buf, void *rx_buf,
-                                       int bits, int words)
+                                       u32 bits, u32 words)
 {
-        unsigned long dr2;
-
-        dr2 = ((bits - 1) << 24) | ((words - 1) << 16);
+        u32 dr2 = ((bits - 1) << 24) | ((words - 1) << 16);
 
         if (tx_buf)
                 sh_msiof_write(p, TMDR2, dr2);
@@ -222,7 +220,7 @@ static void sh_msiof_reset_str(struct sh_msiof_spi_priv *p)
 static void sh_msiof_spi_write_fifo_8(struct sh_msiof_spi_priv *p,
                                       const void *tx_buf, int words, int fs)
 {
-        const unsigned char *buf_8 = tx_buf;
+        const u8 *buf_8 = tx_buf;
         int k;
 
         for (k = 0; k < words; k++)
@@ -232,7 +230,7 @@ static void sh_msiof_spi_write_fifo_8(struct sh_msiof_spi_priv *p,
 static void sh_msiof_spi_write_fifo_16(struct sh_msiof_spi_priv *p,
                                        const void *tx_buf, int words, int fs)
 {
-        const unsigned short *buf_16 = tx_buf;
+        const u16 *buf_16 = tx_buf;
         int k;
 
         for (k = 0; k < words; k++)
@@ -242,7 +240,7 @@ static void sh_msiof_spi_write_fifo_16(struct sh_msiof_spi_priv *p,
 static void sh_msiof_spi_write_fifo_16u(struct sh_msiof_spi_priv *p,
                                         const void *tx_buf, int words, int fs)
 {
-        const unsigned short *buf_16 = tx_buf;
+        const u16 *buf_16 = tx_buf;
         int k;
 
         for (k = 0; k < words; k++)
@@ -252,7 +250,7 @@ static void sh_msiof_spi_write_fifo_16u(struct sh_msiof_spi_priv *p,
 static void sh_msiof_spi_write_fifo_32(struct sh_msiof_spi_priv *p,
                                        const void *tx_buf, int words, int fs)
 {
-        const unsigned int *buf_32 = tx_buf;
+        const u32 *buf_32 = tx_buf;
         int k;
 
         for (k = 0; k < words; k++)
@@ -262,17 +260,37 @@ static void sh_msiof_spi_write_fifo_32(struct sh_msiof_spi_priv *p,
 static void sh_msiof_spi_write_fifo_32u(struct sh_msiof_spi_priv *p,
                                         const void *tx_buf, int words, int fs)
 {
-        const unsigned int *buf_32 = tx_buf;
+        const u32 *buf_32 = tx_buf;
         int k;
 
         for (k = 0; k < words; k++)
                 sh_msiof_write(p, TFDR, get_unaligned(&buf_32[k]) << fs);
 }
 
+static void sh_msiof_spi_write_fifo_s32(struct sh_msiof_spi_priv *p,
+                                        const void *tx_buf, int words, int fs)
+{
+        const u32 *buf_32 = tx_buf;
+        int k;
+
+        for (k = 0; k < words; k++)
+                sh_msiof_write(p, TFDR, swab32(buf_32[k] << fs));
+}
+
+static void sh_msiof_spi_write_fifo_s32u(struct sh_msiof_spi_priv *p,
+                                         const void *tx_buf, int words, int fs)
+{
+        const u32 *buf_32 = tx_buf;
+        int k;
+
+        for (k = 0; k < words; k++)
+                sh_msiof_write(p, TFDR, swab32(get_unaligned(&buf_32[k]) << fs));
+}
+
 static void sh_msiof_spi_read_fifo_8(struct sh_msiof_spi_priv *p,
                                      void *rx_buf, int words, int fs)
 {
-        unsigned char *buf_8 = rx_buf;
+        u8 *buf_8 = rx_buf;
         int k;
 
         for (k = 0; k < words; k++)
@@ -282,7 +300,7 @@ static void sh_msiof_spi_read_fifo_8(struct sh_msiof_spi_priv *p,
 static void sh_msiof_spi_read_fifo_16(struct sh_msiof_spi_priv *p,
                                       void *rx_buf, int words, int fs)
 {
-        unsigned short *buf_16 = rx_buf;
+        u16 *buf_16 = rx_buf;
         int k;
 
         for (k = 0; k < words; k++)
@@ -292,7 +310,7 @@ static void sh_msiof_spi_read_fifo_16(struct sh_msiof_spi_priv *p,
 static void sh_msiof_spi_read_fifo_16u(struct sh_msiof_spi_priv *p,
                                        void *rx_buf, int words, int fs)
 {
-        unsigned short *buf_16 = rx_buf;
+        u16 *buf_16 = rx_buf;
         int k;
 
         for (k = 0; k < words; k++)
@@ -302,7 +320,7 @@ static void sh_msiof_spi_read_fifo_16u(struct sh_msiof_spi_priv *p,
 static void sh_msiof_spi_read_fifo_32(struct sh_msiof_spi_priv *p,
                                       void *rx_buf, int words, int fs)
 {
-        unsigned int *buf_32 = rx_buf;
+        u32 *buf_32 = rx_buf;
         int k;
 
         for (k = 0; k < words; k++)
@@ -312,19 +330,40 @@ static void sh_msiof_spi_read_fifo_32(struct sh_msiof_spi_priv *p,
 static void sh_msiof_spi_read_fifo_32u(struct sh_msiof_spi_priv *p,
                                        void *rx_buf, int words, int fs)
 {
-        unsigned int *buf_32 = rx_buf;
+        u32 *buf_32 = rx_buf;
         int k;
 
         for (k = 0; k < words; k++)
                 put_unaligned(sh_msiof_read(p, RFDR) >> fs, &buf_32[k]);
 }
 
+static void sh_msiof_spi_read_fifo_s32(struct sh_msiof_spi_priv *p,
+                                       void *rx_buf, int words, int fs)
+{
+        u32 *buf_32 = rx_buf;
+        int k;
+
+        for (k = 0; k < words; k++)
+                buf_32[k] = swab32(sh_msiof_read(p, RFDR) >> fs);
+}
+
+static void sh_msiof_spi_read_fifo_s32u(struct sh_msiof_spi_priv *p,
+                                       void *rx_buf, int words, int fs)
+{
+        u32 *buf_32 = rx_buf;
+        int k;
+
+        for (k = 0; k < words; k++)
+                put_unaligned(swab32(sh_msiof_read(p, RFDR) >> fs), &buf_32[k]);
+}
+
 static int sh_msiof_spi_bits(struct spi_device *spi, struct spi_transfer *t)
 {
         int bits;
 
         bits = t ? t->bits_per_word : 0;
-        bits = bits ? bits : spi->bits_per_word;
+        if (!bits)
+                bits = spi->bits_per_word;
         return bits;
 }
 
@@ -334,7 +373,8 @@ static unsigned long sh_msiof_spi_hz(struct spi_device *spi,
         unsigned long hz;
 
         hz = t ? t->speed_hz : 0;
-        hz = hz ? hz : spi->max_speed_hz;
+        if (!hz)
+                hz = spi->max_speed_hz;
         return hz;
 }
 
@@ -468,9 +508,17 @@ static int sh_msiof_spi_txrx(struct spi_device *spi, struct spi_transfer *t)
         int bytes_done;
         int words;
         int n;
+        bool swab;
 
         bits = sh_msiof_spi_bits(spi, t);
 
+        if (bits <= 8 && t->len > 15 && !(t->len & 3)) {
+                bits = 32;
+                swab = true;
+        } else {
+                swab = false;
+        }
+
         /* setup bytes per word and fifo read/write functions */
         if (bits <= 8) {
                 bytes_per_word = 1;
@@ -487,6 +535,17 @@ static int sh_msiof_spi_txrx(struct spi_device *spi, struct spi_transfer *t)
                         rx_fifo = sh_msiof_spi_read_fifo_16u;
                 else
                         rx_fifo = sh_msiof_spi_read_fifo_16;
+        } else if (swab) {
+                bytes_per_word = 4;
+                if ((unsigned long)t->tx_buf & 0x03)
+                        tx_fifo = sh_msiof_spi_write_fifo_s32u;
+                else
+                        tx_fifo = sh_msiof_spi_write_fifo_s32;
+
+                if ((unsigned long)t->rx_buf & 0x03)
+                        rx_fifo = sh_msiof_spi_read_fifo_s32u;
+                else
+                        rx_fifo = sh_msiof_spi_read_fifo_s32;
         } else {
                 bytes_per_word = 4;
                 if ((unsigned long)t->tx_buf & 0x03)
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 603428213d21..d9fd86211365 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -30,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/compat.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/spidev.h>
@@ -471,6 +472,16 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
         return retval;
 }
 
+#ifdef CONFIG_COMPAT
+static long
+spidev_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+        return spidev_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));
+}
+#else
+#define spidev_compat_ioctl NULL
+#endif /* CONFIG_COMPAT */
+
 static int spidev_open(struct inode *inode, struct file *filp)
 {
         struct spidev_data      *spidev;
@@ -543,6 +554,7 @@ static const struct file_operations spidev_fops = {
         .write =        spidev_write,
         .read =         spidev_read,
         .unlocked_ioctl = spidev_ioctl,
+        .compat_ioctl = spidev_compat_ioctl,
         .open =         spidev_open,
         .release =      spidev_release,
         .llseek =       no_llseek,