| Message ID | 1438799328-10757-12-git-send-email-vicki.milhoan@freescale.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Herbert Xu |
| Headers | show |
On 8/5/2015 9:28 PM, Victoria Milhoan wrote: > Add CAAM device node to the i.MX6SX device tree. > > Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com> > --- > arch/arm/boot/dts/imx6sx.dtsi | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi > index 708175d..20851cb 100644 > --- a/arch/arm/boot/dts/imx6sx.dtsi > +++ b/arch/arm/boot/dts/imx6sx.dtsi > @@ -738,6 +738,34 @@ > reg = <0x02100000 0x100000>; > ranges; > > + crypto: caam@2100000 { > + compatible = "fsl,sec-v4.0"; > + fsl,sec-era = <4>; > + #address-cells = <1>; > + #size-cells = <1>; > + reg = <0x2100000 0x10000>; > + ranges = <0 0x2100000 0x10000>; > + interrupt-parent = <&intc>; > + clocks = <&clks IMX6SX_CLK_CAAM_MEM>, > + <&clks IMX6SX_CLK_CAAM_ACLK>, > + <&clks IMX6SX_CLK_CAAM_IPG>, > + <&clks IMX6SX_CLK_EIM_SLOW>; > + clock-names = "mem", "aclk", "ipg", "emi_slow"; > + > + sec_jr0: jr0@1000 { > + compatible = "fsl,sec-v4.0-job-ring"; > + reg = <0x1000 0x1000>; > + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + sec_jr1: jr1@2000 { > + compatible = "fsl,sec-v4.0-job-ring"; > + reg = <0x2000 0x1000>; > + interrupts = <0 106 0x4>; > + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; Typo - duplicate property. Remove the first one. Horia -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 6 Aug 2015 11:59:34 +0300 Horia Geant? <horia.geanta@freescale.com> wrote: > On 8/5/2015 9:28 PM, Victoria Milhoan wrote: > > Add CAAM device node to the i.MX6SX device tree. > > > > Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com> > > --- > > arch/arm/boot/dts/imx6sx.dtsi | 28 ++++++++++++++++++++++++++++ > > 1 file changed, 28 insertions(+) > > > > diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi > > index 708175d..20851cb 100644 > > --- a/arch/arm/boot/dts/imx6sx.dtsi > > +++ b/arch/arm/boot/dts/imx6sx.dtsi > > @@ -738,6 +738,34 @@ > > reg = <0x02100000 0x100000>; > > ranges; > > > > + crypto: caam@2100000 { > > + compatible = "fsl,sec-v4.0"; > > + fsl,sec-era = <4>; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + reg = <0x2100000 0x10000>; > > + ranges = <0 0x2100000 0x10000>; > > + interrupt-parent = <&intc>; > > + clocks = <&clks IMX6SX_CLK_CAAM_MEM>, > > + <&clks IMX6SX_CLK_CAAM_ACLK>, > > + <&clks IMX6SX_CLK_CAAM_IPG>, > > + <&clks IMX6SX_CLK_EIM_SLOW>; > > + clock-names = "mem", "aclk", "ipg", "emi_slow"; > > + > > + sec_jr0: jr0@1000 { > > + compatible = "fsl,sec-v4.0-job-ring"; > > + reg = <0x1000 0x1000>; > > + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; > > + }; > > + > > + sec_jr1: jr1@2000 { > > + compatible = "fsl,sec-v4.0-job-ring"; > > + reg = <0x2000 0x1000>; > > + interrupts = <0 106 0x4>; > > + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; > > Typo - duplicate property. Remove the first one. I will send out a replacement patch shortly. > > Horia > >
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 708175d..20851cb 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -738,6 +738,34 @@ reg = <0x02100000 0x100000>; ranges; + crypto: caam@2100000 { + compatible = "fsl,sec-v4.0"; + fsl,sec-era = <4>; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x2100000 0x10000>; + ranges = <0 0x2100000 0x10000>; + interrupt-parent = <&intc>; + clocks = <&clks IMX6SX_CLK_CAAM_MEM>, + <&clks IMX6SX_CLK_CAAM_ACLK>, + <&clks IMX6SX_CLK_CAAM_IPG>, + <&clks IMX6SX_CLK_EIM_SLOW>; + clock-names = "mem", "aclk", "ipg", "emi_slow"; + + sec_jr0: jr0@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; + }; + + sec_jr1: jr1@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = <0 106 0x4>; + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + }; + }; + usbotg1: usb@02184000 { compatible = "fsl,imx6sx-usb", "fsl,imx27-usb"; reg = <0x02184000 0x200>;
Add CAAM device node to the i.MX6SX device tree. Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com> --- arch/arm/boot/dts/imx6sx.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)