From patchwork Wed Jan 22 18:58:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Cartwright X-Patchwork-Id: 3524561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CFC58C02DC for ; Wed, 22 Jan 2014 19:03:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3CA720172 for ; Wed, 22 Jan 2014 19:03:03 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D139420154 for ; Wed, 22 Jan 2014 19:03:02 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W634P-0006tm-BX; Wed, 22 Jan 2014 19:02:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W634J-000068-G9; Wed, 22 Jan 2014 19:02:31 +0000 Received: from smtp.codeaurora.org ([198.145.11.231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6344-0008Ua-02 for linux-arm-kernel@lists.infradead.org; Wed, 22 Jan 2014 19:02:17 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 0DA9F13F13D; Wed, 22 Jan 2014 19:01:55 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 0092E13F25A; Wed, 22 Jan 2014 19:01:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from joshc.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com [67.52.129.61]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: joshc@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C34C213F13D; Wed, 22 Jan 2014 19:01:53 +0000 (UTC) Received: by joshc.qualcomm.com (Postfix, from userid 1000) id A9D4461401; Wed, 22 Jan 2014 12:58:54 -0600 (CST) From: Josh Cartwright To: Russell King , linux-kernel@vger.kernel.org Subject: [PATCH RFC 3/4] ARM: init: add support for reserved memory defined by device tree Date: Wed, 22 Jan 2014 12:58:51 -0600 Message-Id: <1390417133-6650-4-git-send-email-joshc@codeaurora.org> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1390417133-6650-1-git-send-email-joshc@codeaurora.org> References: <1390417133-6650-1-git-send-email-joshc@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140122_140216_116056_742E63B8 X-CRM114-Status: GOOD ( 14.52 ) X-Spam-Score: -2.5 (--) Cc: Benjamin Herrenschmidt , Laura Abbott , linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marek Szyprowski Enable reserved memory initialization from device tree. Cc: Benjamin Herrenschmidt Cc: Laura Abbott Signed-off-by: Marek Szyprowski --- arch/arm/mm/init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 403ba90..5efe0b4 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -323,6 +324,8 @@ void __init arm_memblock_init(struct meminfo *mi, if (mdesc->reserve) mdesc->reserve(); + early_init_dt_scan_reserved_mem(); + /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory