From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kevin Hilman <khilman@linaro.org>
Subject: Re: [PATCH v3 1/8] msm: scm: Move scm-boot files to drivers/soc and include/soc
Date: Wed, 27 Aug 2014 10:18:24 -0700
Message-ID: <7h38chg8bj.fsf@paris.lan>
References: <1408400614-45419-1-git-send-email-lina.iyer@linaro.org>
	<1408400614-45419-2-git-send-email-lina.iyer@linaro.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <linux-arm-msm-owner@vger.kernel.org>
Received: from mail-pa0-f51.google.com ([209.85.220.51]:65457 "EHLO
	mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S935525AbaH0RSa (ORCPT
	<rfc822;linux-arm-msm@vger.kernel.org>);
	Wed, 27 Aug 2014 13:18:30 -0400
Received: by mail-pa0-f51.google.com with SMTP id ey11so658894pad.38
        for <linux-arm-msm@vger.kernel.org>; Wed, 27 Aug 2014 10:18:29 -0700 (PDT)
In-Reply-To: <1408400614-45419-2-git-send-email-lina.iyer@linaro.org> (Lina
	Iyer's message of "Mon, 18 Aug 2014 16:23:27 -0600")
Sender: linux-arm-msm-owner@vger.kernel.org
List-Id: linux-arm-msm@vger.kernel.org
To: Lina Iyer <lina.iyer@linaro.org>
Cc: daniel.lezcano@linaro.org, sboyd@codeaurora.org, davidb@codeaurora.org, galak@codeaurora.org, linux-arm-msm@vger.kernel.org, lorenzo.pieralisi@arm.com, msivasub@codeauorora.org

Lina Iyer <lina.iyer@linaro.org> writes:

> Signed-off-by: Lina Iyer <lina.iyer@linaro.org>

Why the move?  It looks like scm-boot.c still calls into the main
scm_call() stuff that still lives under arch/arm/mach-qcom, and not in
arm64, so I'm not seeing the motiviation for the change (and the
changelog didn't help explain either  :)

Kevin


>  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/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 <asm/smp_plat.h>
>  
> -#include "scm-boot.h"
> +#include <soc/qcom/scm-boot.h>
>  
>  #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 <linux/module.h>
>  #include <linux/slab.h>
> -#include <soc/qcom/scm.h>
>  
> -#include "scm-boot.h"
> +#include <soc/qcom/scm.h>
> +#include <soc/qcom/scm-boot.h>
>  
>  /*
>   * Set the cold/warm boot address for one of the CPU cores.
> 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