Merge remote-tracking branches 'spi/topic/dw', 'spi/topic/fsl', 'spi/topic/fsl-espi...

diff --combined drivers/spi/spi-fsl-espi.c
index e767f5831b9c7ce3d8ce015e34e67643f69a28df,e767f5831b9c7ce3d8ce015e34e67643f69a28df,3cf7d65bc739d67142a024071f98faa1dfbde86b,f0d7662e4d45ec4a88681cfd9bfec7f94603852d,e767f5831b9c7ce3d8ce015e34e67643f69a28df..8ebd724e4c59761511d55de13e55ac277a75e71a
--- 1/drivers/spi/spi-fsl-espi.c
--- 2/drivers/spi/spi-fsl-espi.c
--- 3/drivers/spi/spi-fsl-espi.c
--- 4/drivers/spi/spi-fsl-espi.c
--- 5/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@@@@@ -348,7 -348,7 -348,7 -348,7 -348,7 +348,7 @@@@@@ static void fsl_espi_cmd_trans(struct s
        }
     
        espi_trans->tx_buf = local_buf;
--- -   espi_trans->rx_buf = local_buf + espi_trans->n_tx;
+++ +   espi_trans->rx_buf = local_buf;
        fsl_espi_do_trans(m, espi_trans);
     
        espi_trans->actual_length = espi_trans->len;
