From patchwork Tue Dec 27 01:33:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Chen X-Patchwork-Id: 133292 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7EF41B6FDB for ; Tue, 27 Dec 2011 12:36:59 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RfLvm-0008Us-Ng; Tue, 27 Dec 2011 01:34:18 +0000 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14] helo=TX2EHSOBE009.bigfish.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RfLvj-0008US-KX for linux-arm-kernel@lists.infradead.org; Tue, 27 Dec 2011 01:34:16 +0000 Received: from mail118-tx2-R.bigfish.com (10.9.14.235) by TX2EHSOBE009.bigfish.com (10.9.40.29) with Microsoft SMTP Server id 14.1.225.23; Tue, 27 Dec 2011 01:33:54 +0000 Received: from mail118-tx2 (localhost [127.0.0.1]) by mail118-tx2-R.bigfish.com (Postfix) with ESMTP id B70ED5401D7; Tue, 27 Dec 2011 01:33:58 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-SS: 0, X-FB-DOMAIN-IP-MATCH: fail Received: from mail118-tx2 (localhost.localdomain [127.0.0.1]) by mail118-tx2 (MessageSwitch) id 1324949601942267_28455; Tue, 27 Dec 2011 01:33:21 +0000 (UTC) Received: from TX2EHSMHS015.bigfish.com (unknown [10.9.14.252]) by mail118-tx2.bigfish.com (Postfix) with ESMTP id 656FB30004E; Tue, 27 Dec 2011 01:33:19 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS015.bigfish.com (10.9.99.115) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 27 Dec 2011 01:33:10 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.355.3; Mon, 26 Dec 2011 19:33:22 -0600 Received: from weitway.ap.freescale.net (weitway.ap.freescale.net [10.192.242.173]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id pBR1XIdB008644; Mon, 26 Dec 2011 19:33:19 -0600 (CST) From: Jason Chen To: Subject: [PATCH 1/2] ARM: imx: add dt support of IRAM Date: Tue, 27 Dec 2011 09:33:16 +0800 Message-ID: <1324949596-27214-1-git-send-email-jason.chen@linaro.org> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [65.55.88.14 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: s.hauer@pengutronix.de, shawn.guo@linaro.org, eric.miao@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Signed-off-by: Jason Chen Signed-off-by: Eric Miao --- arch/arm/plat-mxc/include/mach/iram.h | 6 ++++++ arch/arm/plat-mxc/iram_alloc.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-mxc/include/mach/iram.h b/arch/arm/plat-mxc/include/mach/iram.h index 022690c..f8372cf 100644 --- a/arch/arm/plat-mxc/include/mach/iram.h +++ b/arch/arm/plat-mxc/include/mach/iram.h @@ -21,6 +21,7 @@ #ifdef CONFIG_IRAM_ALLOC int __init iram_init(unsigned long base, unsigned long size); +int __init of_iram_init(void); void __iomem *iram_alloc(unsigned int size, unsigned long *dma_addr); void iram_free(unsigned long dma_addr, unsigned int size); @@ -31,6 +32,11 @@ static inline int __init iram_init(unsigned long base, unsigned long size) return -ENOMEM; } +static inline int __init of_iram_init(void) +{ + return -EINVAL; +} + static inline void __iomem *iram_alloc(unsigned int size, unsigned long *dma_addr) { return NULL; diff --git a/arch/arm/plat-mxc/iram_alloc.c b/arch/arm/plat-mxc/iram_alloc.c index 074c386..f73ca9d 100644 --- a/arch/arm/plat-mxc/iram_alloc.c +++ b/arch/arm/plat-mxc/iram_alloc.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include static unsigned long iram_phys_base; @@ -71,3 +73,17 @@ int __init iram_init(unsigned long base, unsigned long size) pr_debug("i.MX IRAM pool: %ld KB@0x%p\n", size / 1024, iram_virt_base); return 0; } + +int __init of_iram_init(void) +{ + struct device_node *np; + struct resource res; + + np = of_find_compatible_node(NULL, NULL, "fsl,imx-iram"); + if (of_address_to_resource(np, 0, &res)) + return -EINVAL; + if (res.start && (res.end > res.start)) + return iram_init(res.start, res.end - res.start + 1); + else + return -EINVAL; +}