From patchwork Mon Feb 18 08:13:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 2156161 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 95E0FE00C6 for ; Mon, 18 Feb 2013 08:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755349Ab3BRIOl (ORCPT ); Mon, 18 Feb 2013 03:14:41 -0500 Received: from mail-pb0-f54.google.com ([209.85.160.54]:39765 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755310Ab3BRIOk (ORCPT ); Mon, 18 Feb 2013 03:14:40 -0500 Received: by mail-pb0-f54.google.com with SMTP id rr4so1568000pbb.41 for ; Mon, 18 Feb 2013 00:14:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=IYuhlqRhEGp3333XM/f+L+KGBS1/c1zgjcVZYIOI4og=; b=omzY6NLGeQ8QMGSwg+nF1lYU8clfYezhi5bgkpxsFhE3Qkvg0uSjn7W/u6KUSdD6nq FINMd7NIryXdXtSs9wChSspgQAqvu1WDVceks69vL9Q42ItFsL/4jNwJxioPCOuYbwJP Bcr32F8dROoYEk3IiUvrrhP4oG3xMfcUPXm9irici8/16b1AXBU3An9mdPPE7NcuzWaG kbKv+NSxrCWb9CXPINyBdTXrNYbKnPNI5rYNCpyaXE/t/iNeMCnCJK8VgYp59qRdch8+ fWRlOGpRzsCWzJjTzaZogoqDx81UsNV7ipQ/h112vcU2lb8EYGVkaRSPVHWqvtuQQ7tr F4mw== X-Received: by 10.68.75.109 with SMTP id b13mr28083529pbw.25.1361175279809; Mon, 18 Feb 2013 00:14:39 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id 1sm2182920pba.32.2013.02.18.00.14.36 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Feb 2013 00:14:39 -0800 (PST) From: Thomas Abraham To: devicetree-discuss@lists.ozlabs.org, linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, kgene.kim@samsung.com, t.figa@samsung.com, chaos.youn@samsung.com, sylvester.nawrocki@gmail.com, swarren@nvidia.com Subject: [PATCH 7/7] ARM: Exynos: move mct driver to drivers/clocksource Date: Mon, 18 Feb 2013 13:43:45 +0530 Message-Id: <1361175225-19282-8-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1361175225-19282-1-git-send-email-thomas.abraham@linaro.org> References: <1361175225-19282-1-git-send-email-thomas.abraham@linaro.org> X-Gm-Message-State: ALoCoQnGlLBMgbadfyfz9fbKT992v5+96CSBCJAZJq6k69JYZvo1W/Y7KI1A/BWnqlfdjyH31ZI7 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Move the multi core timer (mct) driver to from mach-exynos to drivers/clocksource and update the Kconfig and makefiles. Cc: Changhwan Youn Signed-off-by: Thomas Abraham Reviewed-by: Stephen Warren --- arch/arm/Kconfig | 2 +- arch/arm/mach-exynos/Kconfig | 6 ------ arch/arm/mach-exynos/Makefile | 2 -- drivers/clocksource/Kconfig | 5 +++++ drivers/clocksource/Makefile | 1 + .../mct.c => drivers/clocksource/exynos_mct.c | 0 6 files changed, 7 insertions(+), 9 deletions(-) rename arch/arm/mach-exynos/mct.c => drivers/clocksource/exynos_mct.c (100%) diff --git a/arch/arm/mach-exynos/mct.c b/drivers/clocksource/exynos_mct.c similarity index 100% rename from arch/arm/mach-exynos/mct.c rename to drivers/clocksource/exynos_mct.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8b72d23..8234697 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1622,7 +1622,7 @@ config LOCAL_TIMERS bool "Use local timer interrupts" depends on SMP default y - select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT) + select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !CLKSRC_EXYNOS_MCT) help Enable support for local timers on SMP platforms, rather then the legacy IPI broadcast method. Local timers allows the system diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index e0ce082..6961ac7 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -80,12 +80,6 @@ config SOC_EXYNOS5440 help Enable EXYNOS5440 SoC support -config EXYNOS4_MCT - bool - default y - help - Use MCT (Multi Core Timer) as kernel timers - config EXYNOS_DEV_DMA bool help diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 7e53a3a..5141963 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -26,8 +26,6 @@ obj-$(CONFIG_ARCH_EXYNOS) += pmu.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o -obj-$(CONFIG_EXYNOS4_MCT) += mct.o - obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-smc.o diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index a32b7a9..84bf4de 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -61,3 +61,8 @@ config CLKSRC_ARM_GENERIC def_bool y if ARM64 help This option enables support for the ARM generic timer. + +config CLKSRC_EXYNOS_MCT + def_bool y if ARCH_EXYNOS + help + Support for Multi Core Timer controller on Exynos SoCs. diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index a33f792..248a856 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -17,5 +17,6 @@ obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o +obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o