[GIT PULL 1/7] omap soc fixes for v3.11 merge window

[GIT PULL 1/7] omap soc fixes for v3.11 merge window

[Tony Lindgren]

The following changes since commit 4f288f081bb67813d35c10d1b2fa68e863c4b188:

  ARM: OMAP2+: AM43x: SRAM base and size (2013-06-12 08:07:23 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-part2-signed

for you to fetch changes up to 7bcad170154f1302aeeced4f236588091a261fbf:

  ARM: OMAP3+: am33xx id: Add new am33xx specific function to check dev_feature (2013-06-18 03:04:07 -0700)

----------------------------------------------------------------
Fix am43x minimal booting as I accidentally left out one
patch from the already merged omap-for-v3.11/soc-signed branch.
Also fixes for ti81x booting and  revision check updates.

These are based on omap-for-v3.11/soc-signed because of the
am43x dependency to earlier patches.

----------------------------------------------------------------
Afzal Mohammed (1):
      ARM: OMAP2+: AM43x: basic dt support

Aida Mynzhasova (2):
      ARM: OMAP2: TI81XX: id: Add cpu id for TI816x ES2.0 and ES2.1
      ARM: OMAP: TI816X: add powerdomains for TI816x

Vaibhav Hiremath (1):
      ARM: OMAP3+: am33xx id: Add new am33xx specific function to check dev_feature

 arch/arm/mach-omap2/board-generic.c         | 16 ++++++++
 arch/arm/mach-omap2/control.h               |  4 ++
 arch/arm/mach-omap2/id.c                    | 24 ++++++++++-
 arch/arm/mach-omap2/io.c                    |  2 +-
 arch/arm/mach-omap2/powerdomains3xxx_data.c | 62 +++++++++++++++++++++++++++++
 arch/arm/mach-omap2/prcm-common.h           | 11 +++++
 arch/arm/mach-omap2/soc.h                   |  3 ++
 arch/arm/mach-omap2/timer.c                 |  2 +-
 8 files changed, 120 insertions(+), 4 deletions(-)

[GIT PULL 3/7] omap voltdomain clean-up for v3.11 merge window

[Tony Lindgren]

The following changes since commit 7d132055814ef17a6c7b69f342244c410a5e000f:

  Linux 3.10-rc6 (2013-06-15 11:51:07 -1000)

are available in the git repository at:

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

for you to fetch changes up to 8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54:

  Merge tag 'omap-pm-v3.11/voltdm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm-voltdomain (2013-06-18 01:08:39 -0700)

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

PM voltage domain clean-up via Kevin Hilman <khilman@linaro.org>:

OMAP: PM: remove requirement for voltage domain data; remove dummy data

----------------------------------------------------------------
Rajendra Nayak (2):
      ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm associated to a pwrdm
      ARM: AM33xx: Remove the unused voltagedomain data

Tony Lindgren (1):
      Merge tag 'omap-pm-v3.11/voltdm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.11/pm-voltdomain

 arch/arm/mach-omap2/Makefile                  |  1 -
 arch/arm/mach-omap2/io.c                      |  1 -
 arch/arm/mach-omap2/powerdomain.c             |  5 ++++
 arch/arm/mach-omap2/powerdomain.h             |  2 ++
 arch/arm/mach-omap2/prm33xx.c                 |  7 +++++
 arch/arm/mach-omap2/voltage.h                 |  1 -
 arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 ---------------------------
 7 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/voltagedomains33xx_data.c

[GIT PULL 2/7] omap serial pm cleanup for v3.11 merge window

[Tony Lindgren]

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

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

for you to fetch changes up to 1e383d7bdd988b1453a3a86f5e14b012700f7dff:

  Merge tag 'omap-pm-v3.11/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm-serial (2013-06-17 04:03:14 -0700)

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

Serial driver platform init code clean-up via Kevin Hilman <khilman@linaro.org>:

OMAP: PM: the serial core + driver can no handle no_console_suspend support
without any SoC specific handlding or SoC-specific DT bindings.  Remove
the now unused SoC specifics for OMAP.

----------------------------------------------------------------
Sourav Poddar (3):
      arm: omap2+: serial: remove no_console_suspend support
      arm: dts: am33xx: Remove "ti,no_idle_on_suspend" property.
      arm: omap2+: omap_device: remove no_idle_on_suspend

Tony Lindgren (1):
      Merge tag 'omap-pm-v3.11/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.11/pm-serial

 arch/arm/boot/dts/am33xx.dtsi     |  1 -
 arch/arm/mach-omap2/omap_device.c |  9 ++-------
 arch/arm/mach-omap2/omap_device.h | 10 ----------
 arch/arm/mach-omap2/serial.c      |  7 -------
 4 files changed, 2 insertions(+), 25 deletions(-)

[GIT PULL 5/7] omap board changes for v3.11 merge window

[Tony Lindgren]

The following changes since commit 7d132055814ef17a6c7b69f342244c410a5e000f:

  Linux 3.10-rc6 (2013-06-15 11:51:07 -1000)

are available in the git repository at:

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

for you to fetch changes up to 45853507c9362b0bd606b37e8c7c7e7551caa78b:

  ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV (2013-06-18 03:19:07 -0700)

----------------------------------------------------------------
Minor board changes for v3.11 merge window. These are
tapering down finally as we're getting closer to making
omap2+ DT only.

----------------------------------------------------------------
Aaro Koskinen (1):
      ARM: OMAP1: nokia770: enable Tahvo

Adrien Verg (1):
      ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV

Florian Vaussard (1):
      arm: omap: board-overo: reset GPIO for SMSC911x

Lokesh Vutla (1):
      ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN

 arch/arm/configs/omap2plus_defconfig |  2 ++
 arch/arm/mach-omap1/board-nokia770.c | 10 ++++++++++
 arch/arm/mach-omap2/board-omap3evm.c |  4 ++++
 arch/arm/mach-omap2/board-overo.c    |  3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

[GIT PULL 4/7] omap dma clean-up for v3.11 merge window

[Tony Lindgren]

The following changes since commit 7d132055814ef17a6c7b69f342244c410a5e000f:

  Linux 3.10-rc6 (2013-06-15 11:51:07 -1000)

are available in the git repository at:

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

for you to fetch changes up to e2081f96ba1be3aa22a44daec82af9b226a6d7d6:

  ARM: OMAP1: Remove dma.h (2013-06-18 00:12:34 -0700)

----------------------------------------------------------------
Non-critical omap DMA fixes and removal of unused legacy code.

----------------------------------------------------------------
Jarkko Nikula (8):
      ARM: OMAP2+: Remove AES crypto device DMA channel definitions
      ARM: OMAP2+: Remove duplicated DMA channel definitions
      ARM: OMAP2+: hwmod: Remove remaining DMA channel definitions
      ARM: OMAP2+: Remove dma.h
      ARM: OMAP1: Remove McBSP DMA channel definitions
      ARM: OMAP1: Remove duplicated DMA channel definitions
      ARM: OMAP1: Remove legacy irda.h and irda setup from board files
      ARM: OMAP1: Remove dma.h

R Sricharan (2):
      ARM: OMAP: dma: Remove the wrong dev_id check
      ARM: OMAP: dma: Fix the dma_chan_link_map init order

Rajendra Nayak (1):
      ARM: OMAP: dma: Remove the erroneous freeing of platform data

 arch/arm/mach-omap1/board-h2.c                     | 36 -------------
 arch/arm/mach-omap1/board-palmte.c                 | 31 -----------
 arch/arm/mach-omap1/board-palmtt.c                 | 30 -----------
 arch/arm/mach-omap1/board-palmz71.c                | 31 -----------
 arch/arm/mach-omap1/board-sx1.c                    | 36 -------------
 arch/arm/mach-omap1/devices.c                      |  9 ++--
 arch/arm/mach-omap1/dma.c                          |  2 -
 arch/arm/mach-omap1/dma.h                          | 42 ---------------
 arch/arm/mach-omap1/include/mach/irda.h            | 33 ------------
 arch/arm/mach-omap1/lcd_dma.c                      |  2 -
 arch/arm/mach-omap1/mcbsp.c                        | 33 ++++++------
 arch/arm/mach-omap2/devices.c                      |  1 -
 arch/arm/mach-omap2/dma.h                          | 61 ----------------------
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 21 ++++----
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         | 19 ++++---
 arch/arm/plat-omap/dma.c                           | 11 ++--
 16 files changed, 43 insertions(+), 355 deletions(-)
 delete mode 100644 arch/arm/mach-omap1/dma.h
 delete mode 100644 arch/arm/mach-omap1/include/mach/irda.h
 delete mode 100644 arch/arm/mach-omap2/dma.h

[GIT PULL 6/7] omap gpmc reworked suspend patch for v3.11 merge window

[Tony Lindgren]

The following changes since commit b3f5525c55ce5cb67af06f04dbbf28358da23a2c:

  ARM: OMAP2+: gpmc: Converts GPMC driver to pm_runtime capable (2013-06-12 09:56:30 -0700)

are available in the git repository at:

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

for you to fetch changes up to b536dd412b4364df2f9495c6550ee38f6ad3b0fe:

  ARM: OMAP2+: gpmc: Low power transition support (2013-06-18 03:46:39 -0700)

----------------------------------------------------------------
GPMC suspend patch that was left out of the earlier
omap-for-v3.11/gpmc-signed branch because of a compile error
it caused. The compile error is fixed in this version.

----------------------------------------------------------------
avinash philip (1):
      ARM: OMAP2+: gpmc: Low power transition support

 arch/arm/mach-omap2/gpmc.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

[GIT PULL 7/7] omap mailbox move to drivers for v3.11 merge window

[Tony Lindgren]

The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:

  Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)

