[GIT PULL 1/4] non-urgent omap fixes for v3.14 merge window

[GIT PULL 1/4] non-urgent omap fixes for v3.14 merge window

[Tony Lindgren]

The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:

  Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/fixes-not-urgent-signed

for you to fetch changes up to bbc28cdbd003be5ceeaf644be3533e898c25da2b:

  ARM: OMAP2+: gpmc: Move legacy GPMC width setting (2014-01-08 09:49:47 -0800)

----------------------------------------------------------------
Some non-urgent fixes to enable am335x features, update documentation,
and to remove unnecessary double initialization for the GPMC code.

----------------------------------------------------------------
Ezequiel Garcia (4):
      ARM: OMAP2+: Select USB PHY for AM335x SoC
      ARM: OMAP2+: gpmc: Move initialization outside the gpmc_t condition
      ARM: OMAP2+: gpmc: Introduce gpmc_set_legacy()
      ARM: OMAP2+: gpmc: Move legacy GPMC width setting

Jyri Sarha (1):
      ARM: OMAP2+: enable AM33xx SOC EVM audio

Nishanth Menon (2):
      Documentation: dt: OMAP: explicitly state SoC compatible strings
      ARM: OMAP2+: board-generic: update SoC compatibility strings

 .../devicetree/bindings/arm/omap/omap.txt          | 53 ++++++++++++++++++++++
 arch/arm/configs/omap2plus_defconfig               |  3 ++
 arch/arm/mach-omap2/board-generic.c                |  7 +++
 arch/arm/mach-omap2/gpmc-nand.c                    | 50 +++++++++++---------
 4 files changed, 91 insertions(+), 22 deletions(-)

[GIT PULL 2/4] omap device tree fixes for v3.14 merge window

[Tony Lindgren]

The following changes since commit adfe9361b236154215d4b0fc8b6d79995394b15c:

  ARM: dts: Add basic devices on am3517-evm (2013-12-08 14:15:46 -0800)

are available in the git repository at:

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

for you to fetch changes up to e37e1cb0ee231ffdc9b5ef1da63a0c7e1077c603:

  ARM: dts: OMAP2: fix interrupt number for rng (2014-01-08 10:24:44 -0800)

----------------------------------------------------------------
Split omap3 core padconf area into two as some of the registers in
the padconf area are not accessible and used for other devices.
Also fix the interrupt number for omap2 RNG, and add basic support
for sbc-3xxx with cm-t3730.

Note that the minor merge conflicts for omap_hwmod_2xxx_ipblock_data.c
can be solved by just dropping the legacy hwmod data for interrupts
for v3.14.

----------------------------------------------------------------
Laurent Pinchart (1):
      ARM: dts: Split omap3 pinmux core device

Suman Anna (1):
      ARM: dts: OMAP2: fix interrupt number for rng

Tony Lindgren (2):
      ARM: dts: Add support for sbc-3xxx with cm-t3730
      ARM: dts: Add omap specific pinctrl defines to use padconf addresses

 arch/arm/boot/dts/Makefile            |   2 +
 arch/arm/boot/dts/omap2.dtsi          |   2 +-
 arch/arm/boot/dts/omap3-beagle-xm.dts |  40 ++++++++-----
 arch/arm/boot/dts/omap3-beagle.dts    |  40 ++++++++-----
 arch/arm/boot/dts/omap3-cm-t3730.dts  | 104 ++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap3-cm-t3x30.dtsi |  95 +++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap3-igep.dtsi     |   2 -
 arch/arm/boot/dts/omap3-igep0020.dts  |  52 +++++++++--------
 arch/arm/boot/dts/omap3-igep0030.dts  |  10 ++--
 arch/arm/boot/dts/omap3-sb-t35.dtsi   |  40 +++++++++++++
 arch/arm/boot/dts/omap3-sbc-t3730.dts |  30 ++++++++++
 arch/arm/boot/dts/omap3-zoom3.dts     |  23 +++++---
 arch/arm/boot/dts/omap3.dtsi          |   2 +-
 arch/arm/boot/dts/omap34xx.dtsi       |  13 +++++
 arch/arm/boot/dts/omap36xx.dtsi       |  11 ++++
 arch/arm/mach-omap2/pdata-quirks.c    |  31 ++++++++++
 include/dt-bindings/pinctrl/omap.h    |  20 +++++++
 17 files changed, 450 insertions(+), 67 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap3-cm-t3730.dts
 create mode 100644 arch/arm/boot/dts/omap3-cm-t3x30.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-sb-t35.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-sbc-t3730.dts

[GIT PULL 3/4] trivial omap big endian changes for v3.14 merge window

[Tony Lindgren]

The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:

  Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)

are available in the git repository at:

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

for you to fetch changes up to fc6ca98c81bf0ea8b46064915b5947b971594101:

  ARM: OMAP: debug-leds: raw read and write endian fix (2014-01-07 16:09:45 -0800)

----------------------------------------------------------------
Trivial search and replace of read and write functions to allow
further patches to make omaps work also in big endian mode.

----------------------------------------------------------------
Victor Kamensky (4):
      ARM: OMAP2+: raw read and write endian fix
      ARM: OMAP: dmtimer: raw read and write endian fix
      ARM: OMAP: counter-32k: raw read and write endian fix
      ARM: OMAP: debug-leds: raw read and write endian fix

 arch/arm/mach-omap2/board-flash.c         |  4 +--
 arch/arm/mach-omap2/clkt2xxx_dpllcore.c   |  2 +-
 arch/arm/mach-omap2/clkt2xxx_osc.c        |  8 +++---
 arch/arm/mach-omap2/clkt2xxx_sys.c        |  2 +-
 arch/arm/mach-omap2/clkt_clksel.c         | 10 ++++----
 arch/arm/mach-omap2/clkt_dpll.c           |  6 ++---
 arch/arm/mach-omap2/clkt_iclk.c           |  8 +++---
 arch/arm/mach-omap2/clock.c               | 16 ++++++------
 arch/arm/mach-omap2/clock36xx.c           |  6 ++---
 arch/arm/mach-omap2/cm2xxx_3xxx.h         |  4 +--
 arch/arm/mach-omap2/cm33xx.c              |  4 +--
 arch/arm/mach-omap2/cm3xxx.c              |  8 +++---
 arch/arm/mach-omap2/cm44xx.c              |  8 +++---
 arch/arm/mach-omap2/cminst44xx.c          |  4 +--
 arch/arm/mach-omap2/control.c             | 20 +++++++--------
 arch/arm/mach-omap2/dma.c                 |  4 +--
 arch/arm/mach-omap2/dpll3xxx.c            | 32 +++++++++++------------
 arch/arm/mach-omap2/dpll44xx.c            | 12 ++++-----
 arch/arm/mach-omap2/gpmc.c                |  8 +++---
 arch/arm/mach-omap2/id.c                  |  2 +-
 arch/arm/mach-omap2/irq.c                 |  4 +--
 arch/arm/mach-omap2/mux.c                 |  8 +++---
 arch/arm/mach-omap2/omap-hotplug.c        |  4 +--
 arch/arm/mach-omap2/omap-mpuss-lowpower.c | 18 ++++++-------
 arch/arm/mach-omap2/omap-smp.c            |  4 +--
 arch/arm/mach-omap2/omap-wakeupgen.c      | 42 +++++++++++++++----------------
 arch/arm/mach-omap2/omap4-common.c        | 16 ++++++------
 arch/arm/mach-omap2/omap_hwmod.c          | 10 ++++----
 arch/arm/mach-omap2/omap_phy_internal.c   |  6 ++---
 arch/arm/mach-omap2/prcm_mpu44xx.c        |  4 +--
 arch/arm/mach-omap2/prm2xxx.h             |  2 +-
 arch/arm/mach-omap2/prm2xxx_3xxx.h        |  4 +--
 arch/arm/mach-omap2/prm33xx.c             |  4 +--
 arch/arm/mach-omap2/prm3xxx.h             |  2 +-
 arch/arm/mach-omap2/prm44xx.c             |  4 +--
 arch/arm/mach-omap2/prminst44xx.c         |  4 +--
 arch/arm/mach-omap2/sdrc.h                |  8 +++---
 arch/arm/mach-omap2/sdrc2xxx.c            |  4 +--
 arch/arm/mach-omap2/sr_device.c           |  2 +-
 arch/arm/mach-omap2/sram.c                | 16 ++++++------
 arch/arm/mach-omap2/timer.c               |  8 +++---
 arch/arm/mach-omap2/vc.c                  |  4 +--
 arch/arm/mach-omap2/wd_timer.c            |  8 +++---
 arch/arm/plat-omap/counter_32k.c          |  6 ++---
 arch/arm/plat-omap/debug-leds.c           | 14 +++++------
 arch/arm/plat-omap/dmtimer.c              |  8 +++---
 arch/arm/plat-omap/include/plat/dmtimer.h | 16 ++++++------
 47 files changed, 199 insertions(+), 199 deletions(-)

[GIT PULL 4/4] GIC crossbar support for v3.14 merge window

[Tony Lindgren]

The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:

  Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)

are available in the git repository at:

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

for you to fetch changes up to 70d4545544853e2d95909b919d4565ff32c3e3c5:

  ARM: DRA: Enable Crossbar IP support for DRA7XX (2014-01-08 09:21:42 -0800)

----------------------------------------------------------------
Add support for GIC crossbar that routes interrupts on newer omaps.

----------------------------------------------------------------
Sricharan R (4):
      irqchip: irq-gic: Add support for routable irqs
      irqchip: crossbar: Add support for Crossbar IP
      ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number
      ARM: DRA: Enable Crossbar IP support for DRA7XX

 Documentation/devicetree/bindings/arm/gic.txt      |   6 +
 .../devicetree/bindings/arm/omap/crossbar.txt      |  27 +++
 arch/arm/mach-omap2/Kconfig                        |   1 +
 arch/arm/mach-omap2/omap-wakeupgen.c               |   4 +-
 arch/arm/mach-omap2/omap4-common.c                 |   4 +
 drivers/irqchip/Kconfig                            |   8 +
 drivers/irqchip/Makefile                           |   1 +
 drivers/irqchip/irq-crossbar.c                     | 208 +++++++++++++++++++++
 drivers/irqchip/irq-gic.c                          |  82 +++++++-
 include/linux/irqchip/arm-gic.h                    |   7 +-
 include/linux/irqchip/irq-crossbar.h               |  11 ++
 11 files changed, 346 insertions(+), 13 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/omap/crossbar.txt
 create mode 100644 drivers/irqchip/irq-crossbar.c
 create mode 100644 include/linux/irqchip/irq-crossbar.h

