Subject: [PATCH 4/4] firmware: qcom: scm: Move the scm driver to drivers/firmware

From: [email-masked] (Stephen Boyd)
Date: Fri, 27 Feb 2015 10:58:01 -0800

On 02/26/15 13:59, Kumar Gala wrote:
> Architectural changes in the ARM Linux kernel tree mandate the eventual
> removal of the mach-* directories. Move the scm driver to
> drivers/firmware and the scm header to include/linux to support that
> removal.
>
> Signed-off-by: Kumar Gala <[email-masked]>
> ---
>  MAINTAINERS                  |   1 +
>  arch/arm/mach-qcom/Kconfig   |   3 -
>  arch/arm/mach-qcom/Makefile  |   3 -
>  arch/arm/mach-qcom/platsmp.c |   2 +-
>  arch/arm/mach-qcom/scm.c     | 344 -------------------------------------------
>  arch/arm/mach-qcom/scm.h     |  29 ----
>  drivers/firmware/Kconfig     |   4 +
>  drivers/firmware/Makefile    |   2 +
>  drivers/firmware/qcom_scm.c  | 344 +++++++++++++++++++++++++++++++++++++++++++
>  include/linux/qcom_scm.h     |  29 ++++
>  10 files changed, 381 insertions(+), 380 deletions(-)
>  delete mode 100644 arch/arm/mach-qcom/scm.c
>  delete mode 100644 arch/arm/mach-qcom/scm.h
>  create mode 100644 drivers/firmware/qcom_scm.c
>  create mode 100644 include/linux/qcom_scm.h

Can you generate this with -M -C? Or just throw

[diff]
        renames = copy

int your git config.

The files are the same right?

> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
> index 41983883..6517132 100644
> --- a/drivers/firmware/Kconfig
> +++ b/drivers/firmware/Kconfig
> @@ -132,6 +132,10 @@ config ISCSI_IBFT
>  	  detect iSCSI boot parameters dynamically during system boot, say Y.
>  	  Otherwise, say N.
>  
> +config QCOM_SCM
> +	bool
> +	depends on ARM || ARM64

No need to have depends on here if the option is hidden. Just make sure
it isn't selected unless the depends are true.

Also, the drivers/firmware/Kconfig file needs to be sourced in the
arch/arm/Kconfig so that we can still get this option on arm (Lina
noticed it isn't working on arm). It looks like arm64 is already
sourcing it.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project