On Thu, Jun 06, 2019 at 11:02:55AM +0300, Horia Geantă wrote:
> From: Iuliana Prodan <iuliana.prodan@xxxxxxx>
>
> Add crypto node in device tree for CAAM support.
>
> Noteworthy is that on 7ulp the interrupt line is shared
> between the two job rings.
>
> Signed-off-by: Iuliana Prodan <iuliana.prodan@xxxxxxx>
> Signed-off-by: Franck LENORMAND <franck.lenormand@xxxxxxx>
> Signed-off-by: Horia Geantă <horia.geanta@xxxxxxx>
> ---
>
> I've just realized that this patch should be merged through the crypto tree,
> else bisectability could be affected due to cryptodev-2.6
> commit 385cfc84a5a8 ("crypto: caam - disable some clock checks for iMX7ULP")
> ( https://patchwork.kernel.org/patch/10970017/ )
> which should come first.
I'm not sure I follow it. This is a new device added to imx7ulp DT.
It's never worked before on imx7ulp. How would it affect git bisect?
Shawn
>
> arch/arm/boot/dts/imx7ulp.dtsi | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi
> index d6b711011cba..e20483714be5 100644
> --- a/arch/arm/boot/dts/imx7ulp.dtsi
> +++ b/arch/arm/boot/dts/imx7ulp.dtsi
> @@ -100,6 +100,29 @@
> reg = <0x40000000 0x800000>;
> ranges;
>
> + crypto: crypto@40240000 {
> + compatible = "fsl,sec-v4.0";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + reg = <0x40240000 0x10000>;
> + ranges = <0 0x40240000 0x10000>;
> + clocks = <&pcc2 IMX7ULP_CLK_CAAM>,
> + <&scg1 IMX7ULP_CLK_NIC1_BUS_DIV>;
> + clock-names = "aclk", "ipg";
> +
> + sec_jr0: jr0@1000 {
> + compatible = "fsl,sec-v4.0-job-ring";
> + reg = <0x1000 0x1000>;
> + interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
> + };
> +
> + sec_jr1: jr1@2000 {
> + compatible = "fsl,sec-v4.0-job-ring";
> + reg = <0x2000 0x1000>;
> + interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
> + };
> + };
> +
> lpuart4: serial@402d0000 {
> compatible = "fsl,imx7ulp-lpuart";
> reg = <0x402d0000 0x1000>;
> --
> 2.17.1
>
