[GIT PULL 1/3] omap usb platform init changes for v3.10 merge window

[GIT PULL 1/3] omap usb platform init changes for v3.10 merge window

[Tony Lindgren]

The following changes since commit 1f0972f5b05a674d73e4eb314fa1b6c78e37aef1:

  usb: phy: nop: Add some parameters to platform data (2013-03-18 11:13:54 +0200)

are available in the git repository at:

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

for you to fetch changes up to 2e5f78aeceb6f203b514ca03a48e3fd056025524:

  ARM: dts: omap3-beagle: Add USB Host support (2013-04-02 10:00:04 -0700)

----------------------------------------------------------------
EHCI platform data related changes for v3.10 merge window.
These are needed for the USB PHY support, and are based on
commit 1f0972f5 from Felipe Balbi's tree as agreed on the
mailing lists.

----------------------------------------------------------------
Roger Quadros (20):
      ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys()
      ARM: OMAP2+: omap4panda: Adapt to ehci-omap changes
      ARM: OMAP3: Beagle: Adapt to ehci-omap changes
      ARM: OMAP3: 3430SDP: Adapt to ehci-omap changes
      ARM: OMAP3: 3630SDP: Adapt to ehci-omap changes
      ARM: OMAP: AM3517crane: Adapt to ehci-omap changes
      ARM: OMAP: AM3517evm: Adapt to ehci-omap changes
      ARM: OMAP3: cm-t35: Adapt to ehci-omap changes
      ARM: OMAP3: cm-t3517: Adapt to ehci-omap changes
      ARM: OMAP: devkit8000: Adapt to ehci-omap changes
      ARM: OMAP3: igep0020: Adapt to ehci-omap changes
      ARM: OMAP3: omap3evm: Adapt to ehci-omap changes
      ARM: OMAP3: omap3pandora: Adapt to ehci-omap changes
      ARM: OMAP3: omap3stalker: Adapt to ehci-omap changes
      ARM: OMAP3: omap3touchbook: Adapt to ehci-omap changes
      ARM: OMAP3: overo: Adapt to ehci-omap changes
      ARM: OMAP: zoom: Adapt to ehci-omap changes
      ARM: dts: OMAP4: Add HS USB Host IP nodes
      ARM: dts: OMAP3: Add HS USB Host IP nodes
      ARM: dts: omap3-beagle: Add USB Host support

 arch/arm/boot/dts/omap3-beagle.dts         |  71 +++++++++++++
 arch/arm/boot/dts/omap3.dtsi               |  31 ++++++
 arch/arm/boot/dts/omap4.dtsi               |  30 ++++++
 arch/arm/mach-omap2/board-3430sdp.c        |  21 ++--
 arch/arm/mach-omap2/board-3630sdp.c        |  21 ++--
 arch/arm/mach-omap2/board-am3517crane.c    |  24 ++---
 arch/arm/mach-omap2/board-am3517evm.c      |  17 +--
 arch/arm/mach-omap2/board-cm-t35.c         |  20 ++--
 arch/arm/mach-omap2/board-cm-t3517.c       |  20 ++--
 arch/arm/mach-omap2/board-devkit8000.c     |   8 --
 arch/arm/mach-omap2/board-igep0020.c       |  32 +++---
 arch/arm/mach-omap2/board-omap3beagle.c    |  32 ++++--
 arch/arm/mach-omap2/board-omap3evm.c       |  25 ++---
 arch/arm/mach-omap2/board-omap3pandora.c   |  21 ++--
 arch/arm/mach-omap2/board-omap3stalker.c   |  17 +--
 arch/arm/mach-omap2/board-omap3touchbook.c |  17 +--
 arch/arm/mach-omap2/board-omap4panda.c     |  55 ++++------
 arch/arm/mach-omap2/board-overo.c          |  16 +--
 arch/arm/mach-omap2/board-zoom.c           |  16 +--
 arch/arm/mach-omap2/usb-host.c             | 160 ++++++++++++++++++++++++++++-
 arch/arm/mach-omap2/usb.h                  |   9 ++
 21 files changed, 503 insertions(+), 160 deletions(-)

