| Message ID | 1438228709-27650-10-git-send-email-vicki.milhoan@freescale.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Herbert Xu |
| Headers | show |
On Wed, Jul 29, 2015 at 08:58:26PM -0700, Victoria Milhoan wrote: > Add CAAM device node to the i.MX6 device tree. > > Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com> > --- > arch/arm/boot/dts/imx6qdl.dtsi | 30 ++++++++++++++++++++++++++---- > 1 file changed, 26 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi > index e6d1359..4df9f1e 100644 > --- a/arch/arm/boot/dts/imx6qdl.dtsi > +++ b/arch/arm/boot/dts/imx6qdl.dtsi > @@ -836,10 +836,32 @@ > reg = <0x02100000 0x100000>; > ranges; > > - caam@02100000 { > - reg = <0x02100000 0x40000>; > - interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>, > - <0 106 IRQ_TYPE_LEVEL_HIGH>; > + 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 IMX6QDL_CAAM_MEM>, > + <&clks IMX6QDL_CAAM_ACLK>, > + <&clks IMX6QDL_CAAM_IPG>, > + <&clks IMX6QDL_CLK_EIM_SLOW>; > + clock-names = "caam_mem", "caam_aclk", > + "caam_ipg", "caam_emi_slow"; The binding document should be updated for these additional properties. The namespace caam_ is already clear from the context, you can drop these prefixes. Sascha
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index e6d1359..4df9f1e 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -836,10 +836,32 @@ reg = <0x02100000 0x100000>; ranges; - caam@02100000 { - reg = <0x02100000 0x40000>; - interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>, - <0 106 IRQ_TYPE_LEVEL_HIGH>; + 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 IMX6QDL_CAAM_MEM>, + <&clks IMX6QDL_CAAM_ACLK>, + <&clks IMX6QDL_CAAM_IPG>, + <&clks IMX6QDL_CLK_EIM_SLOW>; + clock-names = "caam_mem", "caam_aclk", + "caam_ipg", "caam_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 = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + }; }; aipstz@0217c000 { /* AIPSTZ2 */
Add CAAM device node to the i.MX6 device tree. Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com> --- arch/arm/boot/dts/imx6qdl.dtsi | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)