[1/3] ARM: dts: imx7s: add snvs clock to pwrkey
diff mbox series

Message ID 20200130204516.4760-1-git@andred.net
State New
Headers show
Series
  • [1/3] ARM: dts: imx7s: add snvs clock to pwrkey
Related show

Commit Message

André Draszik Jan. 30, 2020, 8:45 p.m. UTC
On i.MX7, the SNVS requires a clock. This is similar to the clock
bound to the SNVS RTC node, but if the SNVS RTC driver isn't enabled,
then SNVS doesn't work, and as such the pwrkey driver doesn't
work (i.e. hangs the kernel, as the clock isn't enabled).

Also see commit ec2a844ef7c1
("ARM: dts: imx7s: add snvs rtc clock")
for a similar fix.

Signed-off-by: André Draszik <git@andred.net>
Cc: Anson Huang <Anson.Huang@nxp.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: "Horia Geantă" <horia.geanta@nxp.com>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-crypto@vger.kernel.org
Cc: devicetree@vger.kernel.org
Cc: linux-input@vger.kernel.org
---
 .../devicetree/bindings/crypto/fsl-sec4.txt     | 17 +++++++++++++++++
 arch/arm/boot/dts/imx7s.dtsi                    |  2 ++
 2 files changed, 19 insertions(+)

Comments

Rob Herring Feb. 6, 2020, 6:30 p.m. UTC | #1
On Thu, 30 Jan 2020 20:45:14 +0000, =?UTF-8?q?Andr=C3=A9=20Draszik?= wrote:
> On i.MX7, the SNVS requires a clock. This is similar to the clock
> bound to the SNVS RTC node, but if the SNVS RTC driver isn't enabled,
> then SNVS doesn't work, and as such the pwrkey driver doesn't
> work (i.e. hangs the kernel, as the clock isn't enabled).
> 
> Also see commit ec2a844ef7c1
> ("ARM: dts: imx7s: add snvs rtc clock")
> for a similar fix.
> 
> Signed-off-by: André Draszik <git@andred.net>
> Cc: Anson Huang <Anson.Huang@nxp.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: "Horia Geantă" <horia.geanta@nxp.com>
> Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: linux-crypto@vger.kernel.org
> Cc: devicetree@vger.kernel.org
> Cc: linux-input@vger.kernel.org
> ---
>  .../devicetree/bindings/crypto/fsl-sec4.txt     | 17 +++++++++++++++++
>  arch/arm/boot/dts/imx7s.dtsi                    |  2 ++
>  2 files changed, 19 insertions(+)
> 

Acked-by: Rob Herring <robh@kernel.org>
Horia Geantă Feb. 7, 2020, 7:36 a.m. UTC | #2
On 1/30/2020 10:45 PM, André Draszik wrote:
> On i.MX7, the SNVS requires a clock. This is similar to the clock
> bound to the SNVS RTC node, but if the SNVS RTC driver isn't enabled,
> then SNVS doesn't work, and as such the pwrkey driver doesn't
> work (i.e. hangs the kernel, as the clock isn't enabled).
> 
This is true also for i.MX8M.
For this reason it would probably better splitting the
DT bindings update in a separate patch.

> Also see commit ec2a844ef7c1
> ("ARM: dts: imx7s: add snvs rtc clock")
> for a similar fix.
> 
> Signed-off-by: André Draszik <git@andred.net>
> Cc: Anson Huang <Anson.Huang@nxp.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: "Horia Geantă" <horia.geanta@nxp.com>
> Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: linux-crypto@vger.kernel.org
> Cc: devicetree@vger.kernel.org
> Cc: linux-input@vger.kernel.org
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>

> ---
>  .../devicetree/bindings/crypto/fsl-sec4.txt     | 17 +++++++++++++++++
>  arch/arm/boot/dts/imx7s.dtsi                    |  2 ++
>  2 files changed, 19 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
> index 2fe245ca816a..755c2838d658 100644
> --- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
> +++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
> @@ -449,6 +449,19 @@ System ON/OFF key driver
>        Value type: <phandle>
>        Definition: this is phandle to the register map node.
>  
> +   - clocks
> +      Usage: optional, required if SNVS LP requires explicit
> +          enablement of clocks
> +      Value type: <prop_encoded-array>
> +      Definition:  a clock specifier describing the clock required for
> +          enabling and disabling SNVS LP RTC.
> +
> +   - clock-names
> +      Usage: optional, required if SNVS LP requires explicit
> +          enablement of clocks
> +      Value type: <string>
> +      Definition: clock name string should be "snvs-pwrkey".
> +
>  EXAMPLE:
>  	snvs-pwrkey@020cc000 {
>  		compatible = "fsl,sec-v4.0-pwrkey";
> @@ -456,6 +469,8 @@ EXAMPLE:
>  		interrupts = <0 4 0x4>
>  	        linux,keycode = <116>; /* KEY_POWER */
>  		wakeup-source;
> +		clocks = <&clks IMX7D_SNVS_CLK>;
> +		clock-names = "snvs-pwrkey";
>  	};
>  
>  =====================================================================
> @@ -547,6 +562,8 @@ FULL EXAMPLE
>  			interrupts = <0 4 0x4>;
>  			linux,keycode = <116>; /* KEY_POWER */
>  			wakeup-source;
> +			clocks = <&clks IMX7D_SNVS_CLK>;
> +			clock-names = "snvs-pwrkey";
>  		};
>  	};
>  
> diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
> index 1b812f4e7453..6240a6f58048 100644
> --- a/arch/arm/boot/dts/imx7s.dtsi
> +++ b/arch/arm/boot/dts/imx7s.dtsi
> @@ -614,6 +614,8 @@
>  					linux,keycode = <KEY_POWER>;
>  					wakeup-source;
>  					status = "disabled";
> +					clocks = <&clks IMX7D_SNVS_CLK>;
> +					clock-names = "snvs-pwrkey";
>  				};
>  			};
>  
>

