From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 09/10] ARM: dts: omap3-tao3530: Include directly omap34xx.dtsi Date: Thu, 26 Feb 2015 14:49:59 +0100 Message-ID: <1424958600-18881-10-git-send-email-pali.rohar@gmail.com> References: <1424958600-18881-1-git-send-email-pali.rohar@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, Pavel Machek , Nishanth Menon , Ivaylo Dimitrov , Aaro Koskinen , Sebastian Reichel , =?UTF-8?q?Pali=20Roh=C3=A1r?= To: =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Tony Lindgren , Rob Herring , Russell King , Paul Walmsley , Herbert Xu , "David S. Miller" Return-path: In-Reply-To: <1424958600-18881-1-git-send-email-pali.rohar@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-crypto.vger.kernel.org This patch just move content of file omap34xx-hs.dtsi into omap3-tao353= 0.dts. There is no code change, patch is just preparation for removing -hs fil= e. Signed-off-by: Pali Roh=C3=A1r --- arch/arm/boot/dts/omap3-tao3530.dtsi | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/o= map3-tao3530.dtsi index e89820a..873aa10 100644 --- a/arch/arm/boot/dts/omap3-tao3530.dtsi +++ b/arch/arm/boot/dts/omap3-tao3530.dtsi @@ -8,7 +8,16 @@ */ /dts-v1/; =20 -#include "omap34xx-hs.dtsi" +#include "omap34xx.dtsi" + +/* Secure omaps have some devices inaccessible depending on the firmwa= re */ +&aes { + status =3D "disabled"; +}; + +&sham { + status =3D "disabled"; +}; =20 / { cpus { --=20 1.7.9.5