are available in the git repository at:

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

for you to fetch changes up to d2e993289cc5f1780ce74188e3a8d2b404748397:

  Merge tag 'omap-mailbox-for-v3.11' of git://github.com/sumananna/mailbox into omap-for-v3.11/mailbox (2013-06-17 03:51:54 -0700)

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

Move OMAP Mailbox framework to drivers via Suman Anna <s-anna@ti.com>

The OMAP Mailbox driver framework is moved out of arch/arm folder
into drivers/mailbox folder, to re-enable building it and also serve
as a baseline for adapting to the new mailbox driver framework. The
changes mainly contain:
  - a minor bug fix and cleanup of mach-specific mailbox code
  - remove any header dependencies from plat-omap for multi-platform
    support
  - represent mailbox device data through platform data/hwmod attrs
  - move the omap mailbox code out of plat-omap/mach-omapX to
    drivers/mailbox folder

----------------------------------------------------------------
Suman Anna (6):
      omap: mailbox: check iomem resource before dereferencing it
      omap: mailbox: call request_irq after mbox queues are allocated
      omap: mailbox: correct the argument type for irq ops
      ARM: OMAP2+: mbox: remove dependencies with soc.h
      ARM: OMAP2+: add user and fifo info to mailbox platform data
      mailbox/omap: move the OMAP mailbox framework to drivers

Tony Lindgren (1):
      Merge tag 'omap-mailbox-for-v3.11' of git://github.com/sumananna/mailbox into omap-for-v3.11/mailbox

 arch/arm/configs/omap1_defconfig                   |   3 +-
 arch/arm/mach-omap1/Makefile                       |   4 -
 arch/arm/mach-omap2/Makefile                       |   3 -
 arch/arm/mach-omap2/devices.c                      |  13 +-
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |  14 ++
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |  13 +
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |  13 +
 arch/arm/plat-omap/Kconfig                         |  16 --
 arch/arm/plat-omap/Makefile                        |   3 -
 drivers/mailbox/Kconfig                            |  34 +++
 drivers/mailbox/Makefile                           |   6 +
 .../mailbox.c => drivers/mailbox/mailbox-omap1.c   |  12 +-
 .../mailbox.c => drivers/mailbox/mailbox-omap2.c   | 276 ++++++++-------------
 .../mailbox.c => drivers/mailbox/omap-mailbox.c    |  54 +++-
 .../plat/mailbox.h => drivers/mailbox/omap-mbox.h  |  70 ++----
 drivers/remoteproc/Kconfig                         |   3 +-
 drivers/remoteproc/omap_remoteproc.c               |   2 +-
 drivers/staging/tidspbridge/Kconfig                |   3 +-
 .../tidspbridge/include/dspbridge/host_os.h        |   2 +-
 include/linux/omap-mailbox.h                       |  29 +++
 include/linux/platform_data/mailbox-omap.h         |  58 +++++
 21 files changed, 355 insertions(+), 276 deletions(-)
 rename arch/arm/mach-omap1/mailbox.c => drivers/mailbox/mailbox-omap1.c (94%)
 rename arch/arm/mach-omap2/mailbox.c => drivers/mailbox/mailbox-omap2.c (59%)
 rename arch/arm/plat-omap/mailbox.c => drivers/mailbox/omap-mailbox.c (92%)
 rename arch/arm/plat-omap/include/plat/mailbox.h => drivers/mailbox/omap-mbox.h (54%)
 create mode 100644 include/linux/omap-mailbox.h
 create mode 100644 include/linux/platform_data/mailbox-omap.h

[GIT PULL 1/7] omap soc fixes for v3.11 merge window

[Arnd Bergmann]

On Tuesday 18 June 2013, Tony Lindgren wrote:
> The following changes since commit 4f288f081bb67813d35c10d1b2fa68e863c4b188:
> 
>   ARM: OMAP2+: AM43x: SRAM base and size (2013-06-12 08:07:23 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-part2-signed
> 
> for you to fetch changes up to 7bcad170154f1302aeeced4f236588091a261fbf:
> 
>   ARM: OMAP3+: am33xx id: Add new am33xx specific function to check dev_feature (2013-06-18 03:04:07 -0700)
> 
> ----------------------------------------------------------------
> Fix am43x minimal booting as I accidentally left out one
> patch from the already merged omap-for-v3.11/soc-signed branch.
> Also fixes for ti81x booting and  revision check updates.
> 
> These are based on omap-for-v3.11/soc-signed because of the
> am43x dependency to earlier patches.
> 

Pulled into next/soc, thanks!

	Arnd

[GIT PULL 4/7] omap dma clean-up for v3.11 merge window

[Arnd Bergmann]

On Tuesday 18 June 2013, Tony Lindgren wrote:
> The following changes since commit 7d132055814ef17a6c7b69f342244c410a5e000f:
> 
>   Linux 3.10-rc6 (2013-06-15 11:51:07 -1000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/dma-signed
> 
> for you to fetch changes up to e2081f96ba1be3aa22a44daec82af9b226a6d7d6:
> 
>   ARM: OMAP1: Remove dma.h (2013-06-18 00:12:34 -0700)
> 
> ----------------------------------------------------------------
> Non-critical omap DMA fixes and removal of unused legacy code.

Pulled into next/cleanup, thanks!

	Arnd