Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/cadence', 'spi/topic...

diff --combined drivers/spi/spi-cadence.c
index 33f0bec1a7eb23ab3c091dbb93e96463406e4fc4,7b811e38c7ad8f4e2d6c92a875a2a99d6fc33991,240493706c3697455c0d4d5659dcec2185271614,7b811e38c7ad8f4e2d6c92a875a2a99d6fc33991,7b811e38c7ad8f4e2d6c92a875a2a99d6fc33991..5a6749881ff9c90c2e887c2cded0f055e01f7288
--- 1/drivers/spi/spi-cadence.c
--- 2/drivers/spi/spi-cadence.c
--- 3/drivers/spi/spi-cadence.c
--- 4/drivers/spi/spi-cadence.c
--- 5/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@@@@@ -47,7 -47,6 -47,6 -47,6 -47,6 +47,7 @@@@@@
     #define CDNS_SPI_CR_CPHA_MASK              0x00000004 /* Clock Phase Control */
     #define CDNS_SPI_CR_CPOL_MASK              0x00000002 /* Clock Polarity Control */
     #define CDNS_SPI_CR_SSCTRL_MASK            0x00003C00 /* Slave Select Mask */
 ++++#define CDNS_SPI_CR_PERI_SEL_MASK  0x00000200 /* Peripheral Select Decode */
     #define CDNS_SPI_CR_BAUD_DIV_MASK  0x00000038 /* Baud Rate Divisor Mask */
     #define CDNS_SPI_CR_MSTREN_MASK            0x00000001 /* Master Enable Mask */
     #define CDNS_SPI_CR_MANSTRTEN_MASK 0x00008000 /* Manual TX Enable Mask */
@@@@@@ -149,11 -148,6 -148,6 -148,6 -148,6 +149,11 @@@@@@ static inline void cdns_spi_write(struc
      */
     static void cdns_spi_init_hw(struct cdns_spi *xspi)
     {
 ++++   u32 ctrl_reg = CDNS_SPI_CR_DEFAULT_MASK;
 ++++
 ++++   if (xspi->is_decoded_cs)
 ++++           ctrl_reg |= CDNS_SPI_CR_PERI_SEL_MASK;
 ++++
        cdns_spi_write(xspi, CDNS_SPI_ER_OFFSET,
                       CDNS_SPI_ER_DISABLE_MASK);
        cdns_spi_write(xspi, CDNS_SPI_IDR_OFFSET,
@@@@@@ -166,7 -160,8 -160,8 -160,8 -160,8 +166,7 @@@@@@
     
        cdns_spi_write(xspi, CDNS_SPI_ISR_OFFSET,
                       CDNS_SPI_IXR_ALL_MASK);
 ----   cdns_spi_write(xspi, CDNS_SPI_CR_OFFSET,
 ----                  CDNS_SPI_CR_DEFAULT_MASK);
 ++++   cdns_spi_write(xspi, CDNS_SPI_CR_OFFSET, ctrl_reg);
        cdns_spi_write(xspi, CDNS_SPI_ER_OFFSET,
                       CDNS_SPI_ER_ENABLE_MASK);
     }
@@@@@@ -521,6 -516,6 -516,17 -516,6 -516,6 +521,17 @@@@@@ static int cdns_spi_probe(struct platfo
                goto clk_dis_apb;
        }
     
++ ++   ret = of_property_read_u32(pdev->dev.of_node, "num-cs", &num_cs);
++ ++   if (ret < 0)
++ ++           master->num_chipselect = CDNS_SPI_DEFAULT_NUM_CS;
++ ++   else
++ ++           master->num_chipselect = num_cs;
++ ++
++ ++   ret = of_property_read_u32(pdev->dev.of_node, "is-decoded-cs",
++ ++                              &xspi->is_decoded_cs);
++ ++   if (ret < 0)
++ ++           xspi->is_decoded_cs = 0;
++ ++
        /* SPI controller initializations */
        cdns_spi_init_hw(xspi);
     
@@@@@@ -539,19 -534,19 -545,6 -534,19 -534,19 +550,6 @@@@@@
                goto remove_master;
        }
     
-- --   ret = of_property_read_u32(pdev->dev.of_node, "num-cs", &num_cs);
-- --
-- --   if (ret < 0)
-- --           master->num_chipselect = CDNS_SPI_DEFAULT_NUM_CS;
-- --   else
-- --           master->num_chipselect = num_cs;
-- --
-- --   ret = of_property_read_u32(pdev->dev.of_node, "is-decoded-cs",
-- --                              &xspi->is_decoded_cs);
-- --
-- --   if (ret < 0)
-- --           xspi->is_decoded_cs = 0;
-- --
        master->prepare_transfer_hardware = cdns_prepare_transfer_hardware;
        master->prepare_message = cdns_prepare_message;
        master->transfer_one = cdns_transfer_one;