Revert "Xilinx: ARM: QSPI driver: Hack to transmit PP command & addr together"

This reverts commit 39fe534878f220c3a66687aa308d2e4586071b47.

Resolved Conflicts:

	drivers/spi/xilinx_qspipss.c

diff --git a/drivers/spi/xilinx_qspipss.c b/drivers/spi/xilinx_qspipss.c
index 05432089fe348655e2a546fb8b6111ca717dd48f..514c162574fa94b7220009b5bdde01318ac4c729 100755 (executable)
--- a/drivers/spi/xilinx_qspipss.c
+++ b/drivers/spi/xilinx_qspipss.c
@@ -28,8 +28,6 @@
 #include <linux/delay.h>
 #include <linux/xilinx_devices.h>
 
-#undef HACK_WRITE_NO_DELAY
-
 /*
  * Name of this driver
  */
@@ -602,25 +600,12 @@ static int xqspipss_start_transfer(struct spi_device *qspi,
        u32 data = 0;
        u8 instruction = 0;
        u8 index;
-#ifdef HACK_WRITE_NO_DELAY
-       static bool no_delay = 0;
-#endif
 
        xqspi->txbuf = transfer->tx_buf;
        xqspi->rxbuf = transfer->rx_buf;
        xqspi->bytes_to_transfer = transfer->len;
        xqspi->bytes_to_receive = transfer->len;
 
-#ifdef HACK_WRITE_NO_DELAY
-       if (no_delay) {
-               /* Indicates Page programm command + address is already in Tx
-                * FIFO. We need to receive extra 4 bytes for command + address
-                */
-               xqspi->bytes_to_receive += 4;
-               no_delay = 0;
-       }
-#endif
-
        if (xqspi->txbuf)
                instruction = *(u8 *)xqspi->txbuf;
 
@@ -675,18 +660,6 @@ static int xqspipss_start_transfer(struct spi_device *qspi,
                 */
                xqspipss_write(xqspi->regs + xqspi->curr_inst->offset, data);
 
-#ifdef HACK_WRITE_NO_DELAY
-               if (xqspi->curr_inst->opcode == XQSPIPSS_FLASH_OPCODE_PP) {
-                       /* Write instruction + address to the Tx FIFO, but do
-                        * not start transmission yet. Wait for the next
-                        * spi_message with data, and start transmission after
-                        * data is filled into the FIFO
-                        */
-                       no_delay = 1;
-                       return (transfer->len);
-               }
-#endif
-
                /* Read status register and Read ID instructions don't require
                 * to ignore the extra bytes in response of instruction as
                 * response contains the value */