From patchwork Tue Aug 12 19:43:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 35310 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 48B8620540 for ; Tue, 12 Aug 2014 19:44:21 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id v10sf40030465pde.2 for ; Tue, 12 Aug 2014 12:44:20 -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: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=AsuM0g6XNnBgS3uJACYttS14bH8x8G+BiwGIiI4/Q6k=; b=T6ZuUMMeTXVbgpfAdItRzNSOjMehodI0O0kM0tJ6Bs4rHHpMdkuvfkodh4KYlS8Hv2 OVM6ILlyj4GmJeHnfDOgSspzSTfU83akQvod/qHR+xRK/BmE4x025385pnDEILEduhtO bKEui6bsReUWSeXJ5WPqxUVgelYstvI/Rr5Thzvy+j0j13lpO49B2w9abPxWiNmqHbfo SuLywYdWMy7kg1sfoxo1QZ0Daj0QfSlTU92vjX0Iy8lrd1PrDqSL0LDVCpqPdkBF0qaL O/omo+38WuVSAPpCE8M61jF90xI1/yFi8a9Cz25AKBf6A3mh/AOJG9uoAdkPOJbYpsCY srLg== X-Gm-Message-State: ALoCoQmHg4eFHgjAu8h02WrCvuTkV+SIrC+wexU1VmlVZDHJ+EdF8D1dcnjKvuWPLKDv5fwZyVzN X-Received: by 10.66.122.101 with SMTP id lr5mr3395622pab.19.1407872660511; Tue, 12 Aug 2014 12:44:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.141 with SMTP id s13ls282440qga.6.gmail; Tue, 12 Aug 2014 12:44:20 -0700 (PDT) X-Received: by 10.220.200.71 with SMTP id ev7mr5846043vcb.24.1407872660345; Tue, 12 Aug 2014 12:44:20 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id rd6si8808906vcb.39.2014.08.12.12.44.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 12:44:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so13666510vcb.24 for ; Tue, 12 Aug 2014 12:44:20 -0700 (PDT) X-Received: by 10.52.119.229 with SMTP id kx5mr10887963vdb.40.1407872660243; Tue, 12 Aug 2014 12:44:20 -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 tc5csp274407vcb; Tue, 12 Aug 2014 12:44:19 -0700 (PDT) X-Received: by 10.70.44.70 with SMTP id c6mr6061545pdm.75.1407872658787; Tue, 12 Aug 2014 12:44:18 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rt17si16761455pac.146.2014.08.12.12.44.18 for ; Tue, 12 Aug 2014 12:44:18 -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 S1755065AbaHLToQ (ORCPT + 4 others); Tue, 12 Aug 2014 15:44:16 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:36890 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755012AbaHLToM (ORCPT ); Tue, 12 Aug 2014 15:44:12 -0400 Received: by mail-pd0-f182.google.com with SMTP id fp1so13211659pdb.27 for ; Tue, 12 Aug 2014 12:44:12 -0700 (PDT) X-Received: by 10.70.88.39 with SMTP id bd7mr245106pdb.68.1407872652338; Tue, 12 Aug 2014 12:44:12 -0700 (PDT) Received: from ubuntu.localdomain (proxy6-global253.qualcomm.com. [199.106.103.253]) by mx.google.com with ESMTPSA id n10sm23474696pdp.72.2014.08.12.12.44.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Aug 2014 12:44:11 -0700 (PDT) From: Lina Iyer To: daniel.lezcano@linaro.org, khilman@linaro.org, amit.kucheria@linaro.org, sboyd@codeaurora.org, davidb@codeaurora.org, galak@codeaurora.org, linux-arm-msm@vger.kernel.org Cc: msivasub@codeaurora.org, Lina Iyer Subject: [PATCH v2 01/10] msm: scm: Move scm-boot files to drivers/soc and include/soc Date: Tue, 12 Aug 2014 13:43:51 -0600 Message-Id: <1407872640-6732-2-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407872640-6732-1-git-send-email-lina.iyer@linaro.org> References: <1407872640-6732-1-git-send-email-lina.iyer@linaro.org> 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.179 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: , 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.