From patchwork Mon Jan 21 10:02:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 2009871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 1BE9ADF23A for ; Mon, 21 Jan 2013 10:06:55 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxEFK-0001X2-0p; Mon, 21 Jan 2013 10:04:54 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TxEDf-0000mk-7C for linux-arm-kernel@lists.infradead.org; Mon, 21 Jan 2013 10:03:18 +0000 Received: by mail-pb0-f49.google.com with SMTP id un15so3218540pbc.22 for ; Mon, 21 Jan 2013 02:03:09 -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=kcW2md55qbhC1qRn8n9SdhaiuLaZ7d8r6O+c82nUbko=; b=W5V8zeLuN//etKuTmB8Xonlz/c0fNPj25p8ExYDKWay3jhgOhBZA0E588zzxqGG1sj 96amR29UAWNOnu4mTmwjJ84+Ri92grw5bcCYoInBfkyhSLnkCJ+FsyS7LNexuCtDIM5h QS0px29Aydk/1EXqcW5W2fZOnisqPAfr+ZM27mqfALb2vSe1VQdrPJwbNcfBmG69WxUI eiIuiqFfUpgSpE770gLSA1bPcbYNglnCvpROoph8wNWEDVxBM92rpTY6NLYR/w5SuWGp AcmdCuH0owwO65uQ2wt94R2ylGoWbW1uiG7KoX6g1qqWcmPHDtTmzNxdKvuBwZgrG/eX qqMw== X-Received: by 10.69.0.74 with SMTP id aw10mr28139337pbd.87.1358762589360; Mon, 21 Jan 2013 02:03:09 -0800 (PST) Received: from localhost.localdomain (72-254-49-219.client.stsn.net. [72.254.49.219]) by mx.google.com with ESMTPS id pu5sm8416294pbb.73.2013.01.21.02.03.08 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 02:03:08 -0800 (PST) From: Thomas Abraham To: devicetree-discuss@lists.ozlabs.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v4 7/7] ARM: Exynos: move mct driver to drivers/clocksource Date: Mon, 21 Jan 2013 02:02:22 -0800 Message-Id: <1358762542-19008-8-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1358762542-19008-1-git-send-email-thomas.abraham@linaro.org> References: <1358762542-19008-1-git-send-email-thomas.abraham@linaro.org> X-Gm-Message-State: ALoCoQm1wvlJMffbv9m70jqpOCFncCYzl5RefH6fRTCDvJXvCSX36FK85sJXultiZm+SUn9oAey0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130121_050311_426028_FADB1EFF X-CRM114-Status: GOOD ( 10.86 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kgene.kim@samsung.com, swarren@nvidia.com, t.figa@samsung.com, olof@lixom.net, sylvester.nawrocki@gmail.com, chaos.youn@samsung.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Move the multi core timer (mct) driver from mach-exynos to drivers/clocksource and update the Kconfig and makefiles. Signed-off-by: Thomas Abraham --- 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 67874b8..10676e9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1624,7 +1624,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 8bdeaa5..ef06ef5 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -79,12 +79,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