From patchwork Mon Jul 28 13:45:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 34372 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0EA3220AE8 for ; Mon, 28 Jul 2014 13:49:10 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id ft15sf48706213pdb.10 for ; Mon, 28 Jul 2014 06:49:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=GM4mH3MS1GNoe8tlxJH/GAgueU2CxgnfzUnmGlkfQAo=; b=KkWT1oaDTp/Bfaox1yu/0LAqwgbSJN87E8UGfn9vcbeQIR0TsqXqXy/vlsNYuEClVi dUBEj9+jCCR7qQiNRdVf20SvPUiowZZrTNF5mK2ASsSG8ktwvPdr6/27PaqDIS0NtVTx glii0EsN7Gsd2t3VspVa1hLZ4hb1CJ2elGW/pXNTC4+JpN5k4jIej5IiRCNVP3Y2dTwe pikHwgAXMrkN+dRqIB03/O/1z/KvQ2duh6wUniUxayXYmMC3gxQTX/HBtQPxO0HAQMFb Ve6POILdHfkkI4ve75ztmJSqZCpa8o+ktz/OQfcgEB9YbQ0SOzD5rEZeaghXsPYpifmL XHig== X-Gm-Message-State: ALoCoQlxkkuS9lj0pITTZiSzdLhFeI4JW1bRrfsECGWQ0EpEFIlfrnEfU7/Y8Gd/GtoA+NKKHmR4 X-Received: by 10.68.241.39 with SMTP id wf7mr16529267pbc.0.1406555350371; Mon, 28 Jul 2014 06:49:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.233 with SMTP id j96ls2150279qgd.80.gmail; Mon, 28 Jul 2014 06:49:10 -0700 (PDT) X-Received: by 10.221.42.135 with SMTP id ty7mr8462340vcb.14.1406555350159; Mon, 28 Jul 2014 06:49:10 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id xt7si12417607veb.104.2014.07.28.06.49.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 06:49:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ij19so11103066vcb.39 for ; Mon, 28 Jul 2014 06:49:10 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr432879vca.45.1406555350072; Mon, 28 Jul 2014 06:49:10 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp168028vcb; Mon, 28 Jul 2014 06:49:09 -0700 (PDT) X-Received: by 10.66.139.232 with SMTP id rb8mr3932430pab.130.1406555348920; Mon, 28 Jul 2014 06:49:08 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ae1si17841407pbd.228.2014.07.28.06.49.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jul 2014 06:49:08 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1XBlHQ-0004PP-PN; Mon, 28 Jul 2014 13:47:56 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBlHL-0004FL-UU for linux-arm-kernel@lists.infradead.org; Mon, 28 Jul 2014 13:47:54 +0000 Received: by mail-pa0-f49.google.com with SMTP id hz1so10525363pad.36 for ; Mon, 28 Jul 2014 06:47:30 -0700 (PDT) X-Received: by 10.70.101.163 with SMTP id fh3mr38577288pdb.57.1406555250769; Mon, 28 Jul 2014 06:47:30 -0700 (PDT) Received: from localhost.localdomain ([98.126.25.139]) by mx.google.com with ESMTPSA id v5sm24396771pdc.7.2014.07.28.06.47.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jul 2014 06:47:29 -0700 (PDT) From: Haojian Zhuang To: arnd@arndb.de, xuwei5@hisilicon.com, olof@lixom.net, linux-arm-kernel@lists.infradead.org, khilman@linaro.org, arm@kernel.org, yanhaifeng@hisilicon.com, liguozhu@hisilicon.com Subject: [PATCH v6 8/8] ARM: hisi: remove smp from machine descriptor Date: Mon, 28 Jul 2014 21:45:19 +0800 Message-Id: <1406555119-9711-1-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406551883-26154-9-git-send-email-haojian.zhuang@linaro.org> References: <1406551883-26154-9-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140728_064751_996670_19C8CD8D X-CRM114-Status: GOOD ( 11.36 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.220.49 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Haojian Zhuang 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: haojian.zhuang@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) 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 Use CPU_METHOD_OF_DECLARE() instead. And declare smp method in dts file. Changelog: v6: * Use hisilicon,hi3620-smp as enable-method property in Hi3620 dts. Signed-off-by: Haojian Zhuang --- arch/arm/boot/dts/hi3620.dtsi | 1 + arch/arm/boot/dts/hix5hd2-dkb.dts | 1 + arch/arm/mach-hisi/hisilicon.c | 4 ---- arch/arm/mach-hisi/platsmp.c | 3 +++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi index ab1116d..a7b0d3d 100644 --- a/arch/arm/boot/dts/hi3620.dtsi +++ b/arch/arm/boot/dts/hi3620.dtsi @@ -33,6 +33,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "hisilicon,hi3620-smp"; cpu@0 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/hix5hd2-dkb.dts b/arch/arm/boot/dts/hix5hd2-dkb.dts index 32c7fd1..556c98a 100644 --- a/arch/arm/boot/dts/hix5hd2-dkb.dts +++ b/arch/arm/boot/dts/hix5hd2-dkb.dts @@ -21,6 +21,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "hisilicon,hix5hd2-smp"; cpu@0 { compatible = "arm,cortex-a9"; diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c index 5c295ee..f37fb65 100644 --- a/arch/arm/mach-hisi/hisilicon.c +++ b/arch/arm/mach-hisi/hisilicon.c @@ -18,8 +18,6 @@ #include #include -#include "core.h" - #define HI3620_SYSCTRL_PHYS_BASE 0xfc802000 #define HI3620_SYSCTRL_VIRT_BASE 0xfe802000 @@ -57,7 +55,6 @@ DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)") .dt_compat = hi3xxx_compat, .l2c_aux_val = 0x0, .l2c_aux_mask = 0xffffffff, - .smp = smp_ops(hi3xxx_smp_ops), MACHINE_END static const char *hix5hd2_compat[] __initconst = { @@ -67,5 +64,4 @@ static const char *hix5hd2_compat[] __initconst = { DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)") .dt_compat = hix5hd2_compat, - .smp = smp_ops(hix5hd2_smp_ops), MACHINE_END diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c index ecf7058..575dd82 100644 --- a/arch/arm/mach-hisi/platsmp.c +++ b/arch/arm/mach-hisi/platsmp.c @@ -131,3 +131,6 @@ struct smp_operations hix5hd2_smp_ops __initdata = { .cpu_die = hix5hd2_cpu_die, #endif }; + +CPU_METHOD_OF_DECLARE(hi3xxx_smp, "hisilicon,hi3620-smp", &hi3xxx_smp_ops); +CPU_METHOD_OF_DECLARE(hix5hd2_smp, "hisilicon,hix5hd2-smp", &hix5hd2_smp_ops);