From patchwork Thu Nov 27 00:13:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 41575 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A61D825E74 for ; Thu, 27 Nov 2014 00:13:39 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id ex7sf2558000wid.3 for ; Wed, 26 Nov 2014 16:13:39 -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=ajpw4RPAtg/dpl6153ZYUZZsSimQ2tRlCdmJ9HTvPXY=; b=G3B9my01BIc3YWRrzhFoFfb26F5Rt18yk6RaeXqgynGRlmzVvRsiEzasm0hxTpieaa TzLSun1092CyDlu8KD2q9yNYs3ToJUsBbOffJ1QHfIBqUl3FMlLwicFfUEtcFw3acgbJ m+ZaDEOFkx01OAxMBXIFKFgQFw3sF4Z+1xiD9HrXJNKCt+/3dAuUCRJq0YGmopUwBAVq J/PKspim2QKHQ84VzOveEhmcYYdcXrSiZHHoNNWStQLhIv1Qj8m5XcOtc9VPcpL1r7oO 6reqWB15OsNksqTIanVIvmyNywg55r2ymCND3pJo9OsknYBnApuCYjRG/e/R6EIt6nsq uzIg== X-Gm-Message-State: ALoCoQkPOvMX7vvh0fTCHtCVHYfpXaHlJU6Ze1hHWutLz2XMdsjonZNOYb4C+VlCDcfIJG2ksIfR X-Received: by 10.112.169.101 with SMTP id ad5mr2190035lbc.1.1417047218979; Wed, 26 Nov 2014 16:13:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.100 with SMTP id 4ls546559lal.89.gmail; Wed, 26 Nov 2014 16:13:38 -0800 (PST) X-Received: by 10.152.8.170 with SMTP id s10mr36325435laa.56.1417047218830; Wed, 26 Nov 2014 16:13:38 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id ky4si5783220lbc.28.2014.11.26.16.13.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Nov 2014 16:13:38 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so3282072lbv.21 for ; Wed, 26 Nov 2014 16:13:38 -0800 (PST) X-Received: by 10.152.43.103 with SMTP id v7mr12967213lal.29.1417047218699; Wed, 26 Nov 2014 16:13:38 -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.112.184.201 with SMTP id ew9csp722179lbc; Wed, 26 Nov 2014 16:13:38 -0800 (PST) X-Received: by 10.70.54.161 with SMTP id k1mr50755740pdp.110.1417047215490; Wed, 26 Nov 2014 16:13:35 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rb4si9151119pab.48.2014.11.26.16.13.34 for ; Wed, 26 Nov 2014 16:13:35 -0800 (PST) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752825AbaK0ANd (ORCPT + 4 others); Wed, 26 Nov 2014 19:13:33 -0500 Received: from mail-pd0-f173.google.com ([209.85.192.173]:52959 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751570AbaK0ANc (ORCPT ); Wed, 26 Nov 2014 19:13:32 -0500 Received: by mail-pd0-f173.google.com with SMTP id ft15so3767927pdb.4 for ; Wed, 26 Nov 2014 16:13:32 -0800 (PST) X-Received: by 10.70.38.71 with SMTP id e7mr30078436pdk.130.1417047211980; Wed, 26 Nov 2014 16:13:31 -0800 (PST) Received: from ubuntu.localdomain (proxy6-global253.qualcomm.com. [199.106.103.253]) by mx.google.com with ESMTPSA id yb8sm5403070pab.7.2014.11.26.16.13.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 16:13:31 -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 v12 01/10] qcom: scm: Move scm-boot files to drivers/soc/qcom/ and include/soc/qcom Date: Wed, 26 Nov 2014 17:13:06 -0700 Message-Id: <1417047195-18978-2-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417047195-18978-1-git-send-email-lina.iyer@linaro.org> References: <1417047195-18978-1-git-send-email-lina.iyer@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lina.iyer@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.217.176 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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.