On Mon, Sep 30, 2013 at 04:13:00PM +0100, Joel Fernandes wrote:
> From: "Mark A. Greer" <mgreer@xxxxxxxxxxxxxxx>
>
> 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.
>
> [joelf@xxxxxx: Dropped interrupt-parrent property]
> CC: Paul Walmsley <paul@xxxxxxxxx>
> Signed-off-by: Mark A. Greer <mgreer@xxxxxxxxxxxxxxx>
> ---
> .../devicetree/bindings/crypto/omap-sham.txt | 31 ++++++++++++++++++++++
> 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 | 9 +++++++
> 5 files changed, 52 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..b97710f
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt
> @@ -0,0 +1,31 @@
> +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.
I don't think this is strictly speaking necessary -- it's mostly going
to be implicit (it is in the dtsi below). As this is a standard
property, you don't need to document it here.
> +- interrupts : the interrupt number for the SHAM module.
Sorry, I missed this last time, but this should be interrupt-specifier
rather than interrupt number.
Otherwise, this looks good to me. With the fixups above:
Acked-by: Mark Rutland <mark.rutland@xxxxxxx>
> +
> +Optional properties:
> +- dmas: DMA specifier for the rx dma. See the DMA client binding,
> + Documentation/devicetree/bindings/dma/dma.txt
> +- dma-names: DMA request name. Should be "rx" if a dma is present.
> +
> +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 0d63348..8a9802e 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone.dts
> @@ -19,3 +19,7 @@
> &mmc1 {
> vmmc-supply = <&ldo3_reg>;
> };
> +
> +&sham {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> index 23b0a3e..d59e51c 100644
> --- a/arch/arm/boot/dts/am335x-evm.dts
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -522,3 +522,7 @@
> status = "okay";
> vmmc-supply = <&vmmc_reg>;
> };
> +
> +&sham {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
> index bc93895..d45a330 100644
> --- a/arch/arm/boot/dts/am335x-evmsk.dts
> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
> @@ -424,3 +424,7 @@
> status = "okay";
> vmmc-supply = <&vmmc_reg>;
> };
> +
> +&sham {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index 553adc6..299710b 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -710,5 +710,14 @@
> #size-cells = <1>;
> status = "disabled";
> };
> +
> + sham: sham@53100000 {
> + compatible = "ti,omap4-sham";
> + ti,hwmods = "sham";
> + reg = <0x53100000 0x200>;
> + interrupts = <109>;
> + dmas = <&edma 36>;
> + dma-names = "rx";
> + };
> };
> };
> --
> 1.8.1.2
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
