From patchwork Tue Jun 7 16:16:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 857622 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p57GGhdq022492 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 7 Jun 2011 16:17:04 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QTyxD-0008IQ-2U; Tue, 07 Jun 2011 16:16:31 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QTyxC-00069o-LM; Tue, 07 Jun 2011 16:16:30 +0000 Received: from mail-iw0-f177.google.com ([209.85.214.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QTyx9-00069V-7X for linux-arm-kernel@lists.infradead.org; Tue, 07 Jun 2011 16:16:28 +0000 Received: by iwn36 with SMTP id 36so5722029iwn.36 for ; Tue, 07 Jun 2011 09:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=6rUhOiP/LX1mucSGQBO6QgAUjnz2ijhvPAPmTxBZZfw=; b=W4QahFMAwrnpK4XTyYU14du0dabCkKWHF8Zra1d1oNsRMt+CzmLckG2RsYUwHv6jYR tZkhpPzNNqpIehWdNHDmDKUUqvvuBUFwO706LkHjoLiE1LY1CIcqGA2dsoW+qeaAT8ws vqd2dVp+557AWg6sp952Gb3mCPEExOHeChpdk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=IK9Z71wnE09qmewMwklXCXphmJi1xpCg0qRXIRWH/NbSHTKA2EOT1acAoAWZTlIMFZ MtahC4lSboCT7X1vv08iarYOfXhxWXxDj/3UMsCWpj+GrROlECSZUiql3ewmbHyRSv6B loD1AWn5kvkWtMr9BMnP2L3ZL9p3NLrBaqzhs= Received: by 10.42.134.67 with SMTP id k3mr9474289ict.478.1307463384178; Tue, 07 Jun 2011 09:16:24 -0700 (PDT) Received: from rob-laptop.i.smooth-stone.com ([173.226.190.126]) by mx.google.com with ESMTPS id n19sm2213526ibm.12.2011.06.07.09.16.22 (version=SSLv3 cipher=OTHER); Tue, 07 Jun 2011 09:16:22 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: allow enabling SCU code on UP Date: Tue, 7 Jun 2011 11:16:02 -0500 Message-Id: <1307463362-18387-1-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110607_121627_582022_DF12ED68 X-CRM114-Status: GOOD ( 13.51 ) X-Spam-Score: 1.4 (+) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (robherring2[at]gmail.com) 2.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL Cc: Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 07 Jun 2011 16:17:05 +0000 (UTC) From: Rob Herring The scu_power_mode function can be used on UP builds as it drives signals to an SOC power controller. So make it selectable for !SMP. Signed-off-by: Rob Herring --- arch/arm/Kconfig | 1 - arch/arm/kernel/smp_scu.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9adc278..8665a24 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1346,7 +1346,6 @@ config SMP_ON_UP config HAVE_ARM_SCU bool - depends on SMP help This option enables support for the ARM system coherency unit diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c index a1e757c..79ed5e7 100644 --- a/arch/arm/kernel/smp_scu.c +++ b/arch/arm/kernel/smp_scu.c @@ -20,6 +20,7 @@ #define SCU_INVALIDATE 0x0c #define SCU_FPGA_REVISION 0x10 +#ifdef CONFIG_SMP /* * Get the number of CPU cores from the SCU configuration */ @@ -50,6 +51,7 @@ void __init scu_enable(void __iomem *scu_base) */ flush_cache_all(); } +#endif /* * Set the executing CPUs power mode as defined. This will be in