From patchwork Wed Nov 26 22:28:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 41565 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7F33825E18 for ; Wed, 26 Nov 2014 22:28:54 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id s18sf2345160lam.6 for ; Wed, 26 Nov 2014 14:28:53 -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=pU58RBt4NT8mTIBDOzrbZlHuagLU/sRApBbKO46qjEw=; b=XO6TkkhkSMtF0p87SJApg5zfJqplM4hr6u9Hbv/qB0FmhIBaCUYB97Nd05ci/D0ajf fqPXhMBnEq7SqGh9h/NT24nvaCIKn9AjnP53vEhRJiowmu2V35L8C5HKGIm+/WlKlt7e +C0OxLAuNZ5PH7+709AXZbUl4fioGLTkbpVN6WONFh/a+qjItchlDkLr9GbX7SuR30nb huy+6eR8Iv8MNd96f5ruUppW4JJh3VA78H9GWF67e8WTJ1CftHzPzbu6rUVqWFPjiOED tK6ZvSBCZN36pbA7BCfFGMnOxW+DxG63Y8zH9fsIncPE3kaYlTGY6oUSMnhC3nrH+6cU BB9Q== X-Gm-Message-State: ALoCoQlqbzZx0eVkt9F00EceADQIaNXqsNjcEQqq+Jpq1spHQ0IrAyZjlEKfsg3etLJH8oWUXc00 X-Received: by 10.112.151.38 with SMTP id un6mr9736237lbb.0.1417040933466; Wed, 26 Nov 2014 14:28:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.39 with SMTP id f7ls724161lab.75.gmail; Wed, 26 Nov 2014 14:28:53 -0800 (PST) X-Received: by 10.152.21.9 with SMTP id r9mr36539864lae.76.1417040933160; Wed, 26 Nov 2014 14:28:53 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id xe3si5556932lbb.114.2014.11.26.14.28.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Nov 2014 14:28:53 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id w7so3216240lbi.19 for ; Wed, 26 Nov 2014 14:28:53 -0800 (PST) X-Received: by 10.112.138.137 with SMTP id qq9mr35932252lbb.80.1417040933067; Wed, 26 Nov 2014 14:28:53 -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 ew9csp708817lbc; Wed, 26 Nov 2014 14:28:52 -0800 (PST) X-Received: by 10.68.229.33 with SMTP id sn1mr57469158pbc.63.1417040929627; Wed, 26 Nov 2014 14:28:49 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ae10si8754961pbd.132.2014.11.26.14.28.49 for ; Wed, 26 Nov 2014 14:28:49 -0800 (PST) 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 S1753130AbaKZW2s (ORCPT + 5 others); Wed, 26 Nov 2014 17:28:48 -0500 Received: from mail-pd0-f171.google.com ([209.85.192.171]:54274 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753103AbaKZW2q (ORCPT ); Wed, 26 Nov 2014 17:28:46 -0500 Received: by mail-pd0-f171.google.com with SMTP id y13so3632290pdi.30 for ; Wed, 26 Nov 2014 14:28:46 -0800 (PST) X-Received: by 10.66.180.228 with SMTP id dr4mr57950221pac.34.1417040926296; Wed, 26 Nov 2014 14:28:46 -0800 (PST) Received: from ubuntu.localdomain (proxy6-global253.qualcomm.com. [199.106.103.253]) by mx.google.com with ESMTPSA id xd3sm5219025pbc.54.2014.11.26.14.28.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 14:28:45 -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 01/10] qom: scm: Move scm-boot files to drivers/soc/qcom/ and include/soc/qcom Date: Wed, 26 Nov 2014 15:28:21 -0700 Message-Id: <1417040910-43290-2-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417040910-43290-1-git-send-email-lina.iyer@linaro.org> References: <1417040910-43290-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.217.174 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.