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

diff --cc drivers/spi/spi-atmel.c
index 5d7b07f083266e64ab0d91436c10ae89a9ec112c,b0842f75101647616ada3a3db4f545a57b519be0,f17f949857b48db1f5d34831f7a35b9177137a75,b0842f75101647616ada3a3db4f545a57b519be0,b0842f75101647616ada3a3db4f545a57b519be0,b0842f75101647616ada3a3db4f545a57b519be0,b0842f75101647616ada3a3db4f545a57b519be0,b0842f75101647616ada3a3db4f545a57b519be0,b0842f75101647616ada3a3db4f545a57b519be0..bc879930470b0e43aa666b965c818621c026ef2a
--- 1/drivers/spi/spi-atmel.c
--- 2/drivers/spi/spi-atmel.c
--- 3/drivers/spi/spi-atmel.c
--- 4/drivers/spi/spi-atmel.c
--- 5/drivers/spi/spi-atmel.c
--- 6/drivers/spi/spi-atmel.c
--- 7/drivers/spi/spi-atmel.c
--- 8/drivers/spi/spi-atmel.c
--- 9/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@@@@@@@@@ -1455,16 -1455,8 -1448,11 -1455,8 -1455,8 -1455,8 -1455,8 -1455,8 -1455,8 +1448,19 @@@@@@@@@@ static int atmel_spi_suspend(struct dev
         {
                struct spi_master       *master = dev_get_drvdata(dev);
                struct atmel_spi        *as = spi_master_get_devdata(master);
 ++++++++       int ret;
 ++++++++
 ++++++++       /* Stop the queue running */
 ++++++++       ret = spi_master_suspend(master);
 ++++++++       if (ret) {
 ++++++++               dev_warn(dev, "cannot suspend master\n");
 ++++++++               return ret;
 ++++++++       }
         
                clk_disable_unprepare(as->clk);
++ ++++++
++ ++++++       pinctrl_pm_select_sleep_state(dev);
++ ++++++
                return 0;
         }
         
@@@@@@@@@@ -1472,16 -1464,9 -1460,11 -1464,9 -1464,9 -1464,9 -1464,9 -1464,9 -1464,9 +1468,18 @@@@@@@@@@ static int atmel_spi_resume(struct devi
         {
                struct spi_master       *master = dev_get_drvdata(dev);
                struct atmel_spi        *as = spi_master_get_devdata(master);
 ++++++++       int ret;
 + ++++++
++ ++++++       pinctrl_pm_select_default_state(dev);
+        
                clk_prepare_enable(as->clk);
 --------       return 0;
 ++++++++
 ++++++++       /* Start the queue running */
 ++++++++       ret = spi_master_resume(master);
 ++++++++       if (ret)
 ++++++++               dev_err(dev, "problem starting queue (%d)\n", ret);
 ++++++++
 ++++++++       return ret;
         }
         
         static SIMPLE_DEV_PM_OPS(atmel_spi_pm_ops, atmel_spi_suspend, atmel_spi_resume);