Re: [PATCH] spi: rockchip: support "sleep" pin configuration

[Rob Herring]

On Fri, Dec 16, 2016 at 04:59:16PM -0800, Brian Norris wrote:
> In the pattern of many other devices, support a system-sleep pin
> configuration.
> 
> Signed-off-by: Brian Norris 
> ---
>  Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++
>  drivers/spi/spi-rockchip.c | 5 +
>  2 files changed, 12 insertions(+)

Acked-by: Rob Herring 

Re: [PATCH] spi: rockchip: support "sleep" pin configuration

[Rob Herring]

On Fri, Dec 16, 2016 at 04:59:16PM -0800, Brian Norris wrote:
> In the pattern of many other devices, support a system-sleep pin
> configuration.
> 
> Signed-off-by: Brian Norris 
> ---
>  Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++
>  drivers/spi/spi-rockchip.c | 5 +
>  2 files changed, 12 insertions(+)

Acked-by: Rob Herring 

Re: [PATCH] spi: rockchip: support "sleep" pin configuration

[Caesar Wang]

在 2016年12月17日 08:59, Brian Norris 写道:

In the pattern of many other devices, support a system-sleep pin
configuration.

Signed-off-by: Brian Norris 


Tested-by: Caesar Wang 


---
  Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++
  drivers/spi/spi-rockchip.c | 5 +
  2 files changed, 12 insertions(+)

diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.txt 
b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
index d2ca153614f9..83da4931d832 100644
--- a/Documentation/devicetree/bindings/spi/spi-rockchip.txt
+++ b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
@@ -31,6 +31,10 @@ Optional Properties:
  - rx-sample-delay-ns: nanoseconds to delay after the SCLK edge before sampling
Rx data (may need to be fine tuned for high capacitance lines).
No delay (0) by default.
+- pinctrl-names: Names for the pin configuration(s); may be "default" or
+   "sleep", where the "sleep" configuration may describe the state
+   the pins should be in during system suspend. See also
+   pinctrl/pinctrl-bindings.txt.
  
  
  Example:

@@ -46,4 +50,7 @@ Example:
interrupts = ;
clocks = < SCLK_SPI0>, < PCLK_SPI0>;
clock-names = "spiclk", "apb_pclk";
+   pinctrl-0 = <_pins>;
+   pinctrl-1 = <_sleep>;
+   pinctrl-names = "default", "sleep";
};
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 0f89c2169c24..acf31f36b898 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -17,6 +17,7 @@
  #include 
  #include 
  #include 
+#include 
  #include 
  #include 
  #include 
@@ -843,6 +844,8 @@ static int rockchip_spi_suspend(struct device *dev)
clk_disable_unprepare(rs->apb_pclk);
}
  
+	pinctrl_pm_select_sleep_state(dev);

+
return ret;
  }
  
@@ -852,6 +855,8 @@ static int rockchip_spi_resume(struct device *dev)

struct spi_master *master = dev_get_drvdata(dev);
struct rockchip_spi *rs = spi_master_get_devdata(master);
  
+	pinctrl_pm_select_default_state(dev);

+
if (!pm_runtime_suspended(dev)) {
ret = clk_prepare_enable(rs->apb_pclk);
if (ret < 0)

Re: [PATCH] spi: rockchip: support "sleep" pin configuration

[Caesar Wang]

在 2016年12月17日 08:59, Brian Norris 写道:

In the pattern of many other devices, support a system-sleep pin
configuration.

Signed-off-by: Brian Norris 


Tested-by: Caesar Wang 


---
  Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++
  drivers/spi/spi-rockchip.c | 5 +
  2 files changed, 12 insertions(+)

diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.txt 
b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
index d2ca153614f9..83da4931d832 100644
--- a/Documentation/devicetree/bindings/spi/spi-rockchip.txt
+++ b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
@@ -31,6 +31,10 @@ Optional Properties:
  - rx-sample-delay-ns: nanoseconds to delay after the SCLK edge before sampling
Rx data (may need to be fine tuned for high capacitance lines).
No delay (0) by default.
+- pinctrl-names: Names for the pin configuration(s); may be "default" or
+   "sleep", where the "sleep" configuration may describe the state
+   the pins should be in during system suspend. See also
+   pinctrl/pinctrl-bindings.txt.
  
  
  Example:

@@ -46,4 +50,7 @@ Example:
interrupts = ;
clocks = < SCLK_SPI0>, < PCLK_SPI0>;
clock-names = "spiclk", "apb_pclk";
+   pinctrl-0 = <_pins>;
+   pinctrl-1 = <_sleep>;
+   pinctrl-names = "default", "sleep";
};
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 0f89c2169c24..acf31f36b898 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -17,6 +17,7 @@
  #include 
  #include 
  #include 
+#include 
  #include 
  #include 
  #include 
@@ -843,6 +844,8 @@ static int rockchip_spi_suspend(struct device *dev)
clk_disable_unprepare(rs->apb_pclk);
}
  
+	pinctrl_pm_select_sleep_state(dev);

+
return ret;
  }
  
@@ -852,6 +855,8 @@ static int rockchip_spi_resume(struct device *dev)

struct spi_master *master = dev_get_drvdata(dev);
struct rockchip_spi *rs = spi_master_get_devdata(master);
  
+	pinctrl_pm_select_default_state(dev);

