1 files changed, 22 insertions, 26 deletions

diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 33117fbbf689..729215885250 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -11,10 +11,6 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <linux/dma-mapping.h>
@@ -59,22 +55,20 @@ struct chip_data {
 
 #ifdef CONFIG_DEBUG_FS
 #define SPI_REGS_BUFSIZE        1024
-static ssize_t  spi_show_regs(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos)
+static ssize_t dw_spi_show_regs(struct file *file, char __user *user_buf,
+                size_t count, loff_t *ppos)
 {
-        struct dw_spi *dws;
+        struct dw_spi *dws = file->private_data;
         char *buf;
         u32 len = 0;
         ssize_t ret;
 
-        dws = file->private_data;
-
         buf = kzalloc(SPI_REGS_BUFSIZE, GFP_KERNEL);
         if (!buf)
                 return 0;
 
         len += snprintf(buf + len, SPI_REGS_BUFSIZE - len,
-                        "MRST SPI0 registers:\n");
+                        "%s registers:\n", dev_name(&dws->master->dev));
         len += snprintf(buf + len, SPI_REGS_BUFSIZE - len,
                         "=================================\n");
         len += snprintf(buf + len, SPI_REGS_BUFSIZE - len,
@@ -110,41 +104,41 @@ static ssize_t  spi_show_regs(struct file *file, char __user *user_buf,
         len += snprintf(buf + len, SPI_REGS_BUFSIZE - len,
                         "=================================\n");
 
-        ret =  simple_read_from_buffer(user_buf, count, ppos, buf, len);
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);
         kfree(buf);
         return ret;
 }
 
-static const struct file_operations mrst_spi_regs_ops = {
+static const struct file_operations dw_spi_regs_ops = {
         .owner          = THIS_MODULE,
         .open           = simple_open,
-        .read           = spi_show_regs,
+        .read           = dw_spi_show_regs,
         .llseek         = default_llseek,
 };
 
-static int mrst_spi_debugfs_init(struct dw_spi *dws)
+static int dw_spi_debugfs_init(struct dw_spi *dws)
 {
-        dws->debugfs = debugfs_create_dir("mrst_spi", NULL);
+        dws->debugfs = debugfs_create_dir("dw_spi", NULL);
         if (!dws->debugfs)
                 return -ENOMEM;
 
         debugfs_create_file("registers", S_IFREG | S_IRUGO,
-                dws->debugfs, (void *)dws, &mrst_spi_regs_ops);
+                dws->debugfs, (void *)dws, &dw_spi_regs_ops);
         return 0;
 }
 
-static void mrst_spi_debugfs_remove(struct dw_spi *dws)
+static void dw_spi_debugfs_remove(struct dw_spi *dws)
 {
         debugfs_remove_recursive(dws->debugfs);
 }
 
 #else
-static inline int mrst_spi_debugfs_init(struct dw_spi *dws)
+static inline int dw_spi_debugfs_init(struct dw_spi *dws)
 {
         return 0;
 }
 
-static inline void mrst_spi_debugfs_remove(struct dw_spi *dws)
+static inline void dw_spi_debugfs_remove(struct dw_spi *dws)
 {
 }
 #endif /* CONFIG_DEBUG_FS */
@@ -396,7 +390,7 @@ static void pump_transfers(unsigned long data)
                 goto early_exit;
         }
 
-        /* Delay if requested at end of transfer*/
+        /* Delay if requested at end of transfer */
         if (message->state == RUNNING_STATE) {
                 previous = list_entry(transfer->transfer_list.prev,
                                         struct spi_transfer,
@@ -525,7 +519,7 @@ static int dw_spi_transfer_one_message(struct spi_master *master,
         struct dw_spi *dws = spi_master_get_devdata(master);
 
         dws->cur_msg = msg;
-        /* Initial message state*/
+        /* Initial message state */
         dws->cur_msg->state = START_STATE;
         dws->cur_transfer = list_entry(dws->cur_msg->transfers.next,
                                                 struct spi_transfer,
@@ -596,6 +590,9 @@ static int dw_spi_setup(struct spi_device *spi)
                         | (spi->mode  << SPI_MODE_OFFSET)
                         | (chip->tmode << SPI_TMOD_OFFSET);
 
+        if (spi->mode & SPI_LOOP)
+                chip->cr0 |= 1 << SPI_SRL_OFFSET;
+
         if (gpio_is_valid(spi->cs_gpio)) {
                 ret = gpio_direction_output(spi->cs_gpio,
                                 !(spi->mode & SPI_CS_HIGH));
@@ -655,8 +652,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
         dws->prev_chip = NULL;
         dws->dma_inited = 0;
         dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60);
-        snprintf(dws->name, sizeof(dws->name), "dw_spi%d",
-                        dws->bus_num);
+        snprintf(dws->name, sizeof(dws->name), "dw_spi%d", dws->bus_num);
 
         ret = devm_request_irq(dev, dws->irq, dw_spi_irq, IRQF_SHARED,
                         dws->name, dws);
@@ -665,7 +661,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
                 goto err_free_master;
         }
 
-        master->mode_bits = SPI_CPOL | SPI_CPHA;
+        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LOOP;
         master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16);
         master->bus_num = dws->bus_num;
         master->num_chipselect = dws->num_cs;
@@ -694,7 +690,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
                 goto err_dma_exit;
         }
 
-        mrst_spi_debugfs_init(dws);
+        dw_spi_debugfs_init(dws);
         return 0;
 
 err_dma_exit:
@@ -711,7 +707,7 @@ void dw_spi_remove_host(struct dw_spi *dws)
 {
         if (!dws)
                 return;
-        mrst_spi_debugfs_remove(dws);
+        dw_spi_debugfs_remove(dws);
 
         if (dws->dma_ops && dws->dma_ops->dma_exit)
                 dws->dma_ops->dma_exit(dws);