diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2013-11-27 12:34:41 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2013-11-27 12:34:41 +0000 |
commit | 94cdb9986f60a1fbcd78385bf791b7d87b43e24d (patch) | |
tree | 6f9635835d1f20a2184101dd93d5024a8d693557 /target/linux/omap/patches-3.12/300-ARM-dts-AM33XX-Add-SHAM-data-and-documentation.patch | |
parent | 60b5ba0f1db9e640fbaf1144e7abf0ff24b0146c (diff) | |
download | upstream-94cdb9986f60a1fbcd78385bf791b7d87b43e24d.tar.gz upstream-94cdb9986f60a1fbcd78385bf791b7d87b43e24d.tar.bz2 upstream-94cdb9986f60a1fbcd78385bf791b7d87b43e24d.zip |
[omap]: refresh/rename patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38932 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 25 |
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"; }; |