From patchwork Fri Aug 31 09:27:03 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 1392171
Return-Path:
X-Original-To: patchwork-linux-arm@patchwork.kernel.org
Delivered-To: patchwork-process-083081@patchwork2.kernel.org
Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134])
by patchwork2.kernel.org (Postfix) with ESMTP id 4CA5FDF215
for ;
Fri, 31 Aug 2012 09:34:28 +0000 (UTC)
Received: from localhost ([::1] helo=merlin.infradead.org)
by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux))
id 1T7NXA-0008ED-EK; Fri, 31 Aug 2012 09:29:01 +0000
Received: from metis.ext.pengutronix.de
([2001:6f8:1178:4:290:27ff:fe1d:cc33])
by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux))
id 1T7NVS-0007An-TB for linux-arm-kernel@lists.infradead.org;
Fri, 31 Aug 2012 09:27:18 +0000
Received: from dude.hi.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de)
by metis.ext.pengutronix.de with esmtp (Exim 4.72)
(envelope-from )
id 1T7NVO-0000Gh-8G; Fri, 31 Aug 2012 11:27:10 +0200
From: Philipp Zabel
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Grant Likely ,
Rob Herring ,
Paul Gortmaker ,
Shawn Guo ,
Richard Zhao ,
Huang Shijie ,
Dong Aisheng ,
kernel@pengutronix.de, devicetree-discuss@lists.ozlabs.org
Subject: [PATCH v2 8/9] ARM: i.MX6: use generic on-chip SRAM allocator driver
for OCRAM
Date: Fri, 31 Aug 2012 11:27:03 +0200
Message-Id: <1346405224-20399-9-git-send-email-p.zabel@pengutronix.de>
X-Mailer: git-send-email 1.7.10.4
In-Reply-To: <1346405224-20399-1-git-send-email-p.zabel@pengutronix.de>
References: <1346405224-20399-1-git-send-email-p.zabel@pengutronix.de>
X-SA-Exim-Connect-IP: 10.1.0.7
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org
X-Spam-Note: CRM114 invocation failed
X-Spam-Score: -2.1 (--)
X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary:
Content analysis details: (-2.1 points)
pts rule name description
---- ----------------------
--------------------------------------------------
0.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list
-0.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay
domain
-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
[score: 0.0000]
Cc: Philipp Zabel
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id:
List-Unsubscribe:
,
List-Archive:
List-Post:
List-Help:
List-Subscribe:
,
MIME-Version: 1.0
Sender: linux-arm-kernel-bounces@lists.infradead.org
Errors-To:
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
Signed-off-by: Philipp Zabel
---
arch/arm/boot/dts/imx6q.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 9cb0b50..1e463c4 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -111,8 +111,8 @@
status = "disabled";
};
- ocram@00900000 {
- compatible = "fsl,imx-ocram";
+ ocram: ocram@00900000 {
+ compatible = "fsl,imx-ocram", "sram";
reg = <0x00900000 0x3f000>;
};