Merge tag 'usb-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / drivers / spi / spi-pxa2xx.c

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 612cc49..d84b893 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -626,6 +626,11 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
                return IRQ_HANDLED;
        }
 
+       if (irq_status & SSSR_TUR) {
+               int_error_stop(drv_data, "interrupt_transfer: fifo underrun");
+               return IRQ_HANDLED;
+       }
+
        if (irq_status & SSSR_TINT) {
                pxa2xx_spi_write(drv_data, SSSR, SSSR_TINT);
                if (drv_data->read(drv_data)) {
@@ -1073,6 +1078,30 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *master,
                        pxa2xx_spi_write(drv_data, SSTO, chip->timeout);
        }
 
+       if (drv_data->ssp_type == MMP2_SSP) {
+               u8 tx_level = (pxa2xx_spi_read(drv_data, SSSR)
+                                       & SSSR_TFL_MASK) >> 8;
+
+               if (tx_level) {
+                       /* On MMP2, flipping SSE doesn't to empty TXFIFO. */
+                       dev_warn(&spi->dev, "%d bytes of garbage in TXFIFO!\n",
+                                                               tx_level);
+                       if (tx_level > transfer->len)
+                               tx_level = transfer->len;
+                       drv_data->tx += tx_level;
+               }
+       }
+
+       if (spi_controller_is_slave(master)) {
+               while (drv_data->write(drv_data))
+                       ;
+               if (drv_data->gpiod_ready) {
+                       gpiod_set_value(drv_data->gpiod_ready, 1);
+                       udelay(1);
+                       gpiod_set_value(drv_data->gpiod_ready, 0);
+               }
+       }
+
        /*
         * Release the data by enabling service requests and interrupts,
         * without changing any mode bits
@@ -1082,6 +1111,27 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *master,
        return 1;
 }
 
+static int pxa2xx_spi_slave_abort(struct spi_master *master)
+{
+       struct driver_data *drv_data = spi_controller_get_devdata(master);
+
+       /* Stop and reset SSP */
+       write_SSSR_CS(drv_data, drv_data->clear_sr);
+       reset_sccr1(drv_data);
+       if (!pxa25x_ssp_comp(drv_data))
+               pxa2xx_spi_write(drv_data, SSTO, 0);
+       pxa2xx_spi_flush(drv_data);
+       pxa2xx_spi_write(drv_data, SSCR0,
+                        pxa2xx_spi_read(drv_data, SSCR0) & ~SSCR0_SSE);
+
+       dev_dbg(&drv_data->pdev->dev, "transfer aborted\n");
+
+       drv_data->master->cur_msg->status = -EINTR;
+       spi_finalize_current_transfer(drv_data->master);
+
+       return 0;
+}
+
 static void pxa2xx_spi_handle_err(struct spi_controller *master,
                                 struct spi_message *msg)
 {
@@ -1209,9 +1259,14 @@ static int setup(struct spi_device *spi)
                rx_thres = config->rx_threshold;
                break;
        default:
-               tx_thres = TX_THRESH_DFLT;
                tx_hi_thres = 0;
-               rx_thres = RX_THRESH_DFLT;
+               if (spi_controller_is_slave(drv_data->master)) {
+                       tx_thres = 1;
+                       rx_thres = 2;
+               } else {
+                       tx_thres = TX_THRESH_DFLT;
+                       rx_thres = RX_THRESH_DFLT;
+               }
                break;
        }
 
@@ -1255,6 +1310,12 @@ static int setup(struct spi_device *spi)
                if (chip_info->enable_loopback)
                        chip->cr1 = SSCR1_LBM;
        }
+       if (spi_controller_is_slave(drv_data->master)) {
+               chip->cr1 |= SSCR1_SCFR;
+               chip->cr1 |= SSCR1_SCLKDIR;
+               chip->cr1 |= SSCR1_SFRMDIR;
+               chip->cr1 |= SSCR1_SPH;
+       }
 
        chip->lpss_rx_threshold = SSIRF_RxThresh(rx_thres);
        chip->lpss_tx_threshold = SSITF_TxLoThresh(tx_thres)
@@ -1500,6 +1561,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
        ssp->pdev = pdev;
        ssp->port_id = pxa2xx_spi_get_port_id(adev);
 
