From patchwork Thu Aug 2 17:45:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 174794 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 49D462C0091 for ; Fri, 3 Aug 2012 03:48:36 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SwzT7-0001Mr-2g; Thu, 02 Aug 2012 17:45:53 +0000 Received: from mail-gh0-f177.google.com ([209.85.160.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SwzT3-0001Lm-MX for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2012 17:45:50 +0000 Received: by ghbf11 with SMTP id f11so9315864ghb.36 for ; Thu, 02 Aug 2012 10:45:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:date:message-id:subject:from:to:cc :content-type:x-gm-message-state; bh=7OMOMA6o55Lhc/btt4PWYBFqUmEOotd2i1OG19LLbP8=; b=JwuB75s6ww9fXwKykbmvkjd15c6ROVa0aSMVrfMwdugaQwrjUoXQmCLQZVxtsn9xW8 49qPL+/g3VQvdUArmkCPqfVTPAGPQOq9I9IqRBhOu64Rq+kD0c8jZfUqfM+nbn8GkzHb rip6q9fZT4Ud+3FMoTICMYWlcJZdtV0uyg7JqdP7kYQCwqXOkh2Gm0db3W6UXFhGBpCs c6pWq4i1Jc3t5SnqoRrxmFq49RYIlIhJYRfVUwXzEfUsI34CM+8GnD2OITOIrOsHMEGw 6AuGBF1CHbp6hGDbnLgsciVHNk7lIv+zKY62cGlnUrjZOwo9crNC8XeHqihPQzquEeiV YEbw== MIME-Version: 1.0 Received: by 10.66.75.162 with SMTP id d2mr43476823paw.59.1343929548522; Thu, 02 Aug 2012 10:45:48 -0700 (PDT) Received: by 10.142.131.5 with HTTP; Thu, 2 Aug 2012 10:45:48 -0700 (PDT) X-Originating-IP: [2620:0:1000:1b02:1aa9:5ff:fe24:37a9] Date: Thu, 2 Aug 2012 10:45:48 -0700 Message-ID: Subject: [GIT PULL 2/3] ARM: arm-soc: cpuidle enablement for OMAP From: Olof Johansson To: Linus Torvalds X-Gm-Message-State: ALoCoQlAo6yD/20BytDNhZH9V5Z6fTkzwPZ/OViY6mPOM7UzuOwtzqGo0CUnSeoR3nYkuSYw3ZGo X-Spam-Note: CRM114 invocation failed 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.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Coupled cpuidle was meant to merge for 3.5 through Len Brown's tree, but didn't go in because the pull request ended up rejected. So it just got merged, and we got this staged branch that enables the coupled cpuidle code on OMAP. With a stable git workflow from the other maintainer we could have staged this earlier, but that wasn't the case so we have had to merge it late. The alternative is to hold it off until 3.7 but given that the code is well-isolated to OMAP and they are eager to see it go in, I didn't push back hard in that direction. ---------------------------------------------------------------- The following changes since commit 516b7ab0b42b6dfe765f04a397e499d519e93825: Merge branch 'fixes' into HEAD are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/pm2 for you to fetch changes up to 5c62202968d4aaf3bd50e19c421d66aec2e508e0: Merge branch 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into late2/pm ---------------------------------------------------------------- Kevin Hilman (1): ARM: OMAP4: CPUidle: add synchronization for coupled idle states Olof Johansson (1): Merge branch 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/.../khilman/linux-omap-pm into late2/pm Santosh Shilimkar (3): ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle. ARM: OMAP4: CPUidle: Open broadcast clock-event device. arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/cpuidle44xx.c | 145 ++++++++++++++++++++++----------- arch/arm/mach-omap2/timer.c | 4 +- 3 files changed, 103 insertions(+), 47 deletions(-)