From patchwork Fri Nov 21 18:03:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 41341 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 11A0F23C27 for ; Fri, 21 Nov 2014 18:04:25 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf3287128wgg.11 for ; Fri, 21 Nov 2014 10:04:18 -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=Ub2GNBCYnQU0HEoATdz22qPquiqIFu8Q/0pvrjpzles=; b=WyTu6cAdtlOgdsVHDg7alMi5fB7qRjWj2TWNxZPTQh/CSqG1pmbgxbKNEIBNh/y3v1 nL8wjm6Chh3YAvgVkYFsBvPyX3NSOZMBC7AwNnc1T3zhX4mSVeLrATBkQluTUCX5yLP0 F1oFlYvDGYffwU2ESiYdW1kOqXKPNlyCPAzurQbPbQQTspi+di+YNRV+8Aw5VITH91uB GXMS0ruZOVHVfVpc9GiaDFRM0fgw1LOA8Cey2lVnAcnDYuQB7b3gjTKVr6T2kO3UVi3T E4uPYw2RsINcqD46vl0Y9cDoSVBGA88KjUvwCb7Uvz6IDkmsufpTBEFmpb6JxQ0v5Wv+ A1Vg== X-Gm-Message-State: ALoCoQk1WJSmQIX8SZKONdfW8SmB1oO3r9SjPO4cIn4BjR2jQy1dcpbV99mLcwzFqyxWWbX3GIF3 X-Received: by 10.152.6.133 with SMTP id b5mr1014437laa.10.1416593056537; Fri, 21 Nov 2014 10:04:16 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.170 with SMTP id l10ls193525lah.18.gmail; Fri, 21 Nov 2014 10:04:16 -0800 (PST) X-Received: by 10.152.29.41 with SMTP id g9mr6817664lah.83.1416593055982; Fri, 21 Nov 2014 10:04:15 -0800 (PST) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id n9si6756198lbc.57.2014.11.21.10.04.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 10:04:13 -0800 (PST) Received-SPF: temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id gf13so4685844lab.14 for ; Fri, 21 Nov 2014 10:04:12 -0800 (PST) X-Received: by 10.112.189.10 with SMTP id ge10mr6706318lbc.23.1416593052931; Fri, 21 Nov 2014 10:04:12 -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 ew9csp138519lbc; Fri, 21 Nov 2014 10:04:11 -0800 (PST) X-Received: by 10.68.131.3 with SMTP id oi3mr9419623pbb.27.1416593050632; Fri, 21 Nov 2014 10:04:10 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xj9si10077613pab.73.2014.11.21.10.04.09 for ; Fri, 21 Nov 2014 10:04:10 -0800 (PST) Received-SPF: none (google.com: linux-pm-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 S1750954AbaKUSEI (ORCPT + 12 others); Fri, 21 Nov 2014 13:04:08 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:61503 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750786AbaKUSEG (ORCPT ); Fri, 21 Nov 2014 13:04:06 -0500 Received: by mail-pa0-f43.google.com with SMTP id kx10so5337287pab.16 for ; Fri, 21 Nov 2014 10:04:06 -0800 (PST) X-Received: by 10.70.126.134 with SMTP id my6mr9915190pdb.14.1416593046032; Fri, 21 Nov 2014 10:04:06 -0800 (PST) Received: from ubuntu.localdomain (pat_11.qualcomm.com. [192.35.156.11]) by mx.google.com with ESMTPSA id qh4sm5411466pbb.35.2014.11.21.10.04.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Nov 2014 10:04:05 -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 v10 01/10] qom: scm: Move scm-boot files to drivers/soc/qcom/ and include/soc/qcom Date: Fri, 21 Nov 2014 11:03:48 -0700 Message-Id: <1416593037-27527-2-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1416593037-27527-1-git-send-email-lina.iyer@linaro.org> References: <1416593037-27527-1-git-send-email-lina.iyer@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@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=temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) 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 --- 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.