diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2015-02-26 14:49:59 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-03-19 09:26:44 -0700 |
| commit | a27c6f3ced3b8cbc8e31189eeffbd0f2f2e2dbc5 (patch) | |
| tree | 46355742ad612a77ef7b69741cab728d78531958 /arch | |
| parent | 69540a7c277d96382257216436f41abc040cc878 (diff) | |
| download | blackbird-op-linux-a27c6f3ced3b8cbc8e31189eeffbd0f2f2e2dbc5.tar.gz blackbird-op-linux-a27c6f3ced3b8cbc8e31189eeffbd0f2f2e2dbc5.zip | |
ARM: dts: omap3-tao3530: Include directly omap34xx.dtsi
This patch just move content of file omap34xx-hs.dtsi into omap3-tao3530.dts.
There is no code change, patch is just preparation for removing -hs file.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/omap3-tao3530.dtsi | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi index b3b24a5b35c9..7bd8d9a4f67f 100644 --- a/arch/arm/boot/dts/omap3-tao3530.dtsi +++ b/arch/arm/boot/dts/omap3-tao3530.dtsi @@ -8,7 +8,16 @@ */ /dts-v1/; -#include "omap34xx-hs.dtsi" +#include "omap34xx.dtsi" + +/* Secure omaps have some devices inaccessible depending on the firmware */ +&aes { + status = "disabled"; +}; + +&sham { + status = "disabled"; +}; / { cpus { |
