From patchwork Tue Sep 2 19:44:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 36511 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 055C920C87 for ; Tue, 2 Sep 2014 19:45:10 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id l13sf37740224iga.10 for ; Tue, 02 Sep 2014 12:45: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:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=NiEXb0Cul+lKfw5bWoB9onO5kVb9xNqZ61oPgzv1uOg=; b=Pnn3AUbMLVG3upsB7SGeaAILeaPZfeapLhe2/4M3oiISQMDgJUieqR2jWOlcDIYWhm 37HzKWbVkwJI30N6HgO2rGbuYHstt6tty5oxsfI5qoWRHLUKoz8ojtQc7XCr/qVyD6fv HcQGnSOR0HIFe6k3fy4yTEgfLsReUBT0RthYrwgrztPQNu9C5Rsmqj1xR4+Y5fY0yta9 hR76CfW49VbJ4DSLlEsN3DJ6Wf8fU4eLKKyI9YiUKXw2C8qt0hobvDBBiUkJ/E/K2QTR uT7/qedTjROqaGfxAl8IUdBcklP+SsYgWCOvzrXl+RdsFf1Y7Vq27QP5M9Nk07fcjLjt CZ+Q== X-Gm-Message-State: ALoCoQnofHjMlRE1C9r7v/7woS/r+AQi9jycFeRGcnFaXsmBr7/Ndmv/Se9+CqwCCZ1O5iTLIXC+ X-Received: by 10.182.135.194 with SMTP id pu2mr19011006obb.35.1409687110548; Tue, 02 Sep 2014 12:45:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.21 with SMTP id h21ls2591885qge.52.gmail; Tue, 02 Sep 2014 12:45:10 -0700 (PDT) X-Received: by 10.220.167.9 with SMTP id o9mr31610304vcy.8.1409687110452; Tue, 02 Sep 2014 12:45:10 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id q3si2769544vct.6.2014.09.02.12.45.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Sep 2014 12:45:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so7641042vcb.16 for ; Tue, 02 Sep 2014 12:45:10 -0700 (PDT) X-Received: by 10.52.165.116 with SMTP id yx20mr26587076vdb.13.1409687110318; Tue, 02 Sep 2014 12:45: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.45.67 with SMTP id uj3csp577601vcb; Tue, 2 Sep 2014 12:45:09 -0700 (PDT) X-Received: by 10.70.132.73 with SMTP id os9mr50985817pdb.63.1409687109212; Tue, 02 Sep 2014 12:45:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wy1si7610021pab.66.2014.09.02.12.45.08 for ; Tue, 02 Sep 2014 12:45:09 -0700 (PDT) Received-SPF: none (google.com: linux-arm-msm-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 S1754781AbaIBTpH (ORCPT + 5 others); Tue, 2 Sep 2014 15:45:07 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:48712 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754581AbaIBTpG (ORCPT ); Tue, 2 Sep 2014 15:45:06 -0400 Received: by mail-pa0-f52.google.com with SMTP id eu11so15460695pac.25 for ; Tue, 02 Sep 2014 12:45:05 -0700 (PDT) X-Received: by 10.68.178.36 with SMTP id cv4mr21567623pbc.136.1409687105211; Tue, 02 Sep 2014 12:45:05 -0700 (PDT) Received: from ubuntu.localdomain (proxy6-global253.qualcomm.com. [199.106.103.253]) by mx.google.com with ESMTPSA id ow8sm4761804pbb.62.2014.09.02.12.45.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Sep 2014 12:45:04 -0700 (PDT) From: Lina Iyer To: galak@codeaurora.org, sboyd@codeaurora.org, linux-arm-msm@vger.kernel.org Cc: Lina Iyer Subject: [PATCH] msm: scm: Move scm-boot files to drivers/soc and include/soc Date: Tue, 2 Sep 2014 13:44:47 -0600 Message-Id: <1409687087-41343-1-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-arm-msm@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.220.171 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 --- 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.