@@@@@@ -397,7 -397,7 -397,7 -397,7 -397,7 +397,7 @@@@@@ static void fsl_espi_rw_trans(struct sp
                espi_trans->n_rx = trans_len;
                espi_trans->len = trans_len + n_tx;
                espi_trans->tx_buf = local_buf;
--- -           espi_trans->rx_buf = local_buf + n_tx;
+++ +           espi_trans->rx_buf = local_buf;
                fsl_espi_do_trans(m, espi_trans);
     
                memcpy(rx_buf + pos, espi_trans->rx_buf + n_tx, trans_len);
@@@@@@ -458,7 -458,7 -458,7 -458,7 -458,7 +458,7 @@@@@@ static int fsl_espi_setup(struct spi_de
                return -EINVAL;
     
        if (!cs) {
-- --           cs = kzalloc(sizeof *cs, GFP_KERNEL);
++ ++           cs = devm_kzalloc(&spi->dev, sizeof(*cs), GFP_KERNEL);
                if (!cs)
                        return -ENOMEM;
                spi->controller_state = cs;
@@@@@@ -586,8 -586,8 -586,8 -586,10 -586,8 +586,10 @@@@@@ static struct spi_master * fsl_espi_pro
        struct spi_master *master;
        struct mpc8xxx_spi *mpc8xxx_spi;
        struct fsl_espi_reg *reg_base;
--- -   u32 regval;
--- -   int i, ret = 0;
+++ +   struct device_node *nc;
+++ +   const __be32 *prop;
+++ +   u32 regval, csmode;
+++ +   int i, len, ret = 0;
     
        master = spi_alloc_master(dev, sizeof(struct mpc8xxx_spi));
        if (!master) {
@@@@@@ -634,8 -634,8 -634,8 -636,32 -634,8 +636,32 @@@@@@
        mpc8xxx_spi_write_reg(&reg_base->event, 0xffffffff);
     
        /* Init eSPI CS mode register */
--- -   for (i = 0; i < pdata->max_chipselect; i++)
--- -           mpc8xxx_spi_write_reg(&reg_base->csmode[i], CSMODE_INIT_VAL);
+++ +   for_each_available_child_of_node(master->dev.of_node, nc) {
+++ +           /* get chip select */
+++ +           prop = of_get_property(nc, "reg", &len);
+++ +           if (!prop || len < sizeof(*prop))
+++ +                   continue;
+++ +           i = be32_to_cpup(prop);
+++ +           if (i < 0 || i >= pdata->max_chipselect)
+++ +                   continue;
+++ +
+++ +           csmode = CSMODE_INIT_VAL;
+++ +           /* check if CSBEF is set in device tree */
+++ +           prop = of_get_property(nc, "fsl,csbef", &len);
+++ +           if (prop && len >= sizeof(*prop)) {
+++ +                   csmode &= ~(CSMODE_BEF(0xf));
+++ +                   csmode |= CSMODE_BEF(be32_to_cpup(prop));
+++ +           }
+++ +           /* check if CSAFT is set in device tree */
+++ +           prop = of_get_property(nc, "fsl,csaft", &len);
+++ +           if (prop && len >= sizeof(*prop)) {
+++ +                   csmode &= ~(CSMODE_AFT(0xf));
+++ +                   csmode |= CSMODE_AFT(be32_to_cpup(prop));
+++ +           }
+++ +           mpc8xxx_spi_write_reg(&reg_base->csmode[i], csmode);
+++ +
+++ +           dev_info(dev, "cs=%d, init_csmode=0x%x\n", i, csmode);
+++ +   }
     
        /* Enable SPI interface */
        regval = pdata->initial_spmode | SPMODE_INIT_VAL | SPMODE_ENABLE;

diff --combined drivers/spi/spi-qup.c
index 943f973a59aa79e0bcb32cc5955ac30ee7d9606c,b032e8885e2435b3585810f1266bca9aa3fce6a8,b032e8885e2435b3585810f1266bca9aa3fce6a8,b032e8885e2435b3585810f1266bca9aa3fce6a8,17c5f600100052e50d7f7bb48bf0a277c76a703c..fc1de86d3c8a18a1a9e24c3967955204687b5b85
--- 1/drivers/spi/spi-qup.c
--- 2/drivers/spi/spi-qup.c
--- 3/drivers/spi/spi-qup.c
--- 4/drivers/spi/spi-qup.c
--- 5/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@@@@@ -287,7 -287,7 -287,7 -287,7 -287,7 +287,7 @@@@@@ static irqreturn_t spi_qup_qup_irq(int 
        writel_relaxed(opflags, controller->base + QUP_OPERATIONAL);
     
        if (!xfer) {
 ----           dev_err_ratelimited(controller->dev, "unexpected irq %x08 %x08 %x08\n",
 ++++           dev_err_ratelimited(controller->dev, "unexpected irq %08x %08x %08x\n",
                                    qup_err, spi_err, opflags);
                return IRQ_HANDLED;
        }
@@@@@@ -366,7 -366,7 -366,7 -366,7 -366,7 +366,7 @@@@@@ static int spi_qup_io_config(struct spi
        n_words = xfer->len / w_size;
        controller->w_size = w_size;
     
 ----   if (n_words <= controller->in_fifo_sz) {
 ++++   if (n_words <= (controller->in_fifo_sz / sizeof(u32))) {
                mode = QUP_IO_M_MODE_FIFO;
                writel_relaxed(n_words, controller->base + QUP_MX_READ_CNT);
                writel_relaxed(n_words, controller->base + QUP_MX_WRITE_CNT);
@@@@@@ -734,7 -734,7 -734,7 -734,7 -734,7 +734,7 @@@@@@ static int spi_qup_remove(struct platfo
        int ret;
     
        ret = pm_runtime_get_sync(&pdev->dev);
 ----   if (ret)
 ++++   if (ret < 0)
                return ret;
     
        ret = spi_qup_set_state(controller, QUP_STATE_RESET);
@@@@@@ -749,7 -749,7 -749,7 -749,7 -749,7 +749,7 @@@@@@
        return 0;
     }
     
---- static struct of_device_id spi_qup_dt_match[] = {
++++ static const struct of_device_id spi_qup_dt_match[] = {
        { .compatible = "qcom,spi-qup-v2.1.1", },
        { .compatible = "qcom,spi-qup-v2.2.1", },
        { }