| Message ID | 1392900008-8331-1-git-send-email-m.szyprowski@samsung.com |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBDG6PF6SSYDRBUPPS6MAKGQEDKPXDAI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE992203BE for <linaro@patches.linaro.org>; Thu, 20 Feb 2014 12:40:49 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id c9sf3016294qcz.3 for <linaro@patches.linaro.org>; Thu, 20 Feb 2014 04:40:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=c6d+vzXigoE1xcuWjXD0Cu/fP86bO7aQIQrx0d7zoc4=; b=kL79SC5PjtsJNLIy6mF40jRskSbwhvtOoX7hgfYnPOCEzrrip0zGcq5dQHHgaFniAj gdKtcYIDHD1XahxB8bDZus91k8YtJl19cd9Twu/ezwqaDs7/nF8eoxdRK3VXZbSlStle kmOFLEn5aYBDbI2D31sUmvHuwRfYRet67Fy1bpNPhtFVkn31iToAPG+S1iKxA5OXz5Bu mLTT/1v78GfbOfu4yUBjI+N1pRdUT96j9B8Aeylv/kgaZfzG1StS5EI3F+t3mZ/nfBz+ 4r4kXkEh6MluofNrUeJS//pxLCURcHeoLE73PmA2FKiwx7FhI0OONjiCnubf87DT/1Q9 HnXw== X-Gm-Message-State: ALoCoQlt+3Jh2ueZFMcAHI+lNMr4SVKcMWFqBDU222R/uibYW5uXZ5Nz5yfi7y5KD0bVEFzCMgfI X-Received: by 10.52.121.68 with SMTP id li4mr571879vdb.6.1392900049410; Thu, 20 Feb 2014 04:40:49 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.43.201 with SMTP id e67ls486171qga.32.gmail; Thu, 20 Feb 2014 04:40:49 -0800 (PST) X-Received: by 10.220.200.6 with SMTP id eu6mr840797vcb.35.1392900049311; Thu, 20 Feb 2014 04:40:49 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id e10si1404457vcq.77.2014.02.20.04.40.49 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 04:40:49 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hq11so1818465vcb.28 for <patchwork-forward@linaro.org>; Thu, 20 Feb 2014 04:40:49 -0800 (PST) X-Received: by 10.52.61.168 with SMTP id q8mr745878vdr.40.1392900048974; Thu, 20 Feb 2014 04:40:48 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp55678vcz; Thu, 20 Feb 2014 04:40:48 -0800 (PST) X-Received: by 10.66.149.7 with SMTP id tw7mr1852442pab.72.1392900048111; Thu, 20 Feb 2014 04:40:48 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uc9si3523603pac.326.2014.02.20.04.40.47; Thu, 20 Feb 2014 04:40:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753229AbaBTMkq (ORCPT <rfc822;patch@linaro.org> + 9 others); Thu, 20 Feb 2014 07:40:46 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:15351 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753063AbaBTMkp (ORCPT <rfc822; devicetree@vger.kernel.org>); Thu, 20 Feb 2014 07:40:45 -0500 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>; Thu, 20 Feb 2014 12:40:44 +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 <m.szyprowski@samsung.com> 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 Cc: Marek Szyprowski <m.szyprowski@samsung.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Arnd Bergmann <arnd@arndb.de>, Michal Nazarewicz <mina86@mina86.com>, Grant Likely <grant.likely@linaro.org>, Tomasz Figa <t.figa@samsung.com>, Sascha Hauer <s.hauer@pengutronix.de>, Laura Abbott <lauraa@codeaurora.org>, Rob Herring <robh+dt@kernel.org>, Olof Johansson <olof@lixom.net>, Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>, Stephen Warren <swarren@wwwdotorg.org>, Ian Campbell <ian.campbell@citrix.com>, Tomasz Figa <tomasz.figa@gmail.com>, Kumar Gala <galak@codeaurora.org>, Nishanth Peethambaran <nishanth.p@gmail.com>, Marc <marc.ceeeee@gmail.com>, Josh Cartwright <joshc@codeaurora.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Paul Mackerras <paulus@samba.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= Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m.szyprowski@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
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; }
Rename 'align' property to 'alignment' to match documentation. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/of/of_reserved_mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)