From patchwork Thu Oct 17 18:58:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 284340 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0CD6C2C00CB for ; Fri, 18 Oct 2013 05:59:19 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWsmZ-0001UA-NX; Thu, 17 Oct 2013 18:58:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWsmX-0007hC-7W; Thu, 17 Oct 2013 18:58:49 +0000 Received: from mail-ie0-x22b.google.com ([2607:f8b0:4001:c03::22b]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWsmU-0007gU-8F for linux-arm-kernel@lists.infradead.org; Thu, 17 Oct 2013 18:58:46 +0000 Received: by mail-ie0-f171.google.com with SMTP id tp5so4719260ieb.16 for ; Thu, 17 Oct 2013 11:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=Hzo9EtXPWsq4JOBfaf2ya3Fo2LYj5lD7l6QEgiiyGbo=; b=p14o8bz7IcTdd1F+Q1j1Qtbyx5aJ6zcucRALseD6A+ygK+8CJgXtDqATj7hwzx3uy5 RR7UpGwIdh+kkVNWtIA8QVCio7tLtsskySHOg+XK9vcGrfylZ1fE0wNoSflHKQE2LobL Kid1yKyKXtngEYi1AXjPnxsonnntB2GwHSAMeXgSA1upInrwLehQJVw3QzTIe7b6AM0Z VA7rASc4itFMjcoJq8MxCksi17wD14EyfbPY8YYxzSV6Jk0GQkqxEUCvq8eTQzYJ6lyN cBSdBj3iqK2uc8vTQvJNpURqZzZi7pmD1dE/VN0sxqtyNvm4Nt7TFrLpKJw9soIv9Thw VZ8w== X-Received: by 10.42.86.73 with SMTP id t9mr325909icl.81.1382036302604; Thu, 17 Oct 2013 11:58:22 -0700 (PDT) Received: from [10.10.10.90] ([173.226.190.126]) by mx.google.com with ESMTPSA id w4sm9497267igb.5.2013.10.17.11.58.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Oct 2013 11:58:22 -0700 (PDT) Message-ID: <5260334D.30009@gmail.com> Date: Thu, 17 Oct 2013 13:58:21 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: "arm@kernel.org" Subject: [GIT PULL] Highbank updates for 3.13 X-Enigmail-Version: 1.5.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131017_145846_318832_0CF5D4CB X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 Cc: Daniel Lezcano , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Kevin, Olof, Please pull. Doing merge with arm-soc/for-next, there's a trivial merge conflict with highbank.c includes. Rob The following changes since commit 15c03dd4859ab16f9212238f29dd315654aa94f6: Linux 3.12-rc3 (2013-09-29 15:02:38 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git tags/highbank-for-3.13 for you to fetch changes up to 78bbca1a54bd05f7c7d38a306073a3ee7f866e51: dts: calxeda: add ARM PSCI binding (2013-10-01 16:34:17 -0500) ---------------------------------------------------------------- Highbank platform updates for 3.13 - convert Calxeda cpuidle driver to a platform driver and to use PSCI - convert highbank smp_ops and suspend to PSCI ---------------------------------------------------------------- Daniel Lezcano (1): ARM: highbank: cpuidle: convert to platform driver Rob Herring (5): cpuidle: calxeda: add cpu_pm_enter/exit calls cpuidle: calxeda: add support to use PSCI calls ARM: PSCI: remove unnecessary include of arm-gic.h ARM: highbank: adapt to use ARM PSCI calls dts: calxeda: add ARM PSCI binding arch/arm/boot/dts/ecx-common.dtsi | 8 +++++ arch/arm/kernel/psci_smp.c | 1 - arch/arm/mach-highbank/Kconfig | 1 + arch/arm/mach-highbank/Makefile | 2 -- arch/arm/mach-highbank/core.h | 4 --- arch/arm/mach-highbank/highbank.c | 24 ++++++-------- arch/arm/mach-highbank/hotplug.c | 37 --------------------- arch/arm/mach-highbank/platsmp.c | 68 --------------------------------------- arch/arm/mach-highbank/pm.c | 27 ++++++---------- drivers/cpuidle/Kconfig.arm | 2 +- drivers/cpuidle/cpuidle-calxeda.c | 61 +++++++++++++---------------------- 11 files changed, 50 insertions(+), 185 deletions(-) delete mode 100644 arch/arm/mach-highbank/hotplug.c delete mode 100644 arch/arm/mach-highbank/platsmp.c