From: Pali Rohár <pali.rohar@gmail.com>
Date: Thu, 26 Feb 2015 13:49:59 +0000 (+0100)
Subject: ARM: dts: omap3-tao3530: Include directly omap34xx.dtsi
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a27c6f3ced3b8cbc8e31189eeffbd0f2f2e2dbc5;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

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 {