From patchwork Tue Dec 2 17:39:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 5422041 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 4BB559F30B for ; Tue, 2 Dec 2014 17:40:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64891202F8 for ; Tue, 2 Dec 2014 17:40:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D283620303 for ; Tue, 2 Dec 2014 17:40:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754430AbaLBRk1 (ORCPT ); Tue, 2 Dec 2014 12:40:27 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:63280 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754386AbaLBRk0 (ORCPT ); Tue, 2 Dec 2014 12:40:26 -0500 Received: by mail-pd0-f172.google.com with SMTP id y13so13718141pdi.3 for ; Tue, 02 Dec 2014 09:40:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S/BBo/7jcW6IIl7X15EVeKcX0dhvnTmpgrxJ3ZVmemg=; b=PcwyDZblUrRV1Jobw6QqtaenC5VIYLWsvqePTAPdqYNdBFTdfiALqEUxDQ1345eFw1 8bhALs+RqXZEtKFCpTA9/NyJxxMLaxtcskPFGh5LU7cyDG2OlqGeYFqn2UiadhHlDktO S9ZgB5b+u7AoiFOrYUyfiGQ050DJ1OBVmEw2MSUUxmi/Zp3GbCM7okdLD4yzcv0vb8Ty Zyb9/S/gW2AsvFRHEbiL2ImHw3R81OQNyhbUi7xfLJXWKvlP996hcnoe/B8vKQ5V4Wgi JVZJZTYcJYbUiqqCXJF0+7/gR7COiRfX2IFDoHZAePt9y1m2WGeys4XygKWmBW4BBzNa +6IQ== X-Gm-Message-State: ALoCoQmD9VCjnLktG1a/aNWFdoQdsFG292vnK2LAkY6bbEzlsjHIaZrDrMo9aUZ/y0z69eI/UG8V X-Received: by 10.66.66.102 with SMTP id e6mr1002632pat.6.1417542025614; Tue, 02 Dec 2014 09:40:25 -0800 (PST) Received: from ubuntu.localdomain (proxy6-global253.qualcomm.com. [199.106.103.253]) by mx.google.com with ESMTPSA id q3sm20928900pdn.23.2014.12.02.09.40.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Dec 2014 09:40:24 -0800 (PST) From: Lina Iyer To: daniel.lezcano@linaro.org, khilman@linaro.org, sboyd@codeaurora.org, galak@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: lorenzo.pieralisi@arm.com, msivasub@codeaurora.org, devicetree@vger.kernel.org, Lina Iyer Subject: [PATCH v14 01/10] qcom: scm: Move scm-boot files to drivers/soc/qcom/ and include/soc/qcom Date: Tue, 2 Dec 2014 10:39:09 -0700 Message-Id: <1417541958-56907-2-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417541958-56907-1-git-send-email-lina.iyer@linaro.org> References: <1417541958-56907-1-git-send-email-lina.iyer@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Follow the scm.c and move scm-boot files to drivers/soc/qcom. The guidance is to clean files out from mach-qcom and move to drivers/soc area. Signed-off-by: Lina Iyer Reviewed-by: Stephen Boyd --- arch/arm/mach-qcom/Makefile | 1 - arch/arm/mach-qcom/platsmp.c | 2 +- drivers/soc/qcom/Makefile | 2 +- {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c | 4 ++-- {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h | 0 5 files changed, 4 insertions(+), 5 deletions(-) rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c (97%) rename {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h (100%) diff --git a/arch/arm/mach-qcom/scm-boot.h b/include/soc/qcom/scm-boot.h similarity index 100% rename from arch/arm/mach-qcom/scm-boot.h rename to include/soc/qcom/scm-boot.h diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile index db41e8c..e324375 100644 --- a/arch/arm/mach-qcom/Makefile +++ b/arch/arm/mach-qcom/Makefile @@ -1,3 +1,2 @@ obj-y := board.o obj-$(CONFIG_SMP) += platsmp.o -obj-$(CONFIG_QCOM_SCM) += scm-boot.o diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c index d690856..a692bcb 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -20,7 +20,7 @@ #include -#include "scm-boot.h" +#include #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x35a0 #define SCSS_CPU1CORE_RESET 0x2d80 diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index a39446d..70d52ed 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) -obj-$(CONFIG_QCOM_SCM) += scm.o +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o diff --git a/arch/arm/mach-qcom/scm-boot.c b/drivers/soc/qcom/scm-boot.c similarity index 97% rename from arch/arm/mach-qcom/scm-boot.c rename to drivers/soc/qcom/scm-boot.c index 5add20e..60ff7b4 100644 --- a/arch/arm/mach-qcom/scm-boot.c +++ b/drivers/soc/qcom/scm-boot.c @@ -17,9 +17,9 @@ #include #include -#include -#include "scm-boot.h" +#include +#include /* * Set the cold/warm boot address for one of the CPU cores.