+
if (!pm_runtime_suspended(dev)) {
ret = clk_prepare_enable(rs->apb_pclk);
if (ret < 0)

Re: [PATCH] spi: rockchip: support "sleep" pin configuration

[Doug Anderson]

Hi,

On Fri, Dec 16, 2016 at 4:59 PM, Brian Norris  wrote:
> In the pattern of many other devices, support a system-sleep pin
> configuration.
>
> Signed-off-by: Brian Norris 
> ---
>  Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++
>  drivers/spi/spi-rockchip.c | 5 +
>  2 files changed, 12 insertions(+)

FWIW

Reviewed-by: Douglas Anderson 

Re: [PATCH] spi: rockchip: support "sleep" pin configuration

[Doug Anderson]

Hi,

On Fri, Dec 16, 2016 at 4:59 PM, Brian Norris  wrote:
> In the pattern of many other devices, support a system-sleep pin
> configuration.
>
> Signed-off-by: Brian Norris 
> ---
>  Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++
>  drivers/spi/spi-rockchip.c | 5 +
>  2 files changed, 12 insertions(+)

FWIW

Reviewed-by: Douglas Anderson 

[PATCH] spi: rockchip: support "sleep" pin configuration

[Brian Norris]

In the pattern of many other devices, support a system-sleep pin
configuration.

Signed-off-by: Brian Norris 
---
 Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++
 drivers/spi/spi-rockchip.c | 5 +
 2 files changed, 12 insertions(+)

diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.txt 
b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
index d2ca153614f9..83da4931d832 100644
--- a/Documentation/devicetree/bindings/spi/spi-rockchip.txt
+++ b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
@@ -31,6 +31,10 @@ Optional Properties:
 - rx-sample-delay-ns: nanoseconds to delay after the SCLK edge before sampling
Rx data (may need to be fine tuned for high capacitance lines).
No delay (0) by default.
+- pinctrl-names: Names for the pin configuration(s); may be "default" or
+   "sleep", where the "sleep" configuration may describe the state
+   the pins should be in during system suspend. See also
+   pinctrl/pinctrl-bindings.txt.
 
 
 Example:
@@ -46,4 +50,7 @@ Example:
interrupts = ;
clocks = < SCLK_SPI0>, < PCLK_SPI0>;
clock-names = "spiclk", "apb_pclk";
+   pinctrl-0 = <_pins>;
+   pinctrl-1 = <_sleep>;
+   pinctrl-names = "default", "sleep";
};
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 0f89c2169c24..acf31f36b898 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -843,6 +844,8 @@ static int rockchip_spi_suspend(struct device *dev)
clk_disable_unprepare(rs->apb_pclk);
}
 
+   pinctrl_pm_select_sleep_state(dev);
+
return ret;
 }
 
@@ -852,6 +855,8 @@ static int rockchip_spi_resume(struct device *dev)
struct spi_master *master = dev_get_drvdata(dev);
struct rockchip_spi *rs = spi_master_get_devdata(master);
 
+   pinctrl_pm_select_default_state(dev);
+
if (!pm_runtime_suspended(dev)) {
ret = clk_prepare_enable(rs->apb_pclk);
if (ret < 0)
-- 
2.8.0.rc3.226.g39d4020

[PATCH] spi: rockchip: support "sleep" pin configuration

[Brian Norris]

In the pattern of many other devices, support a system-sleep pin
configuration.

Signed-off-by: Brian Norris 
---
 Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++
 drivers/spi/spi-rockchip.c | 5 +
 2 files changed, 12 insertions(+)

diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.txt 
b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
index d2ca153614f9..83da4931d832 100644
--- a/Documentation/devicetree/bindings/spi/spi-rockchip.txt
+++ b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
@@ -31,6 +31,10 @@ Optional Properties:
 - rx-sample-delay-ns: nanoseconds to delay after the SCLK edge before sampling
Rx data (may need to be fine tuned for high capacitance lines).
No delay (0) by default.
+- pinctrl-names: Names for the pin configuration(s); may be "default" or
+   "sleep", where the "sleep" configuration may describe the state
+   the pins should be in during system suspend. See also
+   pinctrl/pinctrl-bindings.txt.
 
 
 Example:
@@ -46,4 +50,7 @@ Example:
interrupts = ;
clocks = < SCLK_SPI0>, < PCLK_SPI0>;
clock-names = "spiclk", "apb_pclk";
+   pinctrl-0 = <_pins>;
+   pinctrl-1 = <_sleep>;
+   pinctrl-names = "default", "sleep";
};
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 0f89c2169c24..acf31f36b898 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -843,6 +844,8 @@ static int rockchip_spi_suspend(struct device *dev)
clk_disable_unprepare(rs->apb_pclk);
}
 
+   pinctrl_pm_select_sleep_state(dev);
+
return ret;
 }
 
@@ -852,6 +855,8 @@ static int rockchip_spi_resume(struct device *dev)
struct spi_master *master = dev_get_drvdata(dev);
struct rockchip_spi *rs = spi_master_get_devdata(master);
 
+   pinctrl_pm_select_default_state(dev);
+
if (!pm_runtime_suspended(dev)) {
ret = clk_prepare_enable(rs->apb_pclk);
if (ret < 0)
-- 
2.8.0.rc3.226.g39d4020