Re: [GIT PULL 1/4] non-urgent omap fixes for v3.14 merge window

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:
>
>   Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/fixes-not-urgent-signed
>
> for you to fetch changes up to bbc28cdbd003be5ceeaf644be3533e898c25da2b:
>
>   ARM: OMAP2+: gpmc: Move legacy GPMC width setting (2014-01-08 09:49:47 -0800)
>
> ----------------------------------------------------------------
> Some non-urgent fixes to enable am335x features, update documentation,
> and to remove unnecessary double initialization for the GPMC code.
>
> ----------------------------------------------------------------

Thanks, adding to next/fixes-non-critical.

Kevin

Re: [GIT PULL 2/4] omap device tree fixes for v3.14 merge window

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> The following changes since commit adfe9361b236154215d4b0fc8b6d79995394b15c:
>
>   ARM: dts: Add basic devices on am3517-evm (2013-12-08 14:15:46 -0800)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/dt-signed
>
> for you to fetch changes up to e37e1cb0ee231ffdc9b5ef1da63a0c7e1077c603:
>
>   ARM: dts: OMAP2: fix interrupt number for rng (2014-01-08 10:24:44 -0800)
>
> ----------------------------------------------------------------
> Split omap3 core padconf area into two as some of the registers in
> the padconf area are not accessible and used for other devices.
> Also fix the interrupt number for omap2 RNG, and add basic support
> for sbc-3xxx with cm-t3730.
>
> Note that the minor merge conflicts for omap_hwmod_2xxx_ipblock_data.c
> can be solved by just dropping the legacy hwmod data for interrupts
> for v3.14.
>
> ----------------------------------------------------------------

Applying to next/fixes-non-critical.

Kevin

Re: [GIT PULL 3/4] trivial omap big endian changes for v3.14 merge window

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:
>
>   Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/be-signed
>
> for you to fetch changes up to fc6ca98c81bf0ea8b46064915b5947b971594101:
>
>   ARM: OMAP: debug-leds: raw read and write endian fix (2014-01-07 16:09:45 -0800)
>
> ----------------------------------------------------------------
> Trivial search and replace of read and write functions to allow
> further patches to make omaps work also in big endian mode.
>
> ----------------------------------------------------------------

I think this one should wait for v3.15.  While a trivial rename, it's a
pretty broad change and risks having conflicts and fallouts with other
changes (thinking especially of ongoing clock changes.)

Kevin

Re: [GIT PULL 3/4] trivial omap big endian changes for v3.14 merge window

[Tony Lindgren]

* Kevin Hilman <khilman@linaro.org> [140114 14:33]:
> Tony Lindgren <tony@atomide.com> writes:
> 
> > The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:
> >
> >   Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)
> >
> > are available in the git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/be-signed
> >
> > for you to fetch changes up to fc6ca98c81bf0ea8b46064915b5947b971594101:
> >
> >   ARM: OMAP: debug-leds: raw read and write endian fix (2014-01-07 16:09:45 -0800)
> >
> > ----------------------------------------------------------------
> > Trivial search and replace of read and write functions to allow
> > further patches to make omaps work also in big endian mode.
> >
> > ----------------------------------------------------------------
> 
> I think this one should wait for v3.15.  While a trivial rename, it's a
> pretty broad change and risks having conflicts and fallouts with other
> changes (thinking especially of ongoing clock changes.)

Sure no problem.

Tony

Re: [GIT PULL 4/4] GIC crossbar support for v3.14 merge window

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:
>
>   Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/crossbar-signed
>
> for you to fetch changes up to 70d4545544853e2d95909b919d4565ff32c3e3c5:
>
>   ARM: DRA: Enable Crossbar IP support for DRA7XX (2014-01-08 09:21:42 -0800)
>
> ----------------------------------------------------------------
> Add support for GIC crossbar that routes interrupts on newer omaps.
>
> ----------------------------------------------------------------

I think this one is a little late for v3.14 also, and should spend some
more time in -next before v3.15.  Also...

> Sricharan R (4):
>       irqchip: irq-gic: Add support for routable irqs

... I see a Reviewed-by from tglx on this one...
        
>       irqchip: crossbar: Add support for Crossbar IP

...but no signs of irqchip mainainer review/ack on this one.

Ideally, these two irqchip ones would be merged through the irqchip
maintainers...

>       ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number
>       ARM: DRA: Enable Crossbar IP support for DRA7XX

.. and then we'd take these two through arm-soc.

If there are strong dependencies, we can take them all through arm-soc,
but I'd like to see the tags from the irqchip maintainers first.

Kevin