From patchwork Thu Nov 27 05:24:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 41594 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D607425E89 for ; Thu, 27 Nov 2014 05:24:59 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf2719327wib.10 for ; Wed, 26 Nov 2014 21:24:59 -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=xulvO2S+YtfWgEyj3jsaOSlFa7C3nrpJknHgwznkKIY=; b=OJibwCwK081DRqUTqQGMQgpBdfLKDF4upgInCe83rGZ4VGsekyG2D7iF4nEPxdD5dZ pBPZQSETcLSDV5QR+kDguuQeiKTnLx4tbd4mGuWKVjCevLukuLEcWqqZJN+4hu9x7c6H 6AG99n2mr6miSWWaVAhOyRvlms2tvo7uXwvFacL4PVIeqPWD4mOAhgOn6+6Jw+9bY8TV fKK9DH/0KjxrOCy/IgpJSEk3PXzAESiLEEaIJ/Zfwnce6FBYUCUEQ9r1+ed4WtmLh3o3 pby3vp1a873aR7bExt60v9v9GJXNt1FBEuHaiuNlW+YvRrsEsEcaBPs/7Clku9JWMmwr +Z0Q== X-Gm-Message-State: ALoCoQnmgYtM2ySDYsVQyzZIBSpVl3YbfTVOZ5JdbNnVnrD5w/+MQBz9Qm4BE2drPtsgvOn3ysWi X-Received: by 10.194.133.39 with SMTP id oz7mr1854981wjb.3.1417065899152; Wed, 26 Nov 2014 21:24:59 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.227 with SMTP id i3ls640293lae.28.gmail; Wed, 26 Nov 2014 21:24:58 -0800 (PST) X-Received: by 10.152.21.227 with SMTP id y3mr5312785lae.50.1417065898824; Wed, 26 Nov 2014 21:24:58 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id r2si6262408lar.2.2014.11.26.21.24.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Nov 2014 21:24:58 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id n15so3619404lbi.30 for ; Wed, 26 Nov 2014 21:24:58 -0800 (PST) X-Received: by 10.112.235.196 with SMTP id uo4mr36717739lbc.66.1417065898730; Wed, 26 Nov 2014 21:24:58 -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 ew9csp747319lbc; Wed, 26 Nov 2014 21:24:57 -0800 (PST) X-Received: by 10.68.132.225 with SMTP id ox1mr59054667pbb.85.1417065879757; Wed, 26 Nov 2014 21:24:39 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sx4si4119657pbc.127.2014.11.26.21.24.38 for ; Wed, 26 Nov 2014 21:24:39 -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 S1753222AbaK0FYc (ORCPT + 12 others); Thu, 27 Nov 2014 00:24:32 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:64549 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871AbaK0FYc (ORCPT ); Thu, 27 Nov 2014 00:24:32 -0500 Received: by mail-pa0-f42.google.com with SMTP id et14so4326477pad.1 for ; Wed, 26 Nov 2014 21:24:32 -0800 (PST) X-Received: by 10.66.66.234 with SMTP id i10mr59711353pat.44.1417065867563; Wed, 26 Nov 2014 21:24:27 -0800 (PST) Received: from ubuntu.localdomain (c-24-8-37-141.hsd1.co.comcast.net. [24.8.37.141]) by mx.google.com with ESMTPSA id wl10sm5829131pbc.58.2014.11.26.21.24.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 21:24:26 -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 v13 01/10] qcom: scm: Move scm-boot files to drivers/soc/qcom/ and include/soc/qcom Date: Wed, 26 Nov 2014 22:24:05 -0700 Message-Id: <1417065854-37745-2-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417065854-37745-1-git-send-email-lina.iyer@linaro.org> References: <1417065854-37745-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.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 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.