aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2013-11-15 12:23:17 +0000
committerImre Kaloz <kaloz@openwrt.org>2013-11-15 12:23:17 +0000
commite4eef7e6207078a4987b0e02d2ad4068083cf921 (patch)
treeae97c3d14f8a010428d78dfc27dde471ad897232 /target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch
parent1f3478901593dd3bb4f32b2cdcb4c4cfecdbea5a (diff)
downloadupstream-e4eef7e6207078a4987b0e02d2ad4068083cf921.tar.gz
upstream-e4eef7e6207078a4987b0e02d2ad4068083cf921.tar.bz2
upstream-e4eef7e6207078a4987b0e02d2ad4068083cf921.zip
replace the TI patch with a smaller patchset
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 38816
Diffstat (limited to 'target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch')
-rw-r--r--target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch108
1 files changed, 108 insertions, 0 deletions
diff --git a/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch b/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch
new file mode 100644
index 0000000000..c4525c46bd
--- /dev/null
+++ b/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch
@@ -0,0 +1,108 @@
+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@ti.com: Dropped interrupt-parrent property, documentation fixups]
+CC: Paul Walmsley <paul@pwsan.com>
+Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
+Acked-by: Mark Rutland <mark.rutland@arm.com>
+
+---
+.../devicetree/bindings/crypto/omap-sham.txt | 28 ++++++++++++++++++++++
+ 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, 49 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..f839acd
+--- /dev/null
++++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt
+@@ -0,0 +1,28 @@
++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
++- interrupts : the interrupt-specifier for the SHAM module.
++
++Optional properties:
++- dmas: DMA specifiers 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>;
++ 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";
++ };
+ };
+ };