From patchwork Tue Jun 28 10:51:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71063 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1517209qgy; Tue, 28 Jun 2016 03:55:35 -0700 (PDT) X-Received: by 10.98.33.23 with SMTP id h23mr704164pfh.42.1467111335156; Tue, 28 Jun 2016 03:55:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2si2043773pax.194.2016.06.28.03.55.34; Tue, 28 Jun 2016 03:55:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752961AbcF1KyY (ORCPT + 30 others); Tue, 28 Jun 2016 06:54:24 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:38908 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752843AbcF1KxO (ORCPT ); Tue, 28 Jun 2016 06:53:14 -0400 Received: by mail-wm0-f45.google.com with SMTP id r201so21629470wme.1 for ; Tue, 28 Jun 2016 03:52:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+9AHJDEZ0aNXF8cLk04e7AJsodK0cxZVuPivOT6AwR4=; b=b5/4tWT3pbYj3L800ZTaczsB2CJQp49LAVWWKCjJR1WvlMeYIZ61MyyBCfCGrh/rGu EnjmIVyA3DketNvuyHVHSu5FD6NSz8CvvoyU71YD7qIoUVvdMyrwPktwcLJXuzQy5P+c jK3XUumkN6wVzeXLautegup7G7z8navRaAWaE= 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=+9AHJDEZ0aNXF8cLk04e7AJsodK0cxZVuPivOT6AwR4=; b=E3JY1N/dgd/dzwCIH/zQfHIJ+KBErxLSUWrsDRybgHy9itI4MtIbODVLI0MGWELDKS iklYVcT4gxgvIjZj0A4C3FW+3lo/Y+OoF4suv45RDe+5LSk8XVImBPj63+c000eOvFmQ b7L7JOIRBVeAkvBOg2EaGPzJhx5YkkIp6MOTaGOIhmoGSa75bKYMd1QGMdTACGdwKlrU yi54sZo3wDd1yRoiRhILaorIlaFNUFblPm7+9MMjLoMxTv0ZK85YkSMPt0RKd+cMa5b4 WBQSbTZ7vRg1T3SNd/vPSXvcWtCvC9wPUOPNRP3D0s7ttpuOVK8PjSOfa0H/WwzxdlEt 2/lg== X-Gm-Message-State: ALyK8tKL6kUbIgO1ZsplS02Tt0W7g8Uem7SFy+0XVONjwcYG8Nwgbv9qbgD9vtOMQRECcoed X-Received: by 10.194.178.167 with SMTP id cz7mr2712868wjc.66.1467111168344; Tue, 28 Jun 2016 03:52:48 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id x194sm1577615wmf.13.2016.06.28.03.52.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:52:45 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 87/92] clocksource/drivers/keystone: Add the COMPILE_TEST option Date: Tue, 28 Jun 2016 12:51:45 +0200 Message-Id: <1467111111-12587-12-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467111111-12587-1-git-send-email-daniel.lezcano@linaro.org> References: <577251A4.7030508@linaro.org> <1467111111-12587-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change the Kconfig option logic to fullfil with the current approach. A new Kconfig option is added, CONFIG_KEYSTONE_TIMER and is selected by the platform. Then the clocksource's Kconfig is changed to make this option selectable by the user if the COMPILE_TEST option is set. Otherwise, it is up to the platform's Kconfig to select the timer. Signed-off-by: Daniel Lezcano --- arch/arm/mach-keystone/Kconfig | 2 +- drivers/clocksource/Kconfig | 8 ++++++++ drivers/clocksource/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index ea955f6db..bac577b 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig @@ -4,7 +4,7 @@ config ARCH_KEYSTONE depends on ARM_PATCH_PHYS_VIRT select ARM_GIC select HAVE_ARM_ARCH_TIMER - select CLKSRC_MMIO + select KEYSTONE_TIMER select ARM_ERRATA_798181 if SMP select COMMON_CLK_KEYSTONE select ARCH_SUPPORTS_BIG_ENDIAN diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 0cfc4bf..7e5709a 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -206,6 +206,14 @@ config NSPIRE_TIMER help Enables support for the Nspire timer. +config KEYSTONE_TIMER + bool "Keystone timer driver" if COMPILE_TEST + depends on GENERIC_CLOCKEVENTS + depends on ARM || ARM64 + select CLKSRC_MMIO + help + Enables support for the Keystone timer. + config CLKSRC_DBX500_PRCMU_SCHED_CLOCK bool "Clocksource PRCMU Timer sched_clock" depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK) diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index d888c98..a818431 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -56,7 +56,7 @@ obj-$(CONFIG_ARMV7M_SYSTICK) += armv7m_systick.o obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp804.o obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST) += dummy_timer.o -obj-$(CONFIG_ARCH_KEYSTONE) += timer-keystone.o +obj-$(CONFIG_KEYSTONE_TIMER) += timer-keystone.o obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o