[GIT PULL 2/3] omap timer changes for v3.10 merge window

[Tony Lindgren]

The following changes since commit 43231b5be657fde1c4ced180d829bbd59ceef9ad:

  Merge commit '7185684' into omap-for-v3.10/timer (2013-04-03 10:32:47 -0700)

are available in the git repository at:


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

for you to fetch changes up to 7f585bbfc54fec9dcf387fd2edb2d6f4908badf8:

  Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer (2013-04-03 10:47:59 -0700)

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

Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:

This series consists mainly of clean-ups for clockevents and
clocksource timers on OMAP2+ devices. The most significant change
in functionality comes from the 5th patch which is changing the
selection of the clocksource timer for OMAP3 and AM335x devices
when gptimers are used for clocksource.

Note that this series depends on 7185684 (ARM: OMAP: use
consistent error checking) in RMK's tree and 960cba6 (ARM:
OMAP5: timer: Update the clocksource name as per clock data)
in omap-for-v3.10/fixes-non-critical. So this branch is based
on a merge of 7185684 and omap-for-v3.10/fixes-non-critical
to avoid non-trivial merge conflicts.

----------------------------------------------------------------
Jon Hunter (8):
      Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
      ARM: OMAP2+: Display correct system timer name
      ARM: OMAP2+: Remove hard-coded test on timer ID
      ARM: OMAP2+: Simplify system timer clock definitions
      ARM: OMAP2+: Simplify system timers definitions
      ARM: OMAP3: Update clocksource timer selection
      ARM: OMAP2+: Store ID of system timers in timer structure
      ARM: OMAP4+: Fix sparse warning in system timers

Tony Lindgren (1):
      Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer

 arch/arm/mach-omap2/board-cm-t3517.c |   2 +-
 arch/arm/mach-omap2/board-generic.c  |   2 +-
 arch/arm/mach-omap2/common.h         |   3 +-
 arch/arm/mach-omap2/timer.c          | 124 ++++++++++++++++++-----------------
 4 files changed, 66 insertions(+), 65 deletions(-)

[GIT PULL 3/3] omap gpmc changes for v3.10 merge window

[Tony Lindgren]

The following changes since commit dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4:

  Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp (2013-04-01 14:33:50 -0500)

are available in the git repository at:


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

for you to fetch changes up to aecb65a34a780cd07fbaa652cc5d640f13f3ed5f:

  Merge branch 'omap-gpmc-for-v3.10-take2' of git://github.com/jonhunter/linux into omap-for-v3.10/gpmc (2013-04-04 11:22:33 -0700)

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

GPMC updates from Jon Hunter <jon-hunter@ti.com>:

Adds GPMC (General Purpose Memory Controller) DT support for
NOR flash and Ethernet and includes various GPMC cleans-up
and fixes.

This series is dependent on commit 7185684 (ARM: OMAP: use
consistent error checking) from RMK's clean-up branch and commit
31d9adc (ARM: OMAP2+: Fix broken gpmc support).

----------------------------------------------------------------
Ezequiel Garcia (8):
      ARM: omap2: gpmc: Mark local scoped functions static
      ARM: omap2: gpmc: Remove unused gpmc_round_ns_to_ticks() function
      ARM: omap2: gpmc: Fix gpmc_cs_reserved() return value
      ARM: omap2: gpmc-nand: Print something useful on CS request failure
      ARM: omap2: gpmc-onenand: Print something useful on CS request failure
      ARM: omap2: gpmc-onenand: Replace pr_err() with dev_err()
      ARM: omap2: gpmc-onenand: Replace printk KERN_ERR with dev_warn()
      ARM: omap2: gpmc: Remove redundant chip select out of range check

