* [PATCH 0/2] ARM: dts: Add SHAM and AES DT information @ 2013-07-16 23:29 Mark A. Greer 2013-07-16 23:29 ` [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX Mark A. Greer 2013-07-16 23:29 ` [PATCH 2/2] ARM: dts: Add AES " Mark A. Greer 0 siblings, 2 replies; 7+ messages in thread From: Mark A. Greer @ 2013-07-16 23:29 UTC (permalink / raw) To: linux-omap, linux-arm-kernel; +Cc: paul, Mark A. Greer From: "Mark A. Greer" <mgreer@animalcreek.com> Long overdue patches to add the device tree updates and documentation for the SHAM and AES modules on the am33xx. The supporting code is already in the mainline kernel. Mark A. Greer (2): ARM: dts: Add SHAM data and documentation for AM33XX ARM: dts: Add AES data and documentation for AM33XX .../devicetree/bindings/crypto/omap-aes.txt | 35 ++++++++++++++++++++++ .../devicetree/bindings/crypto/omap-sham.txt | 33 ++++++++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 8 +++++ arch/arm/boot/dts/am335x-evm.dts | 8 +++++ arch/arm/boot/dts/am335x-evmsk.dts | 7 +++++ arch/arm/boot/dts/am33xx.dtsi | 20 +++++++++++++ 6 files changed, 111 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txt create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt -- 1.7.12 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX 2013-07-16 23:29 [PATCH 0/2] ARM: dts: Add SHAM and AES DT information Mark A. Greer @ 2013-07-16 23:29 ` Mark A. Greer 2013-07-16 23:53 ` Joel Fernandes 2013-07-17 4:42 ` Lokesh Vutla 2013-07-16 23:29 ` [PATCH 2/2] ARM: dts: Add AES " Mark A. Greer 1 sibling, 2 replies; 7+ messages in thread From: Mark A. Greer @ 2013-07-16 23:29 UTC (permalink / raw) To: linux-omap, linux-arm-kernel; +Cc: paul, Mark A. Greer 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"; }; 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"; }; }; }; -- 1.7.12 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX 2013-07-16 23:29 ` [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX Mark A. Greer @ 2013-07-16 23:53 ` Joel Fernandes 2013-07-17 4:42 ` Lokesh Vutla 1 sibling, 0 replies; 7+ messages in thread From: Joel Fernandes @ 2013-07-16 23:53 UTC (permalink / raw) To: Mark A. Greer; +Cc: linux-omap, linux-arm-kernel, paul 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX 2013-07-16 23:29 ` [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX Mark A. Greer 2013-07-16 23:53 ` Joel Fernandes @ 2013-07-17 4:42 ` Lokesh Vutla 2013-07-17 16:10 ` Mark A. Greer 1 sibling, 1 reply; 7+ messages in thread From: Lokesh Vutla @ 2013-07-17 4:42 UTC (permalink / raw) To: Mark A. Greer; +Cc: linux-omap, linux-arm-kernel, paul 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 > }; > }; > }; > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX 2013-07-17 4:42 ` Lokesh Vutla @ 2013-07-17 16:10 ` Mark A. Greer 0 siblings, 0 replies; 7+ messages in thread From: Mark A. Greer @ 2013-07-17 16:10 UTC (permalink / raw) To: Lokesh Vutla; +Cc: linux-omap, linux-arm-kernel, paul 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 -- ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: dts: Add AES data and documentation for AM33XX 2013-07-16 23:29 [PATCH 0/2] ARM: dts: Add SHAM and AES DT information Mark A. Greer 2013-07-16 23:29 ` [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX Mark A. Greer @ 2013-07-16 23:29 ` Mark A. Greer 2013-07-16 23:53 ` Joel Fernandes 1 sibling, 1 reply; 7+ messages in thread From: Mark A. Greer @ 2013-07-16 23:29 UTC (permalink / raw) To: linux-omap, linux-arm-kernel; +Cc: paul, Mark A. Greer From: "Mark A. Greer" <mgreer@animalcreek.com> Add the generic AM33XX AES 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 AES module. CC: Paul Walmsley <paul@pwsan.com> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> --- .../devicetree/bindings/crypto/omap-aes.txt | 35 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 4 +++ arch/arm/boot/dts/am335x-evm.dts | 4 +++ arch/arm/boot/dts/am335x-evmsk.dts | 4 +++ arch/arm/boot/dts/am33xx.dtsi | 11 +++++++ 5 files changed, 58 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txt diff --git a/Documentation/devicetree/bindings/crypto/omap-aes.txt b/Documentation/devicetree/bindings/crypto/omap-aes.txt new file mode 100644 index 0000000..b51d12f --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/omap-aes.txt @@ -0,0 +1,35 @@ +OMAP SoC AES crypto Module + +Required properties: + +- compatible : Should contain entries for this and backward compatible + AES versions: + - "ti,omap2-aes" for OMAP2. + - "ti,omap3-aes" for OMAP3. + - "ti,omap4-aes" for OMAP4 and AM33XX. + Note that the OMAP2 and 3 versions are compatible (OMAP3 supports + more algorithms) but they are incompatible with OMAP4. +- ti,hwmods: Name of the hwmod associated with the AES odule +- 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 AES odule. + +Optional properties: +- dmas: DMA controller phandle and DMA request ordered pairs. +- dma-names: DMA request names. This string corresponds 1:1 with + the ordered pairs in dmas. The string naming is to be + "tx" for TX request and "rx" for RX request. + +Example: + /* AM335x */ + aes: aes@53500000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53500000 0xa0>; + interrupt-parent = <&intc>; + interrupts = <102>; + dmas = <&edma 6 + &edma 5>; + dma-names = "tx", "rx"; + }; diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index bc75b2c..0cb454e 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -238,3 +238,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 9b8c56d..76ba004 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -492,3 +492,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index b04aea1..483d263 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -405,3 +405,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index eb0e719..b20265a 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -539,5 +539,16 @@ dmas = <&edma 36>; dma-names = "rx"; }; + + aes: aes@53500000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53500000 0xa0>; + interrupt-parent = <&intc>; + interrupts = <102>; + dmas = <&edma 6 + &edma 5>; + dma-names = "tx", "rx"; + }; }; }; -- 1.7.12 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] ARM: dts: Add AES data and documentation for AM33XX 2013-07-16 23:29 ` [PATCH 2/2] ARM: dts: Add AES " Mark A. Greer @ 2013-07-16 23:53 ` Joel Fernandes 0 siblings, 0 replies; 7+ messages in thread From: Joel Fernandes @ 2013-07-16 23:53 UTC (permalink / raw) To: Mark A. Greer; +Cc: linux-omap, linux-arm-kernel, paul On 07/16/2013 06:29 PM, Mark A. Greer wrote: > From: "Mark A. Greer" <mgreer@animalcreek.com> > > Add the generic AM33XX AES 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 AES 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-07-17 16:10 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-16 23:29 [PATCH 0/2] ARM: dts: Add SHAM and AES DT information Mark A. Greer 2013-07-16 23:29 ` [PATCH 1/2] ARM: dts: Add SHAM data and documentation for AM33XX Mark A. Greer 2013-07-16 23:53 ` Joel Fernandes 2013-07-17 4:42 ` Lokesh Vutla 2013-07-17 16:10 ` Mark A. Greer 2013-07-16 23:29 ` [PATCH 2/2] ARM: dts: Add AES " Mark A. Greer 2013-07-16 23:53 ` Joel Fernandes
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).