+       pdata->is_slave = of_property_read_bool(pdev->dev.of_node, "spi-slave");
        pdata->num_chipselect = 1;
        pdata->enable_dma = true;
 
@@ -1559,7 +1621,11 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       master = spi_alloc_master(dev, sizeof(struct driver_data));
+       if (platform_info->is_slave)
+               master = spi_alloc_slave(dev, sizeof(struct driver_data));
+       else
+               master = spi_alloc_master(dev, sizeof(struct driver_data));
+
        if (!master) {
                dev_err(&pdev->dev, "cannot alloc spi_master\n");
                pxa_ssp_free(ssp);
@@ -1581,6 +1647,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        master->setup = setup;
        master->set_cs = pxa2xx_spi_set_cs;
        master->transfer_one = pxa2xx_spi_transfer_one;
+       master->slave_abort = pxa2xx_spi_slave_abort;
        master->handle_err = pxa2xx_spi_handle_err;
        master->unprepare_transfer_hardware = pxa2xx_spi_unprepare_transfer;
        master->fw_translate_cs = pxa2xx_spi_fw_translate_cs;
@@ -1610,7 +1677,8 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
                drv_data->int_cr1 = SSCR1_TIE | SSCR1_RIE | SSCR1_TINTE;
                drv_data->dma_cr1 = DEFAULT_DMA_CR1;
                drv_data->clear_sr = SSSR_ROR | SSSR_TINT;
-               drv_data->mask_sr = SSSR_TINT | SSSR_RFS | SSSR_TFS | SSSR_ROR;
+               drv_data->mask_sr = SSSR_TINT | SSSR_RFS | SSSR_TFS
+                                               | SSSR_ROR | SSSR_TUR;
        }
 
        status = request_irq(ssp->irq, ssp_int, IRQF_SHARED, dev_name(dev),
@@ -1658,10 +1726,22 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
                pxa2xx_spi_write(drv_data, SSCR0, tmp);
                break;
        default:
-               tmp = SSCR1_RxTresh(RX_THRESH_DFLT) |
-                     SSCR1_TxTresh(TX_THRESH_DFLT);
+
+               if (spi_controller_is_slave(master)) {
+                       tmp = SSCR1_SCFR |
+                             SSCR1_SCLKDIR |
+                             SSCR1_SFRMDIR |
+                             SSCR1_RxTresh(2) |
+                             SSCR1_TxTresh(1) |
+                             SSCR1_SPH;
+               } else {
+                       tmp = SSCR1_RxTresh(RX_THRESH_DFLT) |
+                             SSCR1_TxTresh(TX_THRESH_DFLT);
+               }
                pxa2xx_spi_write(drv_data, SSCR1, tmp);
-               tmp = SSCR0_SCR(2) | SSCR0_Motorola | SSCR0_DataSize(8);
+               tmp = SSCR0_Motorola | SSCR0_DataSize(8);
+               if (!spi_controller_is_slave(master))
+                       tmp |= SSCR0_SCR(2);
                pxa2xx_spi_write(drv_data, SSCR0, tmp);
                break;
        }
@@ -1711,7 +1791,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
                                if (PTR_ERR(gpiod) == -ENOENT)
                                        continue;
 
-                               status = (int)PTR_ERR(gpiod);
+                               status = PTR_ERR(gpiod);
                                goto out_error_clock_enabled;
                        } else {
                                drv_data->cs_gpiods[i] = gpiod;
@@ -1719,6 +1799,15 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
                }
        }
 
+       if (platform_info->is_slave) {
+               drv_data->gpiod_ready = devm_gpiod_get_optional(dev,
+                                               "ready", GPIOD_OUT_LOW);
+               if (IS_ERR(drv_data->gpiod_ready)) {
+                       status = PTR_ERR(drv_data->gpiod_ready);
+                       goto out_error_clock_enabled;
+               }
+       }
+
        pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
        pm_runtime_use_autosuspend(&pdev->dev);
        pm_runtime_set_active(&pdev->dev);
@@ -1811,10 +1900,6 @@ static int pxa2xx_spi_resume(struct device *dev)
                        return status;
        }
 
-       /* Restore LPSS private register bits */
-       if (is_lpss_ssp(drv_data))
-               lpss_ssp_setup(drv_data);
-
        /* Start the queue running */
        return spi_controller_resume(drv_data->master);
 }