1. 19 Apr, 2013 23 commits
  2. 13 Apr, 2013 2 commits
  3. 12 Apr, 2013 3 commits
  4. 09 Apr, 2013 9 commits
  5. 08 Apr, 2013 3 commits
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.10/gpmc-signed' of... · 86feb64f
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.10/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
      
      From Tony Lindgren <tony@atomide.com>:
      
      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 71856843 (ARM: OMAP: use
      consistent error checking) from RMK's clean-up branch and commit
      31d9adca (ARM: OMAP2+: Fix broken gpmc support).
      
      * tag 'omap-for-v3.10/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (29 commits)
        ARM: OMAP2+: Add GPMC DT support for Ethernet child nodes
        ARM: OMAP2+: rename gpmc_probe_nor_child() to gpmc_probe_generic_child()
        ARM: OMAP2+: return -ENODEV if GPMC child device creation fails
        ARM: OMAP2+: Allow GPMC probe to complete even if CS mapping fails
        ARM: OMAP2+: Remove unnecesssary GPMC definitions and variable
        ARM: OMAP2+: Detect incorrectly aligned GPMC base address
        ARM: OMAP2+: Convert ONENAND to retrieve GPMC settings from DT
        ARM: OMAP2+: Convert NAND to retrieve GPMC settings from DT
        ARM: OMAP2+: Add device-tree support for NOR flash
        ARM: OMAP2+: Add additional GPMC timing parameters
        ARM: OMAP2+: Add function to read GPMC settings from device-tree
        ARM: OMAP2+: Don't configure of chip-select options in gpmc_cs_configure()
        ARM: OMAP2+: Convert TUSB to use gpmc_cs_program_settings()
        ARM: OMAP2+: Convert SMC91x to use gpmc_cs_program_settings()
        ARM: OMAP2+: Convert NAND to use gpmc_cs_program_settings()
        ARM: OMAP2+: Convert ONENAND to use gpmc_cs_program_settings()
        ARM: OMAP2+: Add function for configuring GPMC settings
        ARM: OMAP2+: Add structure for storing GPMC settings
        ARM: OMAP2+: Add variable to store number of GPMC waitpins
        ARM: OMAP2+: Simplify code configuring ONENAND devices
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      86feb64f
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.10/timer-signed' of... · dc2d3db8
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.10/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
      
      From Tony Lindgren <tony@atomide.com>:
      
      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 71856843 (ARM: OMAP: use
      consistent error checking) in RMK's tree and 960cba67 (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 71856843 and omap-for-v3.10/fixes-non-critical
      to avoid non-trivial merge conflicts.
      
      * tag 'omap-for-v3.10/timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP4+: Fix sparse warning in system timers
        ARM: OMAP2+: Store ID of system timers in timer structure
        ARM: OMAP3: Update clocksource timer selection
        ARM: OMAP2+: Simplify system timers definitions
        ARM: OMAP2+: Simplify system timer clock definitions
        ARM: OMAP2+: Remove hard-coded test on timer ID
        ARM: OMAP2+: Display correct system timer name
        ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
        ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
        ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
        ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0
        ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
        ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk
        ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      dc2d3db8
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.10/usb-signed' of... · 8355ae69
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.10/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
      
      From Tony Lindgren <tony@atomide.com>:
      
      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.
      
      * tag 'omap-for-v3.10/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits)
        ARM: dts: omap3-beagle: Add USB Host support
        ARM: dts: OMAP3: Add HS USB Host IP nodes
        ARM: dts: OMAP4: Add HS USB Host IP nodes
        ARM: OMAP: zoom: Adapt to ehci-omap changes
        ARM: OMAP3: overo: Adapt to ehci-omap changes
        ARM: OMAP3: omap3touchbook: Adapt to ehci-omap changes
        ARM: OMAP3: omap3stalker: Adapt to ehci-omap changes
        ARM: OMAP3: omap3pandora: Adapt to ehci-omap changes
        ARM: OMAP3: omap3evm: Adapt to ehci-omap changes
        ARM: OMAP3: igep0020: Adapt to ehci-omap changes
        ARM: OMAP: devkit8000: Adapt to ehci-omap changes
        ARM: OMAP3: cm-t3517: Adapt to ehci-omap changes
        ARM: OMAP3: cm-t35: Adapt to ehci-omap changes
        ARM: OMAP: AM3517evm: Adapt to ehci-omap changes
        ARM: OMAP: AM3517crane: Adapt to ehci-omap changes
        ARM: OMAP3: 3630SDP: Adapt to ehci-omap changes
        ARM: OMAP3: 3430SDP: Adapt to ehci-omap changes
        ARM: OMAP3: Beagle: Adapt to ehci-omap changes
        ARM: OMAP2+: omap4panda: Adapt to ehci-omap changes
        ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys()
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      8355ae69