From patchwork Thu Feb 26 13:49:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 5892861 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6E9889F373 for ; Thu, 26 Feb 2015 13:53:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7838203A5 for ; Thu, 26 Feb 2015 13:53:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5301D203A1 for ; Thu, 26 Feb 2015 13:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932487AbbBZNvY (ORCPT ); Thu, 26 Feb 2015 08:51:24 -0500 Received: from mail-wg0-f51.google.com ([74.125.82.51]:42124 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932434AbbBZNuw (ORCPT ); Thu, 26 Feb 2015 08:50:52 -0500 Received: by wghl2 with SMTP id l2so10924448wgh.9; Thu, 26 Feb 2015 05:50:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=8mViwSY7ysmiSaSwGcCcIQzOjx1Z1vmXZ37kiFlGe9I=; b=rw+xNUn0eG8YsEjv3lWpi0/iuBaADYyCZJQj2FOqOl5NET4PaPpCMKagLHOI8MZIt/ orTnbFRIJ68UF/RcEvbm/ez4fMX6ZuxyY3PQFGxEfvsuU8mCMNm8tpOpikhiRw5ooAQX t7rlkvMuLkUM+iyNl7q54H3h/V2GER21cHJENB0Yj/MIoDH4+7nmR9XrS7fh0qcPVNai nEKPK8eOfU12NpxtOeMXxnYoLl/gkjz0gWPftnrV8seSG+hkm+4ES75Zi/1czbBsgKLe HwA3ZsDHSe0m9qOmizrK8Cthe/n4q5oLu1QzFYUti6AjC6rEjBv2nV+93doFCmEH3uPr IEEQ== X-Received: by 10.194.122.232 with SMTP id lv8mr543978wjb.146.1424958651139; Thu, 26 Feb 2015 05:50:51 -0800 (PST) Received: from Pali-Latitude.kolej.mff.cuni.cz (pali.kolej.mff.cuni.cz. [78.128.193.202]) by mx.google.com with ESMTPSA id k6sm29959364wia.6.2015.02.26.05.50.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Feb 2015 05:50:49 -0800 (PST) From: =?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" 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?= 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> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1424958600-18881-1-git-send-email-pali.rohar@gmail.com> References: <1424958600-18881-1-git-send-email-pali.rohar@gmail.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Pavel Machek --- 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/omap3-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/; -#include "omap34xx-hs.dtsi" +#include "omap34xx.dtsi" + +/* Secure omaps have some devices inaccessible depending on the firmware */ +&aes { + status = "disabled"; +}; + +&sham { + status = "disabled"; +}; / { cpus {