Javier Martinez Canillas (3):
      ARM: OMAP2+: return -ENODEV if GPMC child device creation fails
      ARM: OMAP2+: rename gpmc_probe_nor_child() to gpmc_probe_generic_child()
      ARM: OMAP2+: Add GPMC DT support for Ethernet child nodes

Jon Hunter (17):
      ARM: OMAP2+: Simplify code configuring ONENAND devices
      ARM: OMAP2+: Add variable to store number of GPMC waitpins
      ARM: OMAP2+: Add structure for storing GPMC settings
      ARM: OMAP2+: Add function for configuring GPMC settings
      ARM: OMAP2+: Convert ONENAND to use gpmc_cs_program_settings()
      ARM: OMAP2+: Convert NAND to use gpmc_cs_program_settings()
      ARM: OMAP2+: Convert SMC91x to use gpmc_cs_program_settings()
      ARM: OMAP2+: Convert TUSB to use gpmc_cs_program_settings()
      ARM: OMAP2+: Don't configure of chip-select options in gpmc_cs_configure()
      ARM: OMAP2+: Add function to read GPMC settings from device-tree
      ARM: OMAP2+: Add additional GPMC timing parameters
      ARM: OMAP2+: Add device-tree support for NOR flash
      ARM: OMAP2+: Convert NAND to retrieve GPMC settings from DT
      ARM: OMAP2+: Convert ONENAND to retrieve GPMC settings from DT
      ARM: OMAP2+: Detect incorrectly aligned GPMC base address
      ARM: OMAP2+: Remove unnecesssary GPMC definitions and variable
      ARM: OMAP2+: Allow GPMC probe to complete even if CS mapping fails

Mark Jackson (1):
      ARM: OMAP: Clear GPMC bits when applying new setting.

Tony Lindgren (1):
      Merge branch 'omap-gpmc-for-v3.10-take2' of git://github.com/jonhunter/linux into omap-for-v3.10/gpmc

 Documentation/devicetree/bindings/bus/ti-gpmc.txt  | 103 ++--
 Documentation/devicetree/bindings/mtd/gpmc-nor.txt |  98 ++++
 .../devicetree/bindings/mtd/gpmc-onenand.txt       |   3 +
 Documentation/devicetree/bindings/net/gpmc-eth.txt |  97 ++++
 arch/arm/mach-omap2/gpmc-nand.c                    |  42 +-
 arch/arm/mach-omap2/gpmc-onenand.c                 | 118 ++---
 arch/arm/mach-omap2/gpmc-smc91x.c                  |  30 +-
 arch/arm/mach-omap2/gpmc.c                         | 544 +++++++++++++++------
 arch/arm/mach-omap2/gpmc.h                         |  43 +-
 arch/arm/mach-omap2/usb-tusb6010.c                 |  62 ++-
 10 files changed, 831 insertions(+), 309 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nor.txt
 create mode 100644 Documentation/devicetree/bindings/net/gpmc-eth.txt

[GIT PULL 1/3] omap usb platform init changes for v3.10 merge window

[Arnd Bergmann]

On Thursday 04 April 2013, Tony Lindgren wrote:
> b05a674d73e4eb314fa1b6c78e37aef1:
> 
>   usb: phy: nop: Add some parameters to platform data (2013-03-18 11:13:54 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/usb-signed
> 
> for you to fetch changes up to 2e5f78aeceb6f203b514ca03a48e3fd056025524:
> 
>   ARM: dts: omap3-beagle: Add USB Host support (2013-04-02 10:00:04 -0700)
> 
> ----------------------------------------------------------------
> EHCI platform data related changes for v3.10 merge window.
> These are needed for the USB PHY support, and are based on
> commit 1f0972f5 from Felipe Balbi's tree as agreed on the
> mailing lists.

Pulled into next/drivers branch.

	Arnd

[GIT PULL 2/3] omap timer changes for v3.10 merge window

[Arnd Bergmann]

On Thursday 04 April 2013, Tony Lindgren wrote:
> Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:
> 
> This series consists mainly of clean-ups for clockevents and
> clocksource timers on OMAP2+ devices. The most significant change
> in functionality comes from the 5th patch which is changing the
> selection of the clocksource timer for OMAP3 and AM335x devices
> when gptimers are used for clocksource.
> 
> Note that this series depends on 7185684 (ARM: OMAP: use
> consistent error checking) in RMK's tree and 960cba6 (ARM:
> OMAP5: timer: Update the clocksource name as per clock data)
> in omap-for-v3.10/fixes-non-critical. So this branch is based
> on a merge of 7185684 and omap-for-v3.10/fixes-non-critical
> to avoid non-trivial merge conflicts.
> 

Pulled into next/drivers, thanks!

Do you have a URL for a stable branch containing 7185684
that we can list in our branch description file?

	Arnd

[GIT PULL 2/3] omap timer changes for v3.10 merge window

[Tony Lindgren]

* Arnd Bergmann <arnd@arndb.de> [130408 10:41]:
> On Thursday 04 April 2013, Tony Lindgren wrote:
> > Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:
> > 
> > This series consists mainly of clean-ups for clockevents and
> > clocksource timers on OMAP2+ devices. The most significant change
> > in functionality comes from the 5th patch which is changing the
> > selection of the clocksource timer for OMAP3 and AM335x devices
> > when gptimers are used for clocksource.
> > 
> > Note that this series depends on 7185684 (ARM: OMAP: use
> > consistent error checking) in RMK's tree and 960cba6 (ARM:
> > OMAP5: timer: Update the clocksource name as per clock data)
> > in omap-for-v3.10/fixes-non-critical. So this branch is based
> > on a merge of 7185684 and omap-for-v3.10/fixes-non-critical
> > to avoid non-trivial merge conflicts.
> > 
> 
> Pulled into next/drivers, thanks!
> 
> Do you have a URL for a stable branch containing 7185684
> that we can list in our branch description file?

That's in RMK's for-next, but I have not seen any discussion
for that branch being immutable except up to commit 7185684.

Unless Russell has better ideas, you may want to set up
branch with 7185684 as the head for your dependencies.

Regards,

Tony

[GIT PULL 2/3] omap timer changes for v3.10 merge window

[Arnd Bergmann]

On Thursday 04 April 2013, Tony Lindgren wrote:
>  arch/arm/mach-omap2/board-cm-t3517.c |   2 +-
>  arch/arm/mach-omap2/board-generic.c  |   2 +-
>  arch/arm/mach-omap2/common.h         |   3 +-
>  arch/arm/mach-omap2/timer.c          | 124 ++++++++++++++++++-----------------
>  4 files changed, 66 insertions(+), 65 deletions(-)

BTW, do you have any plans to move the timer.c file to drivers/clocksource?

I think that's where most of them are heading now.

	Arnd

[GIT PULL 2/3] omap timer changes for v3.10 merge window

[Tony Lindgren]

* Arnd Bergmann <arnd@arndb.de> [130408 10:45]:
> On Thursday 04 April 2013, Tony Lindgren wrote:
> >  arch/arm/mach-omap2/board-cm-t3517.c |   2 +-
> >  arch/arm/mach-omap2/board-generic.c  |   2 +-
> >  arch/arm/mach-omap2/common.h         |   3 +-
> >  arch/arm/mach-omap2/timer.c          | 124 ++++++++++++++++++-----------------
> >  4 files changed, 66 insertions(+), 65 deletions(-)
> 
> BTW, do you have any plans to move the timer.c file to drivers/clocksource?
> 
> I think that's where most of them are heading now.

Yes that's the plan.

With the various patches posted at least the timer code
GPMC code should be very close to being movable. And the
mailbox code is getting moved to drivers based on the pull
request I saw for that few days ago.

Regards,

Tony