Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753130AbaAWQjv (ORCPT ); Thu, 23 Jan 2014 11:39:51 -0500 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:32610 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751908AbaAWQju (ORCPT ); Thu, 23 Jan 2014 11:39:50 -0500 Date: Thu, 23 Jan 2014 16:39:39 +0000 From: Catalin Marinas To: Hanjun Guo Cc: "Rafael J. Wysocki" , Will Deacon , Russell King - ARM Linux , "linux-acpi@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "grant.likely@linaro.org" , Matthew Garrett , Olof Johansson , Linus Walleij , Bjorn Helgaas , Rob Herring , Mark Rutland , Arnd Bergmann , "patches@linaro.org" , "linux-kernel@vger.kernel.org" , "linaro-kernel@lists.linaro.org" , "linaro-acpi@lists.linaro.org" , Charles Garcia-Tobin , "graeme.gregory@linaro.org" , Al Stone Subject: Re: [PATCH 07/20] ARM64 / ACPI: Enable ARM64 in Kconfig Message-ID: <20140123163939.GB25927@localhost> References: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> <1389961514-13562-8-git-send-email-hanjun.guo@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1389961514-13562-8-git-send-email-hanjun.guo@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 17, 2014 at 12:25:01PM +0000, Hanjun Guo wrote: > Add Kconfigs to build ACPI on ARM64, and make ACPI runable on ARM64. > > acpi_idle driver is x86/IA64 dependent now, so make CONFIG_ACPI_PROCESSOR > depends on X86 || IA64, and implement it on ARM/ARM64 in the furture. > > In order to make arm-core.c can both run on ARM and ARM64, introduce > CONFIG_ACPI_ARM to support it. > > Signed-off-by: Graeme Gregory > Signed-off-by: Al Stone > Signed-off-by: Hanjun Guo > --- > arch/arm64/Kconfig | 2 ++ > drivers/acpi/Kconfig | 11 ++++++++--- > drivers/acpi/plat/Makefile | 2 +- > 3 files changed, 11 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 6d4dd22..2b1fb1d 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -279,6 +279,8 @@ source "net/Kconfig" > > source "drivers/Kconfig" > > +source "drivers/acpi/Kconfig" > + > source "fs/Kconfig" > > source "arch/arm64/kvm/Kconfig" > diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig > index 4770de5..cae5dc9 100644 > --- a/drivers/acpi/Kconfig > +++ b/drivers/acpi/Kconfig > @@ -2,13 +2,16 @@ > # ACPI Configuration > # > > +config ACPI_ARM > + bool Could be better as def_bool ARM64 > + > menuconfig ACPI > bool "ACPI (Advanced Configuration and Power Interface) Support" > depends on !IA64_HP_SIM > - depends on IA64 || X86 > - depends on PCI > + depends on ((IA64 || X86) && PCI) || ARM64 > select PNP > - default y > + select ACPI_ARM if ARM64 And remove this select here. -- Catalin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/