From patchwork Wed Jan 8 19:56:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Tobias X-Patchwork-Id: 3455781 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 78EB09F1C4 for ; Wed, 8 Jan 2014 19:57:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD5B320121 for ; Wed, 8 Jan 2014 19:57:35 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5BF3C2010C for ; Wed, 8 Jan 2014 19:57:34 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0zFn-0003Wu-N9; Wed, 08 Jan 2014 19:57:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0zFl-0000CH-A9; Wed, 08 Jan 2014 19:57:25 +0000 Received: from mail-pd0-x22c.google.com ([2607:f8b0:400e:c02::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0zFi-0000Ao-Rc for linux-arm-kernel@lists.infradead.org; Wed, 08 Jan 2014 19:57:23 +0000 Received: by mail-pd0-f172.google.com with SMTP id g10so2189979pdj.31 for ; Wed, 08 Jan 2014 11:56:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=q889OgqE484UFz2XxM3AfjYF4qNphFu6u2usvUBbv1M=; b=k7vr8c8JlyTREf6sq8JnK9M34KgdpYUpOfu/1JpcBuXYbmJr7D5LpzubXk9DFYFEVz bE2leHvvVN21e5s0Arwj3LGwtaM3bb52HQ7xjPq+HHK28qPh7UZluH8wKAGZ7HjL1CUQ 3+j1rn9+JizANGmPgXZHjNZ//3FCzB29F8c0gbo4YpksTOcVrdbuVdmzJBpoUoNkmNzh jVe1ZSHs/vdU/KbrTryQEQ7MQCl4Q2yQTsapxJJ6REg5iS1tWDc4QfWPKfhDMISdhfRa zkNDPRO6ykl57uZtOweXmFWDOgKs/wWQGivqFstla06e4YA4eo1WB2YwP7unq2MJsSYW u3Pg== X-Received: by 10.66.224.109 with SMTP id rb13mr14932748pac.78.1389211016945; Wed, 08 Jan 2014 11:56:56 -0800 (PST) Received: from localhost.localdomain (morse-p.static.monkeybrains.net. [208.90.214.40]) by mx.google.com with ESMTPSA id bz4sm4503059pbb.12.2014.01.08.11.56.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Jan 2014 11:56:56 -0800 (PST) From: John Tobias To: kernel@pengutronix.de, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] ARM: imx: add select on ARCH_MXC for cpufreq support Date: Wed, 8 Jan 2014 11:56:31 -0800 Message-Id: <1389210991-23688-1-git-send-email-john.tobias.ph@gmail.com> X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140108_145722_976980_21828A42 X-CRM114-Status: UNSURE ( 9.10 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: shawn.guo@linaro.org, John Tobias X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Moved ARCH_HAS_CPUFREQ, HAVE_IMX_ANATOP and PM_OPP on ARCH_MXC so that the user can enable the cpufreq support for iMX6Q and/or iMX6SL. Signed-off-by: John Tobias --- arch/arm/mach-imx/Kconfig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 7a6e6f7..3c326be 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -1,5 +1,6 @@ config ARCH_MXC bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 + select ARCH_HAS_CPUFREQ select ARCH_REQUIRE_GPIOLIB select ARM_CPU_SUSPEND if PM select ARM_PATCH_PHYS_VIRT @@ -9,8 +10,10 @@ config ARCH_MXC select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP + select HAVE_IMX_ANATOP select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7 select MULTI_IRQ_HANDLER + select PM_OPP if PM select SOC_BUS select SPARSE_IRQ select USE_OF @@ -779,16 +782,14 @@ config SOC_IMX53 config SOC_IMX6Q bool "i.MX6 Quad/DualLite support" - select ARCH_HAS_CPUFREQ - select ARCH_HAS_OPP + select ARCH_HAS_OPP select ARM_ERRATA_754322 select ARM_ERRATA_764369 if SMP select ARM_ERRATA_775420 select ARM_GIC select CPU_V7 select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select HAVE_IMX_ANATOP + select HAVE_ARM_TWD if SMP select HAVE_IMX_GPC select HAVE_IMX_MMDC select HAVE_IMX_SRC @@ -800,8 +801,7 @@ config SOC_IMX6Q select PINCTRL_IMX6Q select PL310_ERRATA_588369 if CACHE_PL310 select PL310_ERRATA_727915 if CACHE_PL310 - select PL310_ERRATA_769419 if CACHE_PL310 - select PM_OPP if PM + select PL310_ERRATA_769419 if CACHE_PL310 help This enables support for Freescale i.MX6 Quad processor. @@ -812,7 +812,6 @@ config SOC_IMX6SL select ARM_ERRATA_775420 select ARM_GIC select CPU_V7 - select HAVE_IMX_ANATOP select HAVE_IMX_GPC select HAVE_IMX_MMDC select HAVE_IMX_SRC