[PATCH] powerpc/dts: fix the compatible string of sec 4.0

[PATCH] powerpc/dts: fix the compatible string of sec 4.0

[Shengzhou Liu]

From: Liu Shuo <shuo.liu@freescale.com>

Fix the compatible string of sec 4.0 to match with CAMM driver according
to the documentation file Documentation/devicetree/bindings/crypto/fsl-sec4.txt.

Signed-off-by: Liu Shuo <shuo.liu@freescale.com>
Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
---
against master branch of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

 arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
index bf957a7..d4c9d5d 100644
--- a/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
@@ -33,32 +33,32 @@
  */
 
 crypto@30000 {
-	compatible = "fsl,sec4.4", "fsl,sec4.0";
+	compatible = "fsl,sec-v4.4", "fsl,sec-v4.0";
 	#address-cells = <1>;
 	#size-cells = <1>;
 	reg		 = <0x30000 0x10000>;
 	interrupts	 = <58 2 0 0>;
 
 	sec_jr0: jr@1000 {
-		compatible = "fsl,sec4.4-job-ring", "fsl,sec4.0-job-ring";
+		compatible = "fsl,sec-v4.4-job-ring", "fsl,sec-v4.0-job-ring";
 		reg	   = <0x1000 0x1000>;
 		interrupts	 = <45 2 0 0>;
 	};
 
 	sec_jr1: jr@2000 {
-		compatible = "fsl,sec4.4-job-ring", "fsl,sec4.0-job-ring";
+		compatible = "fsl,sec-v4.4-job-ring", "fsl,sec-v4.0-job-ring";
 		reg	   = <0x2000 0x1000>;
 		interrupts	 = <45 2 0 0>;
 	};
 
 	sec_jr2: jr@3000 {
-		compatible = "fsl,sec4.4-job-ring", "fsl,sec4.0-job-ring";
+		compatible = "fsl,sec-v4.4-job-ring", "fsl,sec-v4.0-job-ring";
 		reg	   = <0x3000 0x1000>;
 		interrupts	 = <45 2 0 0>;
 	};
 
 	sec_jr3: jr@4000 {
-		compatible = "fsl,sec4.4-job-ring", "fsl,sec4.0-job-ring";
+		compatible = "fsl,sec-v4.4-job-ring", "fsl,sec-v4.0-job-ring";
 		reg	   = <0x4000 0x1000>;
 		interrupts	 = <45 2 0 0>;
 	};
-- 
1.7.0.4

Re: [PATCH] powerpc/dts: fix the compatible string of sec 4.0

[Kumar Gala]

On Mar 6, 2012, at 1:21 AM, Shengzhou Liu wrote:

> From: Liu Shuo <shuo.liu@freescale.com>
>=20
> Fix the compatible string of sec 4.0 to match with CAMM driver =
according
> to the documentation file =
Documentation/devicetree/bindings/crypto/fsl-sec4.txt.
>=20
> Signed-off-by: Liu Shuo <shuo.liu@freescale.com>
> Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
> ---
> against master branch of =
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
>=20
> arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi |   10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)

Kim,

Please ack or nack this.

- k=

Re: [PATCH] powerpc/dts: fix the compatible string of sec 4.0

[Kim Phillips]

On Tue, 6 Mar 2012 15:21:16 +0800
Shengzhou Liu <Shengzhou.Liu@freescale.com> wrote:

> From: Liu Shuo <shuo.liu@freescale.com>
> 
> Fix the compatible string of sec 4.0 to match with CAMM driver according
> to the documentation file Documentation/devicetree/bindings/crypto/fsl-sec4.txt.

s/the documentation file//, since it's pretty obvious from the
pathname.

Also, if you wrap your commit text to 75 chars, then people won't
have to use the left- and right-arrow keys when browsing git log.

> +++ b/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
> @@ -33,32 +33,32 @@
>   */
>  
>  crypto@30000 {
> -	compatible = "fsl,sec4.4", "fsl,sec4.0";
> +	compatible = "fsl,sec-v4.4", "fsl,sec-v4.0";

so I've tracked the original error down to v3.2-rc3-18-g5652520,
which means v3.2 was released with the error.  Consequently, the
driver should also be updated to check for "fsl,sec-v4.0", and,
failing that, check for "fsl,sec4.0".  The fix should also be sent
to stable@kernel.org [1].

Thanks,

Kim

[1] see Documentation/stable_kernel_rules.txt