| Message ID | 1343075561-17446-15-git-send-email-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show
Return-Path: <patch+caf_=linaro-patchwork=canonical.com@linaro.org> X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 05A362402A for <patchwork@peony.canonical.com>; Mon, 23 Jul 2012 20:32:55 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id B2EF7A1804F for <linaro-patchwork@canonical.com>; Mon, 23 Jul 2012 20:32:54 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so6271108ggn.11 for <linaro-patchwork@canonical.com>; Mon, 23 Jul 2012 13:32:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=s+CxpW/1pyROgC+XLIO7DvOcQNQ3oC0PvW9zp/9rEVA=; b=EbQrU3p/g9VFL/7Il0slmguLv/bFeo1XBwuW6pheonXTHGqHXPJF/JHpx21moMpEvQ 8Xy0NJseMaCrPH0Zgjjwo1oiX4LjYlh7uOWG/0aoYWlHdrG/Qj8TTdrTqRe3OmgT9WIx ag0ENKGG3CUQhEt7Ekkx82byyudUI09PlcEcXmiUF3R8SPNGJ07MiwHx83gUu37+MjOy Soux1gF+07pCMvns2yfcgAj1aNGPHrEsp3nNa17JppbCysyJime9caTDaSZh7hzq42AF Rjk64efnqk/N7Be92fjlR41YkUj8TACEcMbCWKr2y4XjZM7XLR10N024LIVTY1X06G5K YJvg== Received: by 10.43.95.202 with SMTP id cd10mr9616777icc.21.1343075574296; Mon, 23 Jul 2012 13:32:54 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.153.7 with SMTP id i7csp61694ibw; Mon, 23 Jul 2012 13:32:50 -0700 (PDT) Received: by 10.180.81.133 with SMTP id a5mr665088wiy.17.1343075569813; Mon, 23 Jul 2012 13:32:49 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.10]) by mx.google.com with ESMTP id x49si12543910wem.141.2012.07.23.13.32.49; Mon, 23 Jul 2012 13:32:49 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.10 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.10; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.10 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.lan (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MWjXP-1TMJDP3N51-00Xvtn; Mon, 23 Jul 2012 22:32:49 +0200 From: Arnd Bergmann <arnd@arndb.de> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm@kernel.org Subject: [GIT PULL 14/15] arm-soc: power management changes Date: Mon, 23 Jul 2012 22:32:40 +0200 Message-Id: <1343075561-17446-15-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1343075561-17446-1-git-send-email-arnd@arndb.de> References: <1343075561-17446-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:FkK3ep9RP3wLbxEgH4H6M+qJHvEaQKOR8yKmbU9Y55l /1BgmW8/hv20adTPr4m2fTXQ3bdsN2ocu+TNmv8q2bIqzxjsxS PJ0MAtxDjm8WwxHE2SZXX64irqv2Y/g3MCo0bQrDokhKxXX2Tc ngbsUYAUpl8G7hO5cFHo9CtNDk9e6NCsRPVg2CyvwysxTG4Abx UOpsT5iXQvzYyhjlJH76lORmCPVJQ8rY5QzJzc6ITYkenRzskq AI4zip1ki5xCAHOvE5kd98ujfYzmcHtqvyV7I34HXAp/nQZhZT FK662Qof0toQyihfTEfeflk+873ARSZmIfQICRwcmKWvMNh314 YsOle2zHxEw7iMisNFgn7WxPqz9F8AyKtcvSVYCNv X-Gm-Message-State: ALoCoQllZdAvWKD1c6VVuzU10vGxnJ06+wfrAtE4kEAs1geydk5zkzimIB+f9B9Abh8CzA+qsYqP |
The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc: Linux 3.5-rc4 (2012-06-24 12:53:04 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/pm for you to fetch changes up to 6b21a9ce0402e0c5fd2adfa3d41328fdd8f55a9a: Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm (2012-07-03 22:02:17 +0200) ---------------------------------------------------------------- arm-soc: power management changes These are various power management related changes, mainly concerning cpuidle on i.MX and OMAP, as well as a the move of the omap smartreflex driver to live in the power subsystem. ---------------------------------------------------------------- Arnd Bergmann (3): Merge tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm Merge branch 'next/pm' into for-next J Keerthy (1): ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat Jean Pihet (13): ARM: OMAP2+: SmartReflex: move the smartreflex header to include/linux/power ARM: OMAP3+: SmartReflex: class drivers should use struct omap_sr * ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains. ARM: OMAP3: hwmod: rename the smartreflex entries ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro ARM: OMAP2+: SmartReflex: Use per-OPP data structure ARM: OMAP2+: SmartReflex: Create per-opp debugfs node for errminlimit ARM: OMAP2+: SmartReflex: add POWER_AVS Kconfig options ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/ ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state ARM: OMAP2+: do not allow SmartReflex to be built as a module Kevin Hilman (5): ARM: OMAP2+: PRM: fix compile for OMAP4-only build ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm ARM: OMAP3: PM: call pre/post transition per powerdomain ARM: OMAP3: PM: cleanup cam_pwrdm leftovers ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge Mohan V (1): ARM: OMAP3: PM: correct enable/disable of daisy io chain Olof Johansson (1): Merge branch 'imx/cpuidle' into next/pm Paul Walmsley (4): W1: OMAP HDQ1W: allow driver to be built on all OMAP2+ W1: OMAP HDQ1W: use 32-bit register accesses ARM: OMAP2+: HDQ1W: use omap_device W1: OMAP HDQ1W: use runtime PM Rajendra Nayak (1): ARM: OMAP4: PRM: Add IO Daisychain support Robert Lee (7): ARM: imx: Modify IMX_IO_P2V macro ARM: imx: Add comments to tzic_enable_waker() ARM: imx: clean and consolidate imx5 suspend and idle code ARM: imx: Enable imx53 low power idle ARM: imx: Add common imx cpuidle init functionality. ARM: imx: Add imx5 cpuidle ARM: imx: Add imx6q cpuidle driver Tero Kristo (1): ARM: OMAP3+: PRM: Enable IO wake up Tony Lindgren (5): Merge tag 'omap-devel-b-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-driver Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-pm ARM: OMAP2: Use hwmod to initialize mmc for 2420 Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-driver Merge branch 'for_3.6/pm/performance' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-pm Vishwanath BS (3): ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle arch/arm/mach-imx/clk-imx51-imx53.c | 2 +- arch/arm/mach-imx/imx53-dt.c | 1 + arch/arm/mach-imx/mach-imx6q.c | 19 +++ arch/arm/mach-imx/mach-mx53_ard.c | 1 + arch/arm/mach-imx/mach-mx53_evk.c | 1 + arch/arm/mach-imx/mach-mx53_loco.c | 1 + arch/arm/mach-imx/mach-mx53_smd.c | 1 + arch/arm/mach-imx/mm-imx5.c | 26 +--- arch/arm/mach-imx/pm-imx5.c | 111 ++++++++++---- arch/arm/mach-omap2/Makefile | 5 +- arch/arm/mach-omap2/cpuidle34xx.c | 71 ++++----- arch/arm/mach-omap2/devices.c | 108 ------------- arch/arm/mach-omap2/hdq1w.c | 26 ++++ arch/arm/mach-omap2/msdi.c | 73 +++++++++ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 +- arch/arm/mach-omap2/omap_hwmod.c | 38 ++++- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 +- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +- arch/arm/mach-omap2/pm.h | 2 +- arch/arm/mach-omap2/pm34xx.c | 63 ++------ arch/arm/mach-omap2/powerdomain.c | 16 +- arch/arm/mach-omap2/powerdomain.h | 4 +- arch/arm/mach-omap2/prcm-common.h | 8 + arch/arm/mach-omap2/prm2xxx_3xxx.c | 48 ++++++ arch/arm/mach-omap2/prm2xxx_3xxx.h | 2 + arch/arm/mach-omap2/prm44xx.c | 63 +++++++- arch/arm/mach-omap2/prm44xx.h | 2 + arch/arm/mach-omap2/smartreflex-class3.c | 29 ++-- arch/arm/mach-omap2/sr_device.c | 39 ++++- arch/arm/mach-omap2/voltage.h | 21 +-- arch/arm/plat-mxc/Makefile | 1 + arch/arm/plat-mxc/cpuidle.c | 80 ++++++++++ arch/arm/plat-mxc/include/mach/common.h | 6 +- arch/arm/plat-mxc/include/mach/cpuidle.h | 22 +++ arch/arm/plat-mxc/include/mach/hardware.h | 25 +-- arch/arm/plat-mxc/tzic.c | 4 + arch/arm/plat-omap/Kconfig | 31 ++-- arch/arm/plat-omap/include/plat/voltage.h | 21 ++- drivers/power/Kconfig | 2 + drivers/power/Makefile | 1 + drivers/power/avs/Kconfig | 12 ++ drivers/power/avs/Makefile | 1 + .../mach-omap2 => drivers/power/avs}/smartreflex.c | 161 ++++++++------------ drivers/w1/masters/Kconfig | 2 +- drivers/w1/masters/omap_hdq.c | 86 +++-------- .../linux/power}/smartreflex.h | 74 +++++++-- 46 files changed, 808 insertions(+), 521 deletions(-)