Patch
diff mbox series

diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index 2fe245ca816a..755c2838d658 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -449,6 +449,19 @@  System ON/OFF key driver
       Value type: <phandle>
       Definition: this is phandle to the register map node.
 
+   - clocks
+      Usage: optional, required if SNVS LP requires explicit
+          enablement of clocks
+      Value type: <prop_encoded-array>
+      Definition:  a clock specifier describing the clock required for
+          enabling and disabling SNVS LP RTC.
+
+   - clock-names
+      Usage: optional, required if SNVS LP requires explicit
+          enablement of clocks
+      Value type: <string>
+      Definition: clock name string should be "snvs-pwrkey".
+
 EXAMPLE:
 	snvs-pwrkey@020cc000 {
 		compatible = "fsl,sec-v4.0-pwrkey";
@@ -456,6 +469,8 @@  EXAMPLE:
 		interrupts = <0 4 0x4>
 	        linux,keycode = <116>; /* KEY_POWER */
 		wakeup-source;
+		clocks = <&clks IMX7D_SNVS_CLK>;
+		clock-names = "snvs-pwrkey";
 	};
 
 =====================================================================
@@ -547,6 +562,8 @@  FULL EXAMPLE
 			interrupts = <0 4 0x4>;
 			linux,keycode = <116>; /* KEY_POWER */
 			wakeup-source;
+			clocks = <&clks IMX7D_SNVS_CLK>;
+			clock-names = "snvs-pwrkey";
 		};
 	};
 
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 1b812f4e7453..6240a6f58048 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -614,6 +614,8 @@ 
 					linux,keycode = <KEY_POWER>;
 					wakeup-source;
 					status = "disabled";
+					clocks = <&clks IMX7D_SNVS_CLK>;
+					clock-names = "snvs-pwrkey";
 				};
 			};