From patchwork Wed Mar 18 18:46:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 45995 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8EF392153B for ; Wed, 18 Mar 2015 18:47:00 +0000 (UTC) Received: by lamq1 with SMTP id q1sf8938251lam.3 for ; Wed, 18 Mar 2015 11:46:59 -0700 (PDT) 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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=xCoMTGbKBpyuoqoTeesdLT54hzAhRqhw5QG4MooXZ9A=; b=gM4wjTNt2vl1zuXT3pXZs93GE02iK+fLKGzbTytX6C5V4Ys1LEHay6HAbitdEPYfDI 55lhdqhzjUO+q1ulobXn6Fy7RfEmNmZCqBRep6TQU/SGck0Q293xS48DapY/M8cbDfKI +aukbuhUjIHVobxph+r8kDwE9YQwprHv26XSfkGsLuIsuUGpURHFdsa8LJ7lIP+7B5v7 bzsuimO3aALvhC6cDmrF3yq+bpwL0+4Y/DczoIKiz70dJi0ZqY0ZtBi4U7AxE2fA6RuG 6Nsi6idOa6rjIJ+fe1A+yIRdMNYUE8ca0gonOxOL0P4kdElVq6Fa78fBGG96Bb70ntml CnVQ== X-Gm-Message-State: ALoCoQnaa0XeQB6lXPRExoWdy8VYaNQqMhapY5M1zKm8VwqwRSG9JNNPhrL8E1OFRdfnRkZMMcwN X-Received: by 10.180.90.169 with SMTP id bx9mr1048876wib.6.1426704419401; Wed, 18 Mar 2015 11:46:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.132 with SMTP id i4ls188337lab.25.gmail; Wed, 18 Mar 2015 11:46:59 -0700 (PDT) X-Received: by 10.152.197.34 with SMTP id ir2mr65360753lac.36.1426704419094; Wed, 18 Mar 2015 11:46:59 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id c6si13524198lbo.127.2015.03.18.11.46.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 11:46:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbcgn8 with SMTP id gn8so36521763lbc.2 for ; Wed, 18 Mar 2015 11:46:58 -0700 (PDT) X-Received: by 10.152.178.197 with SMTP id da5mr67305414lac.56.1426704418793; Wed, 18 Mar 2015 11:46:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1338506lbj; Wed, 18 Mar 2015 11:46:57 -0700 (PDT) X-Received: by 10.70.54.198 with SMTP id l6mr167171751pdp.74.1426704414718; Wed, 18 Mar 2015 11:46:54 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ac10si37663307pac.147.2015.03.18.11.46.53; Wed, 18 Mar 2015 11:46:54 -0700 (PDT) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756812AbbCRSqc (ORCPT + 11 others); Wed, 18 Mar 2015 14:46:32 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:32891 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756800AbbCRSqa (ORCPT ); Wed, 18 Mar 2015 14:46:30 -0400 Received: by wgbcc7 with SMTP id cc7so42927167wgb.0 for ; Wed, 18 Mar 2015 11:46:29 -0700 (PDT) X-Received: by 10.180.12.194 with SMTP id a2mr9530831wic.55.1426704389085; Wed, 18 Mar 2015 11:46:29 -0700 (PDT) Received: from localhost.localdomain (135-224-190-109.dsl.ovh.fr. [109.190.224.135]) by mx.google.com with ESMTPSA id uc18sm4345931wib.0.2015.03.18.11.46.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Mar 2015 11:46:28 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net, lorenzo.pieralisi@arm.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin.Marinas@arm.com, robherring2@gmail.com, arnd@arndb.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, lina.iyer@linaro.org Subject: [PATCH V2 6/8] ARM: cpuidle: Enable the ARM64 driver for both ARM32/ARM64 Date: Wed, 18 Mar 2015 19:46:10 +0100 Message-Id: <1426704372-20406-7-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426704372-20406-1-git-send-email-daniel.lezcano@linaro.org> References: <1426704372-20406-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ARM32 and ARM64 have the same DT definitions and the same approaches. The generic ARM cpuidle driver can be put in common for those two architectures. Signed-off-by: Daniel Lezcano Acked-by: Kevin Hilman Acked-by: Rob Herring --- drivers/cpuidle/Kconfig | 7 +------ drivers/cpuidle/Kconfig.arm | 10 ++++++++++ drivers/cpuidle/Kconfig.arm64 | 13 ------------- drivers/cpuidle/Makefile | 5 +---- drivers/cpuidle/{cpuidle-arm64.c => cpuidle-arm.c} | 0 5 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 drivers/cpuidle/Kconfig.arm64 rename drivers/cpuidle/{cpuidle-arm64.c => cpuidle-arm.c} (100%) diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm.c similarity index 100% rename from drivers/cpuidle/cpuidle-arm64.c rename to drivers/cpuidle/cpuidle-arm.c diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig index c5029c1..8c7930b 100644 --- a/drivers/cpuidle/Kconfig +++ b/drivers/cpuidle/Kconfig @@ -29,15 +29,10 @@ config DT_IDLE_STATES bool menu "ARM CPU Idle Drivers" -depends on ARM +depends on ARM || ARM64 source "drivers/cpuidle/Kconfig.arm" endmenu -menu "ARM64 CPU Idle Drivers" -depends on ARM64 -source "drivers/cpuidle/Kconfig.arm64" -endmenu - menu "MIPS CPU Idle Drivers" depends on MIPS source "drivers/cpuidle/Kconfig.mips" diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 8e07c94..f08043e 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -14,6 +14,16 @@ config ARM_BIG_LITTLE_CPUIDLE define different C-states for little and big cores through the multiple CPU idle drivers infrastructure. +config ARM_CPUIDLE + bool "Generic ARM/ARM64 CPU idle Driver" + select DT_IDLE_STATES + help + Select this to enable generic cpuidle driver for ARM. + It provides a generic idle driver whose idle states are configured + at run-time through DT nodes. The CPUidle suspend backend is + initialized by calling the CPU operations init idle hook + provided by architecture code. + config ARM_CLPS711X_CPUIDLE bool "CPU Idle Driver for CLPS711X processors" depends on ARCH_CLPS711X || COMPILE_TEST diff --git a/drivers/cpuidle/Kconfig.arm64 b/drivers/cpuidle/Kconfig.arm64 deleted file mode 100644 index 6effb36..0000000 --- a/drivers/cpuidle/Kconfig.arm64 +++ /dev/null @@ -1,13 +0,0 @@ -# -# ARM64 CPU Idle drivers -# - -config ARM64_CPUIDLE - bool "Generic ARM64 CPU idle Driver" - select DT_IDLE_STATES - help - Select this to enable generic cpuidle driver for ARM64. - It provides a generic idle driver whose idle states are configured - at run-time through DT nodes. The CPUidle suspend backend is - initialized by calling the CPU operations init idle hook - provided by architecture code. diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index 4d177b9..3ba81b1 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@ -17,16 +17,13 @@ obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o obj-$(CONFIG_ARM_AT91_CPUIDLE) += cpuidle-at91.o obj-$(CONFIG_ARM_EXYNOS_CPUIDLE) += cpuidle-exynos.o +obj-$(CONFIG_ARM_CPUIDLE) += cpuidle-arm.o ############################################################################### # MIPS drivers obj-$(CONFIG_MIPS_CPS_CPUIDLE) += cpuidle-cps.o ############################################################################### -# ARM64 drivers -obj-$(CONFIG_ARM64_CPUIDLE) += cpuidle-arm64.o - -############################################################################### # POWERPC drivers obj-$(CONFIG_PSERIES_CPUIDLE) += cpuidle-pseries.o obj-$(CONFIG_POWERNV_CPUIDLE) += cpuidle-powernv.o