From: Mark Brown <broonie@linaro.org>
Date: Sun, 30 Mar 2014 00:50:57 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/altera', 'spi/topic/atmel', 'spi/topic... 
X-Git-Tag: v4.14-rc1~7819^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f38af451fc494378110d702058acf59d24b5331;p=platform%2Fkernel%2Flinux-rpi.git

Merge remote-tracking branches 'spi/topic/altera', 'spi/topic/atmel', 'spi/topic/au1550', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/bfin5xx', 'spi/topic/bitbang' and 'spi/topic/bpw' into spi-next
---

0f38af451fc494378110d702058acf59d24b5331
diff --cc drivers/spi/spi-atmel.c
index 5d7b07f,b0842f7,f17f949,b0842f7,b0842f7,b0842f7,b0842f7,b0842f7,b0842f7..bc87993
--- a/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);