* [PATCH 1/5] dt-bindings: crypto: sahara: use generic node name
2020-03-05 13:59 [PATCH 0/5] ARM: dts: imx: use generic name for crypto node Horia Geantă
@ 2020-03-05 13:59 ` Horia Geantă
2020-03-05 13:59 ` [PATCH 2/5] dt-bindings: crypto: dcp: " Horia Geantă
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Horia Geantă @ 2020-03-05 13:59 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, Sascha Hauer
Cc: Herbert Xu, David S. Miller, Silvano Di Ninno, Aymen Sghaier,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
linux-crypto, devicetree, linux-arm-kernel, linux-kernel
crypto node should use the "crypto" generic naming,
and not a specific one.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt b/Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt
index e8a35c71e947..db690b10e582 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt
@@ -8,7 +8,7 @@ Required properties:
Example:
-sah@10025000 {
+sah: crypto@10025000 {
compatible = "fsl,imx27-sahara";
reg = < 0x10025000 0x800>;
interrupts = <75>;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/5] dt-bindings: crypto: dcp: use generic node name
2020-03-05 13:59 [PATCH 0/5] ARM: dts: imx: use generic name for crypto node Horia Geantă
2020-03-05 13:59 ` [PATCH 1/5] dt-bindings: crypto: sahara: use generic node name Horia Geantă
@ 2020-03-05 13:59 ` Horia Geantă
2020-03-05 13:59 ` [PATCH 3/5] dt-bindings: crypto: caam: " Horia Geantă
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Horia Geantă @ 2020-03-05 13:59 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, Sascha Hauer
Cc: Herbert Xu, David S. Miller, Silvano Di Ninno, Aymen Sghaier,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
linux-crypto, devicetree, linux-arm-kernel, linux-kernel
crypto node should use the "crypto" generic naming,
and not the "dcp" specific one.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
Documentation/devicetree/bindings/crypto/fsl-dcp.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/crypto/fsl-dcp.txt b/Documentation/devicetree/bindings/crypto/fsl-dcp.txt
index 4e4d387e38a5..513499fcdb5b 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-dcp.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-dcp.txt
@@ -11,7 +11,7 @@ Required properties:
Example:
-dcp@80028000 {
+dcp: crypto@80028000 {
compatible = "fsl,imx28-dcp", "fsl,imx23-dcp";
reg = <0x80028000 0x2000>;
interrupts = <52 53>;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/5] dt-bindings: crypto: caam: use generic node name
2020-03-05 13:59 [PATCH 0/5] ARM: dts: imx: use generic name for crypto node Horia Geantă
2020-03-05 13:59 ` [PATCH 1/5] dt-bindings: crypto: sahara: use generic node name Horia Geantă
2020-03-05 13:59 ` [PATCH 2/5] dt-bindings: crypto: dcp: " Horia Geantă
@ 2020-03-05 13:59 ` Horia Geantă
2020-03-05 13:59 ` [PATCH 4/5] ARM: dts: imx: align name for crypto node and child nodes Horia Geantă
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Horia Geantă @ 2020-03-05 13:59 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, Sascha Hauer
Cc: Herbert Xu, David S. Miller, Silvano Di Ninno, Aymen Sghaier,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
linux-crypto, devicetree, linux-arm-kernel, linux-kernel
i.MX6UL example uses a specific node name for the crypto node.
Let's fix it so we avoid this propagating further.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
Documentation/devicetree/bindings/crypto/fsl-sec4.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index 2fe245ca816a..8f359f473ada 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -138,7 +138,7 @@ iMX6QDL/SX requires four clocks
iMX6UL does only require three clocks
- crypto: caam@2140000 {
+ crypto: crypto@2140000 {
compatible = "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] ARM: dts: imx: align name for crypto node and child nodes
2020-03-05 13:59 [PATCH 0/5] ARM: dts: imx: use generic name for crypto node Horia Geantă
` (2 preceding siblings ...)
2020-03-05 13:59 ` [PATCH 3/5] dt-bindings: crypto: caam: " Horia Geantă
@ 2020-03-05 13:59 ` Horia Geantă
2020-03-05 13:59 ` [PATCH 5/5] arm64: dts: imx8mn: align name for crypto " Horia Geantă
2020-03-11 8:53 ` [PATCH 0/5] ARM: dts: imx: use generic name for crypto node Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Horia Geantă @ 2020-03-05 13:59 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, Sascha Hauer
Cc: Herbert Xu, David S. Miller, Silvano Di Ninno, Aymen Sghaier,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
linux-crypto, devicetree, linux-arm-kernel, linux-kernel
crypto node should use the "crypto" generic naming,
and not a specific one ("sahara", "dcp", "caam").
Child nodes of the crypto node for caam crypto engine
should use the "jr" name (without an index),
as indicated in the DT binding.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
arch/arm/boot/dts/imx23.dtsi | 2 +-
arch/arm/boot/dts/imx27.dtsi | 2 +-
arch/arm/boot/dts/imx28.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl.dtsi | 6 +++---
arch/arm/boot/dts/imx6sl.dtsi | 2 +-
arch/arm/boot/dts/imx6sll.dtsi | 2 +-
arch/arm/boot/dts/imx6sx.dtsi | 6 +++---
arch/arm/boot/dts/imx6ul.dtsi | 8 ++++----
arch/arm/boot/dts/imx7s.dtsi | 8 ++++----
arch/arm/boot/dts/imx7ulp.dtsi | 4 ++--
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 8257630f7a49..eb0aeda1682c 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -422,7 +422,7 @@
clocks = <&clks 16>;
};
- dcp@80028000 {
+ dcp: crypto@80028000 {
compatible = "fsl,imx23-dcp";
reg = <0x80028000 0x2000>;
interrupts = <53 54>;
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index f3464cf52e49..002cd223f22d 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -525,7 +525,7 @@
reg = <0x10024600 0x200>;
};
- sahara2: sahara@10025000 {
+ sahara2: crypto@10025000 {
compatible = "fsl,imx27-sahara";
reg = <0x10025000 0x1000>;
interrupts = <59>;
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index e14d8ef0158b..a1cbbeb39a4f 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -998,7 +998,7 @@
clocks = <&clks 26>;
};
- dcp: dcp@80028000 {
+ dcp: crypto@80028000 {
compatible = "fsl,imx28-dcp", "fsl,imx23-dcp";
reg = <0x80028000 0x2000>;
interrupts = <52 53 54>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 70fb8b56b1d7..f87085db3f5e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -942,7 +942,7 @@
reg = <0x02100000 0x100000>;
ranges;
- crypto: caam@2100000 {
+ crypto: crypto@2100000 {
compatible = "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
@@ -954,13 +954,13 @@
<&clks IMX6QDL_CLK_EIM_SLOW>;
clock-names = "mem", "aclk", "ipg", "emi_slow";
- sec_jr0: jr0@1000 {
+ sec_jr0: jr@1000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr1: jr1@2000 {
+ sec_jr1: jr@2000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index c8ec46fe8302..94e428b7759d 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -777,7 +777,7 @@
power-domains = <&pd_disp>;
};
- dcp: dcp@20fc000 {
+ dcp: crypto@20fc000 {
compatible = "fsl,imx6sl-dcp", "fsl,imx28-dcp";
reg = <0x020fc000 0x4000>;
interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index 797f850492fe..e8e0fb334cfb 100644
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -652,7 +652,7 @@
status = "disabled";
};
- dcp: dcp@20fc000 {
+ dcp: crypto@20fc000 {
compatible = "fsl,imx28-dcp";
reg = <0x020fc000 0x4000>;
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index e47d346a3543..5ecbac85c87a 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -837,7 +837,7 @@
reg = <0x02100000 0x100000>;
ranges;
- crypto: caam@2100000 {
+ crypto: crypto@2100000 {
compatible = "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
@@ -850,13 +850,13 @@
<&clks IMX6SX_CLK_EIM_SLOW>;
clock-names = "mem", "aclk", "ipg", "emi_slow";
- sec_jr0: jr0@1000 {
+ sec_jr0: jr@1000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr1: jr1@2000 {
+ sec_jr1: jr@2000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index e1807e9d385a..b4a8f6a858b9 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -778,7 +778,7 @@
reg = <0x02100000 0x100000>;
ranges;
- crypto: caam@2140000 {
+ crypto: crypto@2140000 {
compatible = "fsl,imx6ul-caam", "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
@@ -789,19 +789,19 @@
<&clks IMX6UL_CLK_CAAM_MEM>;
clock-names = "ipg", "aclk", "mem";
- sec_jr0: jr0@1000 {
+ sec_jr0: jr@1000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr1: jr1@2000 {
+ sec_jr1: jr@2000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr2: jr2@3000 {
+ sec_jr2: jr@3000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>;
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 196bbd6f6fcc..dad529564fe1 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -932,7 +932,7 @@
};
};
- crypto: caam@30900000 {
+ crypto: crypto@30900000 {
compatible = "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
@@ -943,19 +943,19 @@
<&clks IMX7D_AHB_CHANNEL_ROOT_CLK>;
clock-names = "ipg", "aclk";
- sec_jr0: jr0@1000 {
+ sec_jr0: jr@1000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr1: jr1@2000 {
+ sec_jr1: jr@2000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr2: jr1@3000 {
+ sec_jr2: jr@3000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>;
interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi
index ab91c98f2124..f7c4878534c8 100644
--- a/arch/arm/boot/dts/imx7ulp.dtsi
+++ b/arch/arm/boot/dts/imx7ulp.dtsi
@@ -132,13 +132,13 @@
<&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>;
clock-names = "aclk", "ipg";
- sec_jr0: jr0@1000 {
+ sec_jr0: jr@1000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr1: jr1@2000 {
+ sec_jr1: jr@2000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] arm64: dts: imx8mn: align name for crypto child nodes
2020-03-05 13:59 [PATCH 0/5] ARM: dts: imx: use generic name for crypto node Horia Geantă
` (3 preceding siblings ...)
2020-03-05 13:59 ` [PATCH 4/5] ARM: dts: imx: align name for crypto node and child nodes Horia Geantă
@ 2020-03-05 13:59 ` Horia Geantă
2020-03-11 8:53 ` [PATCH 0/5] ARM: dts: imx: use generic name for crypto node Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Horia Geantă @ 2020-03-05 13:59 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, Sascha Hauer
Cc: Herbert Xu, David S. Miller, Silvano Di Ninno, Aymen Sghaier,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
linux-crypto, devicetree, linux-arm-kernel, linux-kernel
From: Silvano di Ninno <silvano.dininno@nxp.com>
crypto child nodes should use the "jr" name (without an index),
as indicated in the DT binding.
Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index f2775724377f..ff9c1ea38130 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -554,19 +554,19 @@
<&clk IMX8MN_CLK_IPG_ROOT>;
clock-names = "aclk", "ipg";
- sec_jr0: jr0@1000 {
+ sec_jr0: jr@1000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr1: jr1@2000 {
+ sec_jr1: jr@2000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
};
- sec_jr2: jr2@3000 {
+ sec_jr2: jr@3000 {
compatible = "fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>;
interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/5] ARM: dts: imx: use generic name for crypto node
2020-03-05 13:59 [PATCH 0/5] ARM: dts: imx: use generic name for crypto node Horia Geantă
` (4 preceding siblings ...)
2020-03-05 13:59 ` [PATCH 5/5] arm64: dts: imx8mn: align name for crypto " Horia Geantă
@ 2020-03-11 8:53 ` Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Shawn Guo @ 2020-03-11 8:53 UTC (permalink / raw)
To: Horia Geantă
Cc: Rob Herring, Sascha Hauer, Herbert Xu, David S. Miller,
Silvano Di Ninno, Aymen Sghaier, Pengutronix Kernel Team,
Fabio Estevam, NXP Linux Team, linux-crypto, devicetree,
linux-arm-kernel, linux-kernel
On Thu, Mar 05, 2020 at 03:59:04PM +0200, Horia Geantă wrote:
> This patch set aligns / fixes the naming of the crypto node
> (and its child nodes) for sahara, dcp and caam crypto engines
> used in i.MX SoCs.
>
> Horia Geantă (4):
> dt-bindings: crypto: sahara: use generic node name
> dt-bindings: crypto: dcp: use generic node name
> dt-bindings: crypto: caam: use generic node name
> ARM: dts: imx: align name for crypto node and child nodes
>
> Silvano di Ninno (1):
> arm64: dts: imx8mn: align name for crypto child nodes
Applied all, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread