1. 03 Jul, 2012 2 commits
    • Arnd Bergmann's avatar
      Merge tag 'omap-devel-pm-for-v3.6' of... · 6b21a9ce
      Arnd Bergmann authored
      Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm
      
      From: Tony Lindgren <tony@atomide.com>:
      
      Here are some omap PM changes that reimplement omap PRCM I/O chain
      code for wake-ups, and improve idle latencies for cpuidle.
      
      * tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
        ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
        ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
        ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
        ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
        ARM: OMAP3: PM: call pre/post transition per powerdomain
        ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
        ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
        ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
        ARM: OMAP3+: PRM: Enable IO wake up
        ARM: OMAP4: PRM: Add IO Daisychain support
        ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
        ARM: OMAP3: PM: correct enable/disable of daisy io chain
        ARM: OMAP2+: PRM: fix compile for OMAP4-only build
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      6b21a9ce
    • Arnd Bergmann's avatar
      Merge tag 'omap-devel-driver-for-v3.6' of... · 0d1d76dd
      Arnd Bergmann authored
      Merge tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm
      
      From Tony Lindgren <tony@atomide.com>:
      
      Here are omap driver changes for v3.6 that were agreed to be merged
      via the omap tree. These changes convert omap HDQ1W driver to use
      runtime PM, and finally move omap SmartReflex driver from arch/arm
      to live under drivers.
      
      * tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: do not allow SmartReflex to be built as a module
        ARM: OMAP2: Use hwmod to initialize mmc for 2420
        W1: OMAP HDQ1W: use runtime PM
        ARM: OMAP2+: HDQ1W: use omap_device
        W1: OMAP HDQ1W: use 32-bit register accesses
        W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
        ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/
        ARM: OMAP2+: SmartReflex: add POWER_AVS Kconfig options
        ARM: OMAP2+: SmartReflex: Create per-opp debugfs node for errminlimit
        ARM: OMAP2+: SmartReflex: Use per-OPP data structure
        ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat
        ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro
        ARM: OMAP3: hwmod: rename the smartreflex entries
        ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains.
        ARM: OMAP3+: SmartReflex: class drivers should use struct omap_sr *
        ARM: OMAP2+: SmartReflex: move the smartreflex header to include/linux/power
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      0d1d76dd
  2. 30 Jun, 2012 1 commit
    • Olof Johansson's avatar
      Merge branch 'imx/cpuidle' into next/pm · 839ab0c1
      Olof Johansson authored
      * imx/cpuidle:
        ARM: imx: Add imx6q cpuidle driver
        ARM: imx: Add imx5 cpuidle
        ARM: imx: Add common imx cpuidle init functionality.
        ARM: imx: Enable imx53 low power idle
        ARM: imx: clean and consolidate imx5 suspend and idle code
        ARM: imx: Add comments to tzic_enable_waker()
        ARM: imx: Modify IMX_IO_P2V macro
      
      Resolved trivial context conflict in arch/arm/plat-mxc/include/mach/common.h
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      839ab0c1
  3. 29 Jun, 2012 2 commits
    • Kevin Hilman's avatar
      ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge · d660e9b9
      Kevin Hilman authored
      commit 99b59df0 (ARM: OMAP3: PM: fix shared PRCM interrupt leave
      disabled at boot) added IRQ_NOAUTOEN to the PRCM interrupt so it could
      be enabled later if needed.  However, this commit was partially undone
      when merging the IO daisy chain rework in 9a17d88e (Merge tag
      'omap-devel-c-for-3.6' of
      git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into
      devel-pm
      
      This patch adds back the IRQ_NOAUTOEN fix that was removed by the
      merge resolution.
      
      This also fixes the following boot-time warning that showed up after
      merging the IO daisy chain rework:
      
      [    3.849334] WARNING: at kernel/irq/manage.c:436 enable_irq+0x3c/0x78()
      [    3.856231] Unbalanced enable for IRQ 297
      [    3.860473] Modules linked in:
      [    3.863739] [<c001a114>] (unwind_backtrace+0x0/0xf0) from [<c003c7e8>] (warn_slowpath_common+0x4c/0x64)
      [    3.873687] [<c003c7e8>] (warn_slowpath_common+0x4c/0x64) from [<c003c894>] (warn_slowpath_fmt+0x30/0x40)
      [    3.883819] [<c003c894>] (warn_slowpath_fmt+0x30/0x40) from [<c00993e0>] (enable_irq+0x3c/0x78)
      [    3.893035] [<c00993e0>] (enable_irq+0x3c/0x78) from [<c067b1e8>] (omap3_pm_init+0x328/0x5f4)
      [    3.902099] [<c067b1e8>] (omap3_pm_init+0x328/0x5f4) from [<c067161c>] (init_machine_late+0x1c/0x28)
      [    3.911773] [<c067161c>] (init_machine_late+0x1c/0x28) from [<c0008648>] (do_one_initcall+0x34/0x178)
      [    3.921539] [<c0008648>] (do_one_initcall+0x34/0x178) from [<c066e8f4>] (kernel_init+0xfc/0x1c0)
      [    3.930847] [<c066e8f4>] (kernel_init+0xfc/0x1c0) from [<c00140b0>] (kernel_thread_exit+0x0/0x8)
      [    3.940246] ---[ end trace 55a0ad32ca2ca682 ]---
      Reported-by: default avatarJavier Martinez Canillas <javier@dowhile0.org>
      Cc: Paul Walmsley <paul@pwsan.com>
      Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      d660e9b9
    • Jean Pihet's avatar
      ARM: OMAP2+: do not allow SmartReflex to be built as a module · bb0adf6c
      Jean Pihet authored
      Disable the module option for POWER_AVS since this is currently not
      supported.
      
      This patch fixes these error in the case POWER_AVS is set to 'm':
      
      arch/arm/mach-omap2/built-in.o: In function `sr_class3_configure':
      arch/arm/mach-omap2/smartreflex-class3.c:43: undefined reference to `sr_configure_errgen'
      arch/arm/mach-omap2/built-in.o: In function `sr_class3_disable':
      arch/arm/mach-omap2/smartreflex-class3.c:33: undefined reference to `sr_disable_errgen'
      arch/arm/mach-omap2/smartreflex-class3.c:35: undefined reference to `sr_disable'
      arch/arm/mach-omap2/built-in.o: In function `sr_class3_enable':
      arch/arm/mach-omap2/smartreflex-class3.c:28: undefined reference to `sr_enable'
      arch/arm/mach-omap2/built-in.o: In function `sr_class3_init':
      arch/arm/mach-omap2/smartreflex-class3.c:59: undefined reference to `sr_register_class'
      Reported-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarJean Pihet <j-pihet@ti.com>
      Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
      [tony@atomide.com: updated to use relative paths for the build error]
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      bb0adf6c
  4. 27 Jun, 2012 1 commit
  5. 26 Jun, 2012 2 commits
  6. 25 Jun, 2012 8 commits
  7. 24 Jun, 2012 7 commits
  8. 23 Jun, 2012 6 commits
  9. 22 Jun, 2012 11 commits