From patchwork Thu Feb 20 12:40:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 3686871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 876569F2EC for ; Thu, 20 Feb 2014 12:41:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C59D720170 for ; Thu, 20 Feb 2014 12:41:31 +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 DA85D20122 for ; Thu, 20 Feb 2014 12:41:30 +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 1WGSwF-0007DR-En; Thu, 20 Feb 2014 12:41:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGSwC-0005LZ-V1; Thu, 20 Feb 2014 12:41:12 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGSw9-0005KY-K6 for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2014 12:41:11 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N1A00DMLOJVGY20@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2014 12:40:43 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-e7-5305f7cad8c9 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 0A.72.18565.AC7F5035; Thu, 20 Feb 2014 12:40:42 +0000 (GMT) Received: from amdc1339.mshome.net ([106.116.147.30]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N1A00432OJOD080@eusync1.samsung.com>; Thu, 20 Feb 2014 12:40:42 +0000 (GMT) From: Marek Szyprowski To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-mm-sig@lists.linaro.org, devicetree@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v4 1/7 fixup] drivers: of: add initialization code for reserved memory (fixup) Date: Thu, 20 Feb 2014 13:40:08 +0100 Message-id: <1392900008-8331-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1392893567-31623-2-git-send-email-m.szyprowski@samsung.com> References: <1392893567-31623-2-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAyWRW0jTYQDF/fa/uhz8WxpfVmKLQKSWSg9fItJD0KeYCHajh9zSoYKbuqU2 H0qH16XTVuQyr+gMxrwwNS8Z6Bw6DC1THGTaRSIvywsmpW2WzrdzDr/DeTgsIdST/myq4p5M qZCmiWg++XZ3dOrc2G8qPmRn6xBy60cYtK4pJNBaSxlA9bYJClU4Gyk06OoFyFleQqK+tlWA xjVOBvWUGhj0a/orD1kWZijUWNRMoqn+Ghq12uYY1LE0xENGxyQPNYwWUMhVFYDGHJs0Mtua GFRZ1Uqiwjc2Brl7LCRaHioiUbthhUSmfhdASxt28tIJbK4zA/x3Rw/wypNKgKd05TzcVz3H 4DJnAYUtplIaf5oZoHFn80M8u7tA4Gm7hsJtrmUernCH4Np+HcC6LhPAm5aAuMO3+RFJsrTU bJnyfKSEn2J29RIZ3cz9wWexeeAprQXeLOQuwLHHbupAH4Xv59v3cj4r5IwAWkxfyAPziAeH Ol7x9imaC4Xan1pP25drBHCzzgMR3GcalkyWeaAjnAQaau0eiOTOQPvua8+EgLsCBw0OQgvY vblAWKOP2I+9uSi4WrHI7Gshh6F2sghUAkED8DIBP1lWYobqbrI8TKySylVZimRxYrrcAg5+ 3OoFxpFwK+BYIPIR3HKQ8UJKmq1Sy60AsoTIV9C1TsULBUlSda5MmZ6gzEqTqayAx3r754Hq 7dydY5ezv0eFKT78ef4uMLHc8SCIrp4NJuWwMO64xG844Vv61XHtYlAODQJy6ltj6cz8s6a+ l0RMib3l48boQnP3C2PwANhWq8MlIsu/ugm/a/O6GOn10yGdXj+abLS65I7hotiqsa6ZMyNP iqJv5g/f4KKLxafoBt9iHxGpSpGGBhNKlfQ/LRl1iqUCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140220_074109_760025_DBF1E164 X-CRM114-Status: UNSURE ( 9.23 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.5 (----) Cc: Mark Rutland , Benjamin Herrenschmidt , Tomasz Figa , Will Deacon , Tomasz Figa , Paul Mackerras , Marek Szyprowski , Arnd Bergmann , Josh Cartwright , Catalin Marinas , Grant Likely , Laura Abbott , Ian Campbell , Pawel Moll , Stephen Warren , Sascha Hauer , Michal Nazarewicz , Marc , Nishanth Peethambaran , Rob Herring , Kumar Gala , Olof Johansson 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-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 Rename 'align' property to 'alignment' to match documentation. Signed-off-by: Marek Szyprowski --- drivers/of/of_reserved_mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index cacf04810b87..49cf430a9e2a 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -112,10 +112,10 @@ __reserved_mem_alloc_size(unsigned long node, const char *uname, nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL; - prop = of_get_flat_dt_prop(node, "align", &len); + prop = of_get_flat_dt_prop(node, "alignment", &len); if (prop) { if (len != dt_root_addr_cells * sizeof(__be32)) { - pr_err("Reserved memory: invalid align property in '%s' node.\n", + pr_err("Reserved memory: invalid alignment property in '%s' node.\n", uname); return -EINVAL; }