From patchwork Mon Jul 7 01:53:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanwoo Choi X-Patchwork-Id: 4491921 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 5CECDBEEAA for ; Mon, 7 Jul 2014 01:56:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99C3620222 for ; Mon, 7 Jul 2014 01:56:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 C31E920220 for ; Mon, 7 Jul 2014 01:56:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X3y7r-0000xB-5v; Mon, 07 Jul 2014 01:53:51 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X3y7o-0000uZ-UB for linux-arm-kernel@lists.infradead.org; Mon, 07 Jul 2014 01:53:49 +0000 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8B001H1JWPEDA0@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 07 Jul 2014 10:53:13 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.112]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id E4.4D.16580.98DF9B35; Mon, 07 Jul 2014 10:53:13 +0900 (KST) X-AuditID: cbfee691-b7f2f6d0000040c4-a6-53b9fd895028 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id C0.87.05196.98DF9B35; Mon, 07 Jul 2014 10:53:13 +0900 (KST) Received: from chan.10.32.193.11 ([10.252.81.195]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N8B00GORJWO71B0@mmp2.samsung.com>; Mon, 07 Jul 2014 10:53:13 +0900 (KST) From: Chanwoo Choi To: linux@arm.linux.org.uk Subject: [PATCH] ARM: Use 'model' property to set machine_name from Device Tree Date: Mon, 07 Jul 2014 10:53:11 +0900 Message-id: <1404697991-32191-1-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEIsWRmVeSWpSXmKPExsWyRsSkQLfz785gg87FhhZz1q9hs/j/YTej xftlPYwW1788Z7W4//gWk8XZpjfsFpseX2O1uLxrDpvF7cu8Fqeuf2azeN23htlixuSXbBYv P55gceD1WDNvDaNHS3MPm8eda3vYPE7M+M3isXlJvceVE02sHit/XGL36NuyitHj+I3tTB6f N8kFcEVx2aSk5mSWpRbp2yVwZZw88pqpYAlbxe23fewNjAtYuxg5OSQETCR6+i+wQdhiEhfu rQeyuTiEBJYySnzbtIu5i5EDrGjbdkuQGiGB6YwSrUvNIWqamCTOP77OCJJgE9CS2P/iBtgg EQEpiRk7l7KDFDELnGSSaPjSyAySEBbwl3jffAmsgUVAVaL52mQWEJtXwFVi2Z0eJogr5CQ+ 7HnEDmFfYpdYfUoTol5A4tvkQywQB8lKbDrADFEiKXFwxQ2WCYyCCxgZVjGKphYkFxQnpReZ 6hUn5haX5qXrJefnbmIExsfpf88m7mC8f8D6EGMy0LiJzFKiyfnA+MoriTc0NjOyMDUxNTYy tzQjTVhJnDf9UVKQkEB6YklqdmpqQWpRfFFpTmrxIUYmDk6pBsa8f4fP7Mu5EngoWeCD0q7C OU/YTBNLpPkf7uy5+qasXPb86Ym2Ok3ilz2+JWsZ/6jPmJtrUWd8QUIhNXCTfF5jhKDbnr/W Z4x2Lt3gOtF7steJ/9dmNJ3baTh5/qy/a9e8rOl8u/lY5KtF/M8W7P3B96+uK+Dl58gtMu/P Ptz1JMzy0f/4RcL2SizFGYmGWsxFxYkAjf9psKUCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsVy+t9jQd3OvzuDDTYf0bSYs34Nm8X/D7sZ Ld4v62G0uP7lOavF/ce3mCzONr1ht9j0+BqrxeVdc9gsbl/mtTh1/TObxeu+NcwWMya/ZLN4 +fEEiwOvx5p5axg9Wpp72DzuXNvD5nFixm8Wj81L6j2unGhi9Vj54xK7R9+WVYwex29sZ/L4 vEkugCuqgdEmIzUxJbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJxSdA1y0z B+h4JYWyxJxSoFBAYnGxkr4dpgmhIW66FjCNEbq+IUFwPUYGaCBhDWPGySOvmQqWsFXcftvH 3sC4gLWLkYNDQsBEYtt2yy5GTiBTTOLCvfVsILaQwHRGidal5l2MXEB2E5PE+cfXGUESbAJa Evtf3AArEhGQkpixcyk7SBGzwEkmiYYvjcwgCWEBf4n3zZfAGlgEVCWar01mAbF5BVwllt3p YYLYJifxYc8j9gmM3AsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525iBMffM+kdjKsaLA4x CnAwKvHwHli1M1iINbGsuDL3EKMEB7OSCO8ZN6AQb0piZVVqUX58UWlOavEhRlOg7ROZpUST 84GpIa8k3tDYxMzI0sjc0MLI2FxJnPdgq3WgkEB6YklqdmpqQWoRTB8TB6dUA6OVnuuiCX8b FmUu3Vyq+7w+1tjDJ40v78dH9f8y766/4LujOVlk8eppXLJH3MqYwyvvWDvJdxdqqcxPur/q oLiS/IagkM+TPpmtC5jcE2/r3bhbXr2e9XDZx5uOkr1e59jmLLqx/tfDRw1P5iy8X2Lx/E37 gjdOruISuZpH3iS9X7nuTK9rhIYSS3FGoqEWc1FxIgDhsQ9R1QIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140706_185349_153611_DA3895D0 X-CRM114-Status: UNSURE ( 8.06 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.7 (-----) Cc: Chanwoo Choi , ard.biesheuvel@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, kyungmin.park@samsung.com, linux-kernel@vger.kernel.org, sw0312.kim@samsung.com, damm@opensource.se, santosh.shilimkar@ti.com, olof@lixom.net, akpm@linux-foundation.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This patch use 'model' property from Device Tree to set machine_name. The arm64 has already got the machine_name from Device Tree. Signed-off-by: Chanwoo Choi --- arch/arm/kernel/setup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 8a16ee5..698616f 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -878,7 +878,11 @@ void __init setup_arch(char **cmdline_p) if (!mdesc) mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type); machine_desc = mdesc; +#if CONFIG_OF + machine_name = of_flat_dt_get_machine_name(); +#else machine_name = mdesc->name; +#endif if (mdesc->reboot_mode != REBOOT_HARD) reboot_mode = mdesc->reboot_mode;