Skip to contentSkip to conversation

omap non-critical fixes for v3.9 merge window

GIT PULL Tony Lindgren 1 participant 7 messages Feb 4, 2013

lore
Share & tools
lore
#0 lore raw

The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:

Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/fixes-non-critical-signed-v2

for you to fetch changes up to c8d4bafe503ca767bbc8f3c54e4acd344ef26346:

ARM: OMAP2+: using strlcpy instead of strncpy (2013-02-04 10:17:37 -0800)

----------------------------------------------------------------
Few fixes for v3.9 merge window that are not urgent for the -rc series.

----------------------------------------------------------------
Chen Gang (2):
ARM: OMAP: Fix the use of uninitialized dma_lch_count
ARM: OMAP2+: using strlcpy instead of strncpy

Jon Hunter (1):
ARM: OMAP2+: Fix selection of clockevent timer when using device-tree

Thomas Gleixner (1):
ARM: OMAP: make wakeupgen_lock raw

 arch/arm/mach-omap2/omap-wakeupgen.c | 14 +++++++-------
 arch/arm/mach-omap2/timer.c          |  2 +-
 arch/arm/mach-omap2/twl-common.c     |  3 ++-
 arch/arm/plat-omap/dma.c             |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
#1 lore raw

[GIT PULL 2/4] omap gpmc changes for v3.9 merge window

The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:

