Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1543896 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  [PATCH] spi: rockchip: support "sleep" pin configuration Brian Norris <briannorris@chromium.org> - 2016-12-17 02:10 +0100
    Re: [PATCH] spi: rockchip: support "sleep" pin configuration Doug Anderson <dianders@chromium.org> - 2016-12-17 07:10 +0100
    Re: [PATCH] spi: rockchip: support "sleep" pin configuration Caesar Wang <wxt@rock-chips.com> - 2016-12-18 08:50 +0100
    Re: [PATCH] spi: rockchip: support "sleep" pin configuration Rob Herring <robh@kernel.org> - 2016-12-21 05:10 +0100

#1543896 — [PATCH] spi: rockchip: support "sleep" pin configuration

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

Signed-off-by: Brian Norris <briannorris@chromium.org>
---
 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 = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>;
 		clock-names = "spiclk", "apb_pclk";
+		pinctrl-0 = <&spi1_pins>;
+		pinctrl-1 = <&spi1_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 <linux/dmaengine.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/pm_runtime.h>
@@ -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

[toc] | [next] | [standalone]

#1543927

Hi,

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

FWIW

Reviewed-by: Douglas Anderson <dianders@chromium.org>

[toc] | [prev] | [next] | [standalone]

#1544101

在 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 <briannorris@chromium.org>

Tested-by: Caesar Wang <wxt@rock-chips.com>

> ---
>   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 = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
>   		clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>;
>   		clock-names = "spiclk", "apb_pclk";
> +		pinctrl-0 = <&spi1_pins>;
> +		pinctrl-1 = <&spi1_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 <linux/dmaengine.h>
>   #include <linux/module.h>
>   #include <linux/of.h>
> +#include <linux/pinctrl/consumer.h>
>   #include <linux/platform_device.h>
>   #include <linux/spi/spi.h>
>   #include <linux/pm_runtime.h>
> @@ -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)

[toc] | [prev] | [next] | [standalone]

#1545575

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 <briannorris@chromium.org>
> ---
>  Documentation/devicetree/bindings/spi/spi-rockchip.txt | 7 +++++++
>  drivers/spi/spi-rockchip.c                             | 5 +++++
>  2 files changed, 12 insertions(+)

Acked-by: Rob Herring <robh@kernel.org>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web