| Message ID | 1374017368-5267-2-git-send-email-mgreer@animalcreek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/16/2013 06:29 PM, Mark A. Greer wrote: > From: "Mark A. Greer" <mgreer@animalcreek.com> > > Add the generic AM33XX SHAM module's device tree data and > enable it for the am335x-evm, am335x-evmsk, and am335x-bone > platforms. Also add Documentation file describing the data > for the SHAM module. > > CC: Paul Walmsley <paul@pwsan.com> > Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> Tested-by: Joel Fernandes <joelf@ti.com> Thanks, -Joel
Hi Mark, On Wednesday 17 July 2013 04:59 AM, Mark A. Greer wrote: > From: "Mark A. Greer" <mgreer@animalcreek.com> > > Add the generic AM33XX SHAM module's device tree data and > enable it for the am335x-evm, am335x-evmsk, and am335x-bone > platforms. Also add Documentation file describing the data > for the SHAM module. > > CC: Paul Walmsley <paul@pwsan.com> > Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> > --- > .../devicetree/bindings/crypto/omap-sham.txt | 33 ++++++++++++++++++++++ > arch/arm/boot/dts/am335x-bone.dts | 4 +++ > arch/arm/boot/dts/am335x-evm.dts | 4 +++ > arch/arm/boot/dts/am335x-evmsk.dts | 3 ++ > arch/arm/boot/dts/am33xx.dtsi | 9 ++++++ > 5 files changed, 53 insertions(+) > create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt > > diff --git a/Documentation/devicetree/bindings/crypto/omap-sham.txt b/Documentation/devicetree/bindings/crypto/omap-sham.txt > new file mode 100644 > index 0000000..c6d1202 > --- /dev/null > +++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt > @@ -0,0 +1,33 @@ > +OMAP SoC SHA crypto Module > + > +Required properties: > + > +- compatible : Should contain entries for this and backward compatible > + SHAM versions: > + - "ti,omap2-sham" for OMAP2 & OMAP3. > + - "ti,omap4-sham" for OMAP4 and AM33XX. > + Note that these two versions are incompatible. > +- ti,hwmods: Name of the hwmod associated with the SHAM module > +- reg : Offset and length of the register set for the module > +- interrupt-parent : the phandle for the interrupt controller that > + services interrupts for this module. > +- interrupts : the interrupt number for the SHAM module. > + > +Optional properties: > +- dmas: DMA controller phandle and DMA request ordered pair. > + Only one rx pair is valid per SHAM module. > +- dma-names: DMA request name. This string corresponds 1:1 with > + the ordered pair in dmas. The string naming is to be > + "rx" for RX request. > + > +Example: > + /* AM335x */ > + sham: sham@53100000 { > + compatible = "ti,omap4-sham"; > + ti,hwmods = "sham"; > + reg = <0x53100000 0x200>; > + interrupt-parent = <&intc>; > + interrupts = <109>; > + dmas = <&edma 36>; > + dma-names = "rx"; > + }; > diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts > index 444b4ed..bc75b2c 100644 > --- a/arch/arm/boot/dts/am335x-bone.dts > +++ b/arch/arm/boot/dts/am335x-bone.dts > @@ -234,3 +234,7 @@ > pinctrl-0 = <&davinci_mdio_default>; > pinctrl-1 = <&davinci_mdio_sleep>; > }; > + > +&sham { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts > index 3aee1a4..9b8c56d 100644 > --- a/arch/arm/boot/dts/am335x-evm.dts > +++ b/arch/arm/boot/dts/am335x-evm.dts > @@ -488,3 +488,7 @@ > ti,adc-channels = <4 5 6 7>; > }; > }; > + > +&sham { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts > index 0c8ad17..b04aea1 100644 > --- a/arch/arm/boot/dts/am335x-evmsk.dts > +++ b/arch/arm/boot/dts/am335x-evmsk.dts > @@ -401,4 +401,7 @@ > &cpsw_emac1 { > phy_id = <&davinci_mdio>, <1>; > phy-mode = "rgmii-txid"; > + > +&sham { > + status = "okay"; "};" is missing here. > }; > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > index 38b446b..eb0e719 100644 > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -529,6 +529,15 @@ > #address-cells = <2>; > #size-cells = <1>; > status = "disabled"; > + > + sham: sham@53100000 { > + compatible = "ti,omap4-sham"; > + ti,hwmods = "sham"; > + reg = <0x53100000 0x200>; > + interrupt-parent = <&intc>; > + interrupts = <109>; > + dmas = <&edma 36>; > + dma-names = "rx"; ditto... And please specify in commit log that this series is dependent on Joel's "[PATCH 1/2] ARM: dts: add AM33XX EDMA support" series. Thanks, Lokesh > }; > }; > }; >
On Wed, Jul 17, 2013 at 10:12:22AM +0530, Lokesh Vutla wrote: > Hi Mark, Hi Lokesh. > On Wednesday 17 July 2013 04:59 AM, Mark A. Greer wrote: > > From: "Mark A. Greer" <mgreer@animalcreek.com> > > diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts > > index 0c8ad17..b04aea1 100644 > > --- a/arch/arm/boot/dts/am335x-evmsk.dts > > +++ b/arch/arm/boot/dts/am335x-evmsk.dts > > @@ -401,4 +401,7 @@ > > &cpsw_emac1 { > > phy_id = <&davinci_mdio>, <1>; > > phy-mode = "rgmii-txid"; > > + > > +&sham { > > + status = "okay"; > "};" is missing here. > > }; Ugh, yeah, I somehow mess that out. Thanks for pointing that out. Mark --
diff --git a/Documentation/devicetree/bindings/crypto/omap-sham.txt b/Documentation/devicetree/bindings/crypto/omap-sham.txt new file mode 100644 index 0000000..c6d1202 --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt @@ -0,0 +1,33 @@ +OMAP SoC SHA crypto Module + +Required properties: + +- compatible : Should contain entries for this and backward compatible + SHAM versions: + - "ti,omap2-sham" for OMAP2 & OMAP3. + - "ti,omap4-sham" for OMAP4 and AM33XX. + Note that these two versions are incompatible. +- ti,hwmods: Name of the hwmod associated with the SHAM module +- reg : Offset and length of the register set for the module +- interrupt-parent : the phandle for the interrupt controller that + services interrupts for this module. +- interrupts : the interrupt number for the SHAM module. + +Optional properties: +- dmas: DMA controller phandle and DMA request ordered pair. + Only one rx pair is valid per SHAM module. +- dma-names: DMA request name. This string corresponds 1:1 with + the ordered pair in dmas. The string naming is to be + "rx" for RX request. + +Example: + /* AM335x */ + sham: sham@53100000 { + compatible = "ti,omap4-sham"; + ti,hwmods = "sham"; + reg = <0x53100000 0x200>; + interrupt-parent = <&intc>; + interrupts = <109>; + dmas = <&edma 36>; + dma-names = "rx"; + }; diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index 444b4ed..bc75b2c 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -234,3 +234,7 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; }; + +&sham { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 3aee1a4..9b8c56d 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -488,3 +488,7 @@ ti,adc-channels = <4 5 6 7>; }; }; + +&sham { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 0c8ad17..b04aea1 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -401,4 +401,7 @@ &cpsw_emac1 { phy_id = <&davinci_mdio>, <1>; phy-mode = "rgmii-txid"; + +&sham { + status = "okay"; }; diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 38b446b..eb0e719 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -529,6 +529,15 @@ #address-cells = <2>; #size-cells = <1>; status = "disabled"; + + sham: sham@53100000 { + compatible = "ti,omap4-sham"; + ti,hwmods = "sham"; + reg = <0x53100000 0x200>; + interrupt-parent = <&intc>; + interrupts = <109>; + dmas = <&edma 36>; + dma-names = "rx"; }; }; };