aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch
diff options
context:
space:
mode:
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.patch25
1 files changed, 7 insertions, 18 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
index c4525c46bd..0be31813cb 100644
--- 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
@@ -17,9 +17,6 @@ Acked-by: Mark Rutland <mark.rutland@arm.com>
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 @@
@@ -51,23 +48,19 @@ index 0000000..f839acd
+ 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 {
+@@ -20,3 +20,7 @@
+ status = "okay";
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 @@
+@@ -524,3 +524,7 @@
status = "okay";
vmmc-supply = <&vmmc_reg>;
};
@@ -75,23 +68,19 @@ index 23b0a3e..d59e51c 100644
+&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>;
+@@ -430,3 +430,7 @@
+ &gpio0 {
+ ti,no-reset-on-init;
};
+
+&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 @@
+@@ -707,5 +707,14 @@
#size-cells = <1>;
status = "disabled";
};