Linux 3.8-rc3 (2013-01-09 18:59:55 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/gpmc-signed

for you to fetch changes up to 97c794a1e37b1ca128ef38f17c069186bfa5fb1b:

ARM: OMAP2+: gpmc: Add device tree documentation for elm handle (2013-02-01 14:32:03 -0800)

----------------------------------------------------------------
OMAP GPMC (General Purpose Memory Controller) changes to add device tree bindings.

----------------------------------------------------------------
Daniel Mack (5):
ARM: OMAP: gpmc: don't create devices from initcall on DT
mtd: omap-nand: pass device_node in platform data
ARM: OMAP: gpmc-nand: drop __init annotation
ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND

Ezequiel Garcia (4):
ARM: OMAP2+: gpmc: Remove unneeded of_node_put()
mtd: omap-onenand: pass device_node in platform data
ARM: OMAP2+: gpmc-onenand: drop __init annotation
ARM: OMAP2+: gpmc: add DT bindings for OneNAND

Jon Hunter (1):
ARM: OMAP2+: Prevent potential crash if GPMC probe fails

Philip Avinash (1):
ARM: OMAP2+: gpmc: Add device tree documentation for elm handle

 Documentation/devicetree/bindings/bus/ti-gpmc.txt  |  84 ++++++++
 .../devicetree/bindings/mtd/gpmc-nand.txt          |  80 +++++++
 .../devicetree/bindings/mtd/gpmc-onenand.txt       |  43 ++++
 arch/arm/mach-omap2/gpmc-nand.c                    |  15 +-
 arch/arm/mach-omap2/gpmc-onenand.c                 |   2 +-
 arch/arm/mach-omap2/gpmc.c                         | 232 ++++++++++++++++++++-
 drivers/mtd/nand/omap2.c                           |   4 +-
 drivers/mtd/onenand/omap2.c                        |   4 +-
 include/linux/platform_data/mtd-nand-omap2.h       |   4 +-
 include/linux/platform_data/mtd-onenand-omap2.h    |   3 +
 10 files changed, 459 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/bus/ti-gpmc.txt
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txt
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt
#2 lore raw

[GIT PULL 2/4] omap gpmc changes for v3.9 merge window

In reply to Tony Lindgren

The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:

Linux 3.8-rc3 (2013-01-09 18:59:55 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/gpmc-signed

for you to fetch changes up to 97c794a1e37b1ca128ef38f17c069186bfa5fb1b:

ARM: OMAP2+: gpmc: Add device tree documentation for elm handle (2013-02-01 14:32:03 -0800)

----------------------------------------------------------------
OMAP GPMC (General Purpose Memory Controller) changes to add device tree bindings.

----------------------------------------------------------------
Daniel Mack (5):
ARM: OMAP: gpmc: don't create devices from initcall on DT
mtd: omap-nand: pass device_node in platform data
ARM: OMAP: gpmc-nand: drop __init annotation
ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND

Ezequiel Garcia (4):
ARM: OMAP2+: gpmc: Remove unneeded of_node_put()
mtd: omap-onenand: pass device_node in platform data
ARM: OMAP2+: gpmc-onenand: drop __init annotation
ARM: OMAP2+: gpmc: add DT bindings for OneNAND

Jon Hunter (1):
ARM: OMAP2+: Prevent potential crash if GPMC probe fails

Philip Avinash (1):
ARM: OMAP2+: gpmc: Add device tree documentation for elm handle

 Documentation/devicetree/bindings/bus/ti-gpmc.txt  |  84 ++++++++
 .../devicetree/bindings/mtd/gpmc-nand.txt          |  80 +++++++
 .../devicetree/bindings/mtd/gpmc-onenand.txt       |  43 ++++
 arch/arm/mach-omap2/gpmc-nand.c                    |  15 +-
 arch/arm/mach-omap2/gpmc-onenand.c                 |   2 +-
 arch/arm/mach-omap2/gpmc.c                         | 232 ++++++++++++++++++++-
 drivers/mtd/nand/omap2.c                           |   4 +-
 drivers/mtd/onenand/omap2.c                        |   4 +-
 include/linux/platform_data/mtd-nand-omap2.h       |   4 +-
 include/linux/platform_data/mtd-onenand-omap2.h    |   3 +
 10 files changed, 459 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/bus/ti-gpmc.txt
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txt
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt
#3 lore raw

[GIT PULL 4/4] omap board changes for v3.9 merge window

In reply to Tony Lindgren

The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:

Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/board-signed

for you to fetch changes up to 7dc0f27ea43151889ae762d321e4068dd90cd9e2:

ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc (2013-02-01 14:59:35 -0800)

----------------------------------------------------------------
Minimal updates to OMAP board-*.c files while converting things to device tree based booting.

----------------------------------------------------------------
Aaro Koskinen (1):
ARM: OMAP1: nokia770: enable CBUS/Retu

AnilKumar Ch (1):
ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers

Igor Grinberg (1):
ARM: OMAP3: cm-t3517: add MMC support

Javier Martinez Canillas (3):
ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator

Kim Milo (2):
ARM: OMAP2+: craneboard: support NAND device
ARM: OMAP2+: craneboard: support the TPS65910 PMU

Kyungmin Park (1):
ARM: OMAP2+: Remove apollon board support

Mark Jackson (1):
ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc

Pali Rohr (2):

      RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
      RX-51: Register twl4030-madc device
 arch/arm/configs/omap2plus_defconfig             |  25 ++
 arch/arm/mach-omap1/board-nokia770.c             |  43 +++
 arch/arm/mach-omap2/Kconfig                      |   6 -
 arch/arm/mach-omap2/Makefile                     |   1 -
 arch/arm/mach-omap2/board-am3517crane.c          |  59 ++++
 arch/arm/mach-omap2/board-apollon.c              | 342 -----------------------
 arch/arm/mach-omap2/board-cm-t3517.c             |  27 ++
 arch/arm/mach-omap2/board-igep0020.c             |  16 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c     |  20 ++
 arch/arm/mach-omap2/gpmc.c                       |   3 -
 drivers/video/omap2/displays/panel-generic-dpi.c |  24 --
 11 files changed, 182 insertions(+), 384 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/board-apollon.c
#4 lore raw

[GIT PULL 3/4] omap PM changes for v3.9 merge window

In reply to Tony Lindgren

The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:

Linux 3.8-rc5 (2013-01-25 11:57:28 -0800)

are available in the git repository at:

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

for you to fetch changes up to 0e084c9c843320995b0e219f02880f910d439b37:

Merge tag 'omap-cleanup-b-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm (2013-01-30 14:03:05 -0800)

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

OMAP PM related updates via Paul Walmsley <[email protected]>:

Remove some dead OMAP clock and device integration code and data. Also, clean up the way that the OMAP device integration code blocks WFI/WFE to use a consistent mechanism, controlled by a data flag.

Several OMAP2+ power management fixes, optimizations, and cleanup. This series is a prerequisite for the functional powerdomain conversion series.

----------------------------------------------------------------
Jean Pihet (1):
ARM: OMAP2+: powerdomain: fix powerdomain trace integration

Paul Walmsley (19):
ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code
ARM: OMAP4: clock/hwmod data: start to remove some IP block control "clocks"
ARM: OMAP4: clock/hwmod data: remove MODULEMODE entries in mux + gate combos
ARM: OMAP2xxx: clock data: clean up unused null clocks
ARM: OMAP2xxx: powerdomain: core powerdomain missing logic retention states
ARM: OMAP3xxx: CPUIdle: simplify the PER next-state code
ARM: OMAP2+: hwmod: add support for blocking WFI when a device is active
ARM: OMAP2420: hwmod data/PM: use hwmod to block WFI when I2C active
ARM: OMAP3xxx: CPUIdle: optimize __omap3_enter_idle()
ARM: OMAP4: MPUSS PM: remove unnecessary shim functions for powerdomain control
ARM: OMAP2+: clockdomain: add pwrdm_state_switch() call to clkdm_sleep()
ARM: OMAP2xxx: PM: clean up some crufty powerstate programming code
ARM: OMAP2: PM/powerdomain: drop unnecessary pwrdm_wait_transition()
ARM: OMAP2+: PM/powerdomain: move omap_set_pwrdm_state() to powerdomain code
ARM: OMAP2+: powerdomain/clockdomain: add a per-powerdomain spinlock
ARM: OMAP2xxx: CM: remove autodep handling
ARM: OMAP2+: clockdomain: work on wkdep/sleepdep functions
ARM: OMAP2+: clockdomain: convert existing atomic usecounts into spinlock-protected shorts/ints
ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments

Tony Lindgren (2):

      Merge tag 'omap-cleanup-a-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/pm
      Merge tag 'omap-cleanup-b-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/pm
 arch/arm/mach-omap2/am35xx-emac.c                |   2 +-
 arch/arm/mach-omap2/cclock2420_data.c            |  16 +-
 arch/arm/mach-omap2/cclock2430_data.c            |  16 +-
 arch/arm/mach-omap2/cclock44xx_data.c            | 578 +++++------------------
 arch/arm/mach-omap2/clockdomain.c                | 569 ++++++++++++++--------
 arch/arm/mach-omap2/clockdomain.h                |  17 +-
 arch/arm/mach-omap2/cm2xxx.c                     |  33 +-
 arch/arm/mach-omap2/cm3xxx.c                     |  14 +-
 arch/arm/mach-omap2/cminst44xx.c                 |   2 +-
 arch/arm/mach-omap2/cpuidle34xx.c                |  79 ++--
 arch/arm/mach-omap2/devices.c                    |  25 +-
 arch/arm/mach-omap2/display.c                    |   2 +-
 arch/arm/mach-omap2/dma.c                        |   2 +-
 arch/arm/mach-omap2/drm.c                        |   3 +-
 arch/arm/mach-omap2/gpio.c                       |   3 +-
 arch/arm/mach-omap2/gpmc.c                       |   2 +-
 arch/arm/mach-omap2/hdq1w.c                      |   2 +-
 arch/arm/mach-omap2/hsmmc.c                      |   2 +-
 arch/arm/mach-omap2/hwspinlock.c                 |   3 +-
 arch/arm/mach-omap2/i2c.c                        |   3 +-
 arch/arm/mach-omap2/mcbsp.c                      |   2 +-
 arch/arm/mach-omap2/msdi.c                       |   2 +-
 arch/arm/mach-omap2/omap-iommu.c                 |   3 +-
 arch/arm/mach-omap2/omap-mpuss-lowpower.c        |  44 +-
 arch/arm/mach-omap2/omap_device.c                | 537 +++------------------
 arch/arm/mach-omap2/omap_device.h                |  79 +---
 arch/arm/mach-omap2/omap_hwmod.c                 |   8 +
 arch/arm/mach-omap2/omap_hwmod.h                 |   9 +
 arch/arm/mach-omap2/omap_hwmod_2420_data.c       |   7 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c       |  99 ++--
 arch/arm/mach-omap2/pm-debug.c                   |   6 +-
 arch/arm/mach-omap2/pm.c                         |  69 +--
 arch/arm/mach-omap2/pm.h                         |   1 -
 arch/arm/mach-omap2/pm24xx.c                     |  43 +-
 arch/arm/mach-omap2/pmu.c                        |   3 +-
 arch/arm/mach-omap2/powerdomain.c                | 232 +++++++--
 arch/arm/mach-omap2/powerdomain.h                |  52 +-
 arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c |   4 +-
 arch/arm/mach-omap2/powerdomains2xxx_data.c      |   9 +-
 arch/arm/mach-omap2/powerdomains3xxx_data.c      |  44 +-
 arch/arm/mach-omap2/prm2xxx_3xxx.c               |   3 +-
 arch/arm/mach-omap2/serial.c                     |   3 +-
 arch/arm/mach-omap2/sr_device.c                  |   3 +-
 arch/arm/mach-omap2/timer.c                      |   3 +-
 arch/arm/mach-omap2/usb-host.c                   |  16 +-
 arch/arm/mach-omap2/usb-musb.c                   |   2 +-
 arch/arm/mach-omap2/wd_timer.c                   |   3 +-
 47 files changed, 1002 insertions(+), 1657 deletions(-)
#5 lore raw

[GIT PULL 4/4] omap board changes for v3.9 merge window

In reply to Tony Lindgren

The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:

Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/board-signed

for you to fetch changes up to 7dc0f27ea43151889ae762d321e4068dd90cd9e2:

ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc (2013-02-01 14:59:35 -0800)

----------------------------------------------------------------
Minimal updates to OMAP board-*.c files while converting things to device tree based booting.

----------------------------------------------------------------
Aaro Koskinen (1):
ARM: OMAP1: nokia770: enable CBUS/Retu

AnilKumar Ch (1):
ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers

Igor Grinberg (1):
ARM: OMAP3: cm-t3517: add MMC support

Javier Martinez Canillas (3):
ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator

Kim Milo (2):
ARM: OMAP2+: craneboard: support NAND device
ARM: OMAP2+: craneboard: support the TPS65910 PMU

Kyungmin Park (1):
ARM: OMAP2+: Remove apollon board support

Mark Jackson (1):
ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc

Pali Rohr (2):

      RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
      RX-51: Register twl4030-madc device
 arch/arm/configs/omap2plus_defconfig             |  25 ++
 arch/arm/mach-omap1/board-nokia770.c             |  43 +++
 arch/arm/mach-omap2/Kconfig                      |   6 -
 arch/arm/mach-omap2/Makefile                     |   1 -
 arch/arm/mach-omap2/board-am3517crane.c          |  59 ++++
 arch/arm/mach-omap2/board-apollon.c              | 342 -----------------------
 arch/arm/mach-omap2/board-cm-t3517.c             |  27 ++
 arch/arm/mach-omap2/board-igep0020.c             |  16 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c     |  20 ++
 arch/arm/mach-omap2/gpmc.c                       |   3 -
 drivers/video/omap2/displays/panel-generic-dpi.c |  24 --
 11 files changed, 182 insertions(+), 384 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/board-apollon.c
#6 lore raw

[GIT PULL 3/4] omap PM changes for v3.9 merge window

In reply to Tony Lindgren

The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:

Linux 3.8-rc5 (2013-01-25 11:57:28 -0800)

are available in the git repository at:

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

for you to fetch changes up to 0e084c9c843320995b0e219f02880f910d439b37:

Merge tag 'omap-cleanup-b-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm (2013-01-30 14:03:05 -0800)

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

OMAP PM related updates via Paul Walmsley <[email protected]>:

Remove some dead OMAP clock and device integration code and data. Also, clean up the way that the OMAP device integration code blocks WFI/WFE to use a consistent mechanism, controlled by a data flag.

Several OMAP2+ power management fixes, optimizations, and cleanup. This series is a prerequisite for the functional powerdomain conversion series.

----------------------------------------------------------------
Jean Pihet (1):
ARM: OMAP2+: powerdomain: fix powerdomain trace integration

Paul Walmsley (19):
ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code
ARM: OMAP4: clock/hwmod data: start to remove some IP block control "clocks"
ARM: OMAP4: clock/hwmod data: remove MODULEMODE entries in mux + gate combos
ARM: OMAP2xxx: clock data: clean up unused null clocks
ARM: OMAP2xxx: powerdomain: core powerdomain missing logic retention states
ARM: OMAP3xxx: CPUIdle: simplify the PER next-state code
ARM: OMAP2+: hwmod: add support for blocking WFI when a device is active
ARM: OMAP2420: hwmod data/PM: use hwmod to block WFI when I2C active
ARM: OMAP3xxx: CPUIdle: optimize __omap3_enter_idle()
ARM: OMAP4: MPUSS PM: remove unnecessary shim functions for powerdomain control
ARM: OMAP2+: clockdomain: add pwrdm_state_switch() call to clkdm_sleep()
ARM: OMAP2xxx: PM: clean up some crufty powerstate programming code
ARM: OMAP2: PM/powerdomain: drop unnecessary pwrdm_wait_transition()
ARM: OMAP2+: PM/powerdomain: move omap_set_pwrdm_state() to powerdomain code
ARM: OMAP2+: powerdomain/clockdomain: add a per-powerdomain spinlock
ARM: OMAP2xxx: CM: remove autodep handling
ARM: OMAP2+: clockdomain: work on wkdep/sleepdep functions
ARM: OMAP2+: clockdomain: convert existing atomic usecounts into spinlock-protected shorts/ints
ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments

Tony Lindgren (2):

      Merge tag 'omap-cleanup-a-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/pm
      Merge tag 'omap-cleanup-b-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/pm
 arch/arm/mach-omap2/am35xx-emac.c                |   2 +-
 arch/arm/mach-omap2/cclock2420_data.c            |  16 +-
 arch/arm/mach-omap2/cclock2430_data.c            |  16 +-
 arch/arm/mach-omap2/cclock44xx_data.c            | 578 +++++------------------
 arch/arm/mach-omap2/clockdomain.c                | 569 ++++++++++++++--------
 arch/arm/mach-omap2/clockdomain.h                |  17 +-
 arch/arm/mach-omap2/cm2xxx.c                     |  33 +-
 arch/arm/mach-omap2/cm3xxx.c                     |  14 +-
 arch/arm/mach-omap2/cminst44xx.c                 |   2 +-
 arch/arm/mach-omap2/cpuidle34xx.c                |  79 ++--
 arch/arm/mach-omap2/devices.c                    |  25 +-
 arch/arm/mach-omap2/display.c                    |   2 +-
 arch/arm/mach-omap2/dma.c                        |   2 +-
 arch/arm/mach-omap2/drm.c                        |   3 +-
 arch/arm/mach-omap2/gpio.c                       |   3 +-
 arch/arm/mach-omap2/gpmc.c                       |   2 +-
 arch/arm/mach-omap2/hdq1w.c                      |   2 +-
 arch/arm/mach-omap2/hsmmc.c                      |   2 +-
 arch/arm/mach-omap2/hwspinlock.c                 |   3 +-
 arch/arm/mach-omap2/i2c.c                        |   3 +-
 arch/arm/mach-omap2/mcbsp.c                      |   2 +-
 arch/arm/mach-omap2/msdi.c                       |   2 +-
 arch/arm/mach-omap2/omap-iommu.c                 |   3 +-
 arch/arm/mach-omap2/omap-mpuss-lowpower.c        |  44 +-
 arch/arm/mach-omap2/omap_device.c                | 537 +++------------------
 arch/arm/mach-omap2/omap_device.h                |  79 +---
 arch/arm/mach-omap2/omap_hwmod.c                 |   8 +
 arch/arm/mach-omap2/omap_hwmod.h                 |   9 +
 arch/arm/mach-omap2/omap_hwmod_2420_data.c       |   7 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c       |  99 ++--
 arch/arm/mach-omap2/pm-debug.c                   |   6 +-
 arch/arm/mach-omap2/pm.c                         |  69 +--
 arch/arm/mach-omap2/pm.h                         |   1 -
 arch/arm/mach-omap2/pm24xx.c                     |  43 +-
 arch/arm/mach-omap2/pmu.c                        |   3 +-
 arch/arm/mach-omap2/powerdomain.c                | 232 +++++++--
 arch/arm/mach-omap2/powerdomain.h                |  52 +-
 arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c |   4 +-
 arch/arm/mach-omap2/powerdomains2xxx_data.c      |   9 +-
 arch/arm/mach-omap2/powerdomains3xxx_data.c      |  44 +-
 arch/arm/mach-omap2/prm2xxx_3xxx.c               |   3 +-
 arch/arm/mach-omap2/serial.c                     |   3 +-
 arch/arm/mach-omap2/sr_device.c                  |   3 +-
 arch/arm/mach-omap2/timer.c                      |   3 +-
 arch/arm/mach-omap2/usb-host.c                   |  16 +-
 arch/arm/mach-omap2/usb-musb.c                   |   2 +-
 arch/arm/mach-omap2/wd_timer.c                   |   3 +-
 47 files changed, 1002 insertions(+), 1657 deletions(-)