From patchwork Fri Jan 17 12:25:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3503971 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E637C9F2E9 for ; Fri, 17 Jan 2014 12:40:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D69732015E for ; Fri, 17 Jan 2014 12:40:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50C0520170 for ; Fri, 17 Jan 2014 12:40:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752435AbaAQMk0 (ORCPT ); Fri, 17 Jan 2014 07:40:26 -0500 Received: from mail-pb0-f52.google.com ([209.85.160.52]:56213 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751357AbaAQMkY (ORCPT ); Fri, 17 Jan 2014 07:40:24 -0500 Received: by mail-pb0-f52.google.com with SMTP id jt11so1981640pbb.25 for ; Fri, 17 Jan 2014 04:40:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IEXLStshy0nEcuOjf08fTakNw+Hr2ImVGNKpGhZ5hsg=; b=Ay2H1cJkISFmIburWrP1KAacFidc0EyMGFTsUY/Elf+LoaXTQDnQMROG95Gxf9MkTY 7rUdRQPAVh/f4q/6gonh5AC8MVUxvQUXCcpiykgIt3wEIyY4wN5uCMwSdZb655/F9qFQ jw+s9R/aZmz/PnFuknhTuvng5aR/PjmSClWxiJnWd7Wq1SNgJc2wwyzqUukoXMJfsLQG sKrdefj+f+NxKYljpRGVFZh0EVzc0jkbuAWfYiS/BCqnvQig/NY2OWvVgIcoj0KT3Oz0 iJTI0k1x+pWGTuT+NbATBEt9m662iKVERTNcyYUGsf3vVubkTHfFl5dBaKGUlU2hu46Q Kd5w== X-Gm-Message-State: ALoCoQktODYH+QWQBi2SNpdM8pOq7HVY3zLbz+yzfx32ALcHI4LTe4NeC2/w8/y0raAHL5LNzUdv X-Received: by 10.66.139.196 with SMTP id ra4mr1779968pab.103.1389962421730; Fri, 17 Jan 2014 04:40:21 -0800 (PST) Received: from localhost ([218.17.215.175]) by mx.google.com with ESMTPSA id nl7sm22562808pbc.6.2014.01.17.04.38.12 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Jan 2014 04:40:20 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , Will Deacon , Russell King - ARM Linux Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Grant Likely , 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@arm.com, Hanjun Guo , Graeme Gregory , Al Stone Subject: [PATCH 07/20] ARM64 / ACPI: Enable ARM64 in Kconfig Date: Fri, 17 Jan 2014 20:25:01 +0800 Message-Id: <1389961514-13562-8-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> References: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 + 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 + default y if !ARM64 help Advanced Configuration and Power Interface (ACPI) support for Linux requires an ACPI-compliant platform (hardware/firmware), @@ -149,6 +152,7 @@ config ACPI_PROCESSOR tristate "Processor" select THERMAL select CPU_IDLE + depends on X86 || IA64 default y help This driver installs ACPI as the idle handler for Linux and uses @@ -250,6 +254,7 @@ config ACPI_DEBUG config ACPI_PCI_SLOT bool "PCI slot detection driver" depends on SYSFS + depends on PCI default n help This driver creates entries in /sys/bus/pci/slots/ for all PCI diff --git a/drivers/acpi/plat/Makefile b/drivers/acpi/plat/Makefile index 46bc65e..3a61176 100644 --- a/drivers/acpi/plat/Makefile +++ b/drivers/acpi/plat/Makefile @@ -1 +1 @@ -obj-$(CONFIG_ARM64) += arm-core.o +obj-$(CONFIG_ACPI_ARM) += arm-core.o