From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755070AbbB0S6F (ORCPT ); Fri, 27 Feb 2015 13:58:05 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:47409 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752839AbbB0S6D (ORCPT ); Fri, 27 Feb 2015 13:58:03 -0500 Message-ID: <54F0BE39.7020302@codeaurora.org> Date: Fri, 27 Feb 2015 10:58:01 -0800 From: Stephen Boyd User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Kumar Gala , linux-arm-msm@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, arm@kernel.org, olof@lixom.net Subject: Re: [PATCH 4/4] firmware: qcom: scm: Move the scm driver to drivers/firmware References: <1424987976-14531-1-git-send-email-galak@codeaurora.org> <1424987976-14531-4-git-send-email-galak@codeaurora.org> In-Reply-To: <1424987976-14531-4-git-send-email-galak@codeaurora.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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