Merge series "spi: spi-geni-qcom: Use gpio descriptors for CS" from Stephen Boyd...

Collected patches from the two series below and associated tags so they
can be merged in one pile through the spi tree. Merry December!

SPI: https://lore.kernel.org/r/20201202214935.1114381[email protected]
cros-ec: https://lore.kernel.org/r/20201203011649.1405292[email protected]

Cc: Akash Asthana <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Gwendal Grignou <[email protected]>
Cc: Douglas Anderson <[email protected]>
Cc: Alexandru M Stan <[email protected]>
Stephen Boyd (3):
  platform/chrome: cros_ec_spi: Don't overwrite spi::mode
  platform/chrome: cros_ec_spi: Drop bits_per_word assignment
  spi: spi-geni-qcom: Use the new method of gpio CS control

 drivers/platform/chrome/cros_ec_spi.c | 2 --
 drivers/spi/spi-geni-qcom.c           | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

base-commit: b65054597872ce3aefbc6a666385eabdf9e288da
--
https://chromeos.dev

diff --combined drivers/spi/spi-geni-qcom.c
index 0e3d8e6c08f4229f33be4b9fc767f72718f22afc,c4c88984abc9ff88532e8741f063b428270a306f..512e925d5ea48b8609f770626e1df95b92cbf98f
--- 1/drivers/spi/spi-geni-qcom.c
--- 2/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@@ -603,7 -603,7 +603,7 @@@ static int spi_geni_probe(struct platfo
        if (IS_ERR(clk))
                return PTR_ERR(clk);
  
 -      spi = spi_alloc_master(dev, sizeof(*mas));
 +      spi = devm_spi_alloc_master(dev, sizeof(*mas));
        if (!spi)
                return -ENOMEM;
  
@@@ -636,6 -636,7 +636,7 @@@
        spi->auto_runtime_pm = true;
        spi->handle_err = handle_fifo_timeout;
        spi->set_cs = spi_geni_set_cs;
+       spi->use_gpio_descriptors = true;
  
        init_completion(&mas->cs_done);
        init_completion(&mas->cancel_done);
@@@ -673,6 -674,7 +674,6 @@@ spi_geni_probe_free_irq
        free_irq(mas->irq, spi);
  spi_geni_probe_runtime_disable:
        pm_runtime_disable(dev);
 -      spi_master_put(spi);
        dev_pm_opp_of_remove_table(&pdev->dev);
  put_clkname:
        dev_pm_opp_put_clkname(mas->se.opp_table);