[GIT PULL 3/5] omap pm fixes for v3.7-rc1

[GIT PULL 3/5] omap pm fixes for v3.7-rc1

[Tony Lindgren]

The following changes since commit 5e090ed7af10729a396a25df43d69a236e789736:

  Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2012-10-07 20:55:16 +0900)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-pm-signed

for you to fetch changes up to fce680e9faaa8acc0ab0a931c5fa823b581cbab0:

  Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm (2012-10-08 15:57:41 -0700)

----------------------------------------------------------------

>From Kevin Hilman <khilman@deeprootsystems.com>:

OMAP PM related fixes for v3.7-rc

----------------------------------------------------------------
Jean Pihet (2):
      ARM: OMAP: SmartReflex: select CONFIG_POWER_SUPPLY in Kconfig
      ARM: OMAP: SmartReflex: fix error path in init function

Tony Lindgren (1):
      Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm

Wei Yongjun (4):
      ARM: OMAP: fix return value check in beagle_opp_init()
      ARM: OMAP: omap_device: fix return value check in omap_device_build_ss()
      ARM: OMAP2+: SmartReflex: fix return value check in sr_dev_init()
      ARM: OMAP2+: PM: fix return value check in omap2_set_init_voltage()

 arch/arm/mach-omap2/board-omap3beagle.c |    2 +-
 arch/arm/mach-omap2/pm.c                |    2 +-
 arch/arm/mach-omap2/sr_device.c         |    2 +-
 arch/arm/plat-omap/Kconfig              |    1 +
 arch/arm/plat-omap/omap_device.c        |    2 +-
 drivers/power/avs/smartreflex.c         |    8 ++++----
 6 files changed, 9 insertions(+), 8 deletions(-)

[GIT PULL 2/5] omap hwmod and clock fixes for v3.7-rc1

[Tony Lindgren]

The following changes since commit 0e51793e162ca432fc5f04178cf82b80a92c2659:

  Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (2012-10-07 21:20:57 +0900)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3

for you to fetch changes up to eb20f31f6e7d3ac19738e5a45df9b09b25381e73:

  Merge tag 'omap-fixes-a-for-pre3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock (2012-10-09 11:07:29 -0700)

----------------------------------------------------------------

>From Paul Walmsley <paul@pwsan.com>:

Some OMAP fixes for the 3.7 merge window, fixing mismerges, branch
integration issues, and bugs after the arm-soc merges.

----------------------------------------------------------------
Jon Hunter (2):
      ARM: OMAP2+: hwmod data: Fix PMU interrupt definitions
      ARM: OMAP3: fix workaround for EMU clockdomain

Paul Walmsley (2):
      ARM: OMAP: omap3evm: fix new sparse warning
      ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling

Tony Lindgren (1):
      Merge tag 'omap-fixes-a-for-pre3.7' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock

Vaibhav Hiremath (1):
      ARM: am33xx: clk: Update clkdev table to add mcasp alias

 arch/arm/mach-omap2/board-omap3evm.c               |    3 +-
 arch/arm/mach-omap2/clock33xx_data.c               |    2 +
 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c         |   44 ++++++++++----------
 arch/arm/mach-omap2/omap_hwmod.c                   |   31 ++++++++++++--
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |    2 +-
 6 files changed, 54 insertions(+), 30 deletions(-)

[GIT PULL 4/5] omap cpufreq fixes for v3.7-rc1

[Tony Lindgren]

The following changes since commit 5e090ed7af10729a396a25df43d69a236e789736:

  Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2012-10-07 20:55:16 +0900)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-cpufreq-signed

for you to fetch changes up to 37fedb4c423ab78639e65a7c15d2f23cb412aa7e:

  Merge tag 'for_3.7-fixes-cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-cpufreq (2012-10-08 15:54:14 -0700)

----------------------------------------------------------------

These were agreed to be merged via arm soc tree as Rafael
is on vacation.

>From Kevin Hilman <khilman@deeprootsystems.com>:

This series a couple bug fixes and a couple fixes that make this
driver support recently added OMAP-based SoCs.

The 'get_cpu_device' patch is needed due to a change in the OMAP
OMAP PM core code which enforces use of get_cpu_device() instead of
a deprecated OMAP-specific API.

The usage of plat/*.h headers breaks single zImage, so platforms are
cleaning up and/or removing plat/*.h so the driver needs to be fixed
accordingly.

This series is based on the merge of Rafael's pm-for-3.7-rc1 tag into
Linus' master branch: commit 16642a2e7be23bbda013fc32d8f6c68982eab603.

----------------------------------------------------------------
Kevin Hilman (4):
      cpufreq: OMAP: ensure valid clock rate before scaling
      cpufreq: OMAP: remove unused <plat/omap-pm.h>
      cpufreq: OMAP: use get_cpu_device() instead of omap_device API
      ARM: OMAP2+: PM: MPU DVFS: use generic CPU device for MPU-SS

Paul Walmsley (1):
      cpufreq: OMAP: fix clock usage to be SoC independent, remove plat/ includes

Tony Lindgren (1):
      Merge tag 'for_3.7-fixes-cpufreq' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-cpufreq

 arch/arm/mach-omap2/opp.c        |   23 +++++++++++++++++------
 arch/arm/mach-omap2/pm.c         |   11 ++++++++++-
 arch/arm/mach-omap2/twl-common.c |    2 +-
 drivers/cpufreq/omap-cpufreq.c   |   36 ++++++++++++------------------------
 4 files changed, 40 insertions(+), 32 deletions(-)

[GIT PULL 5/5] omap asoc regression fixes for v3.7-rc1

[Tony Lindgren]

The following changes since commit 5e090ed7af10729a396a25df43d69a236e789736:

  Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2012-10-07 20:55:16 +0900)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-asoc-regression-signed

for you to fetch changes up to 8bbacc55ba72368d7fdbad06b63d66bd763a428a:

  ARM/dts: omap5-evm: pinmux configuration for audio (2012-10-08 16:06:28 -0700)

----------------------------------------------------------------
This branch contains regression fixes for omap4/5 ASoC
audio that were caused by the fact that u-boot stopped
muxing non essential pins.

As omap audio and dmaengine development happens on
these platforms, let's make sure they are usable.

Of course this should have been fixed earlier and
not during the -rc cycle.

----------------------------------------------------------------
Peter Ujfalusi (9):
      ARM: OMAP: board-4430-sdp: Pin mux configuration for audio needs
      ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs
      ARM/dts: omap4-panda: Disable unused audio IPs
      ARM/dts: omap4-sdp: Disable unused McBSP3
      ARM/dts: omap5-evm: Disable unused McBSP3
      ARM/dts: omap4-sdp: pinmux configuration for audio
      ARM/dts: omap4-panda: pinmux configuration for audio
      ARM/dts: Add pinctrl driver entries for omap5
      ARM/dts: omap5-evm: pinmux configuration for audio

 arch/arm/boot/dts/omap4-panda.dts      |   47 ++++++++++++++++++++++++++
 arch/arm/boot/dts/omap4-sdp.dts        |   57 +++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap5-evm.dts        |   58 ++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap5.dtsi           |   17 ++++++++++
 arch/arm/mach-omap2/board-4430sdp.c    |   26 ++++++++++++++
 arch/arm/mach-omap2/board-omap4panda.c |   15 +++++++++
 6 files changed, 220 insertions(+)