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: 23324 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 840F820540 for ; Fri, 17 Jan 2014 12:40:25 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 5sf6399144qeb.3 for ; Fri, 17 Jan 2014 04:40:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=IEXLStshy0nEcuOjf08fTakNw+Hr2ImVGNKpGhZ5hsg=; b=VTOjCjYuofDc/WhcDbGNMwx3j6BRbqJhcXPGYrGH3Y8B1qKUYrPkn5JnAD0GhTz+3o v2xL9edh11JMxzE2o0S09/2xNAqKS/WYxgS4yvIjY/ZeayDPi0XGqhJXVW6QunRBPYDN /N81evOp6RcMueMojcgiCO61ZTtAOThpcIxHP0dUfohyoageOSrQdfaR6Bx3gL3+wY4a U3kcpRh7UeOc7v6pnA7U0+rqufDu4Wp2o2b2Bmo4jCXdiWlMqvhOsogKqCpCLnqXrhlM 5CseP/yhp1mZW2iMzdoxXuM9oiemr5ZIyBpS2ODkkaq0kywGxOtJMuzRNpsuXv9cwDhb 4TxA== X-Gm-Message-State: ALoCoQme3JErwOyd/kmCSQTXedcqkHJf3A2NK67RNEnUBp8tvGiZGQfqPE9jxcz8yYn7Q+ETL1Aa X-Received: by 10.236.92.202 with SMTP id j50mr557359yhf.26.1389962424321; Fri, 17 Jan 2014 04:40:24 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.2.69 with SMTP id 5ls1171703qes.98.gmail; Fri, 17 Jan 2014 04:40:24 -0800 (PST) X-Received: by 10.220.92.135 with SMTP id r7mr805384vcm.11.1389962424210; Fri, 17 Jan 2014 04:40:24 -0800 (PST) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id fi9si4860673vcb.39.2014.01.17.04.40.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 04:40:24 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id oz11so398570veb.35 for ; Fri, 17 Jan 2014 04:40:24 -0800 (PST) X-Received: by 10.220.159.4 with SMTP id h4mr820169vcx.1.1389962424113; Fri, 17 Jan 2014 04:40:24 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp16651ved; Fri, 17 Jan 2014 04:40:23 -0800 (PST) X-Received: by 10.68.164.131 with SMTP id yq3mr1939807pbb.56.1389962423002; Fri, 17 Jan 2014 04:40:23 -0800 (PST) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) by mx.google.com with ESMTPS id ot3si10031737pac.224.2014.01.17.04.40.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 04:40:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.53 is neither permitted nor denied by best guess record for domain of hanjun.guo@linaro.org) client-ip=209.85.160.53; Received: by mail-pb0-f53.google.com with SMTP id ma3so4046308pbc.40 for ; Fri, 17 Jan 2014 04:40:21 -0800 (PST) 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> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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