summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include
Commit message (Expand)AuthorAgeFilesLines
*-------. Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine...Paul Walmsley2011-07-093-22/+8
|\ \ \ \ \
| | | | * | OMAP PM: remove OMAP_PM_NONE config optionJean Pihet2011-07-091-8/+0
| | | | |/
| | | * | OMAP4: clock data: Fix max mult and div for USB DPLLBenoit Cousson2011-07-091-1/+1
| | | |/
| | * | omap_hwmod: use a terminator record with omap_hwmod_dma_info arraysPaul Walmsley2011-07-091-5/+3
| | * | omap_hwmod: use a terminator record with omap_hwmod_mpu_irqs arraysPaul Walmsley2011-07-091-5/+3
| | * | omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space ar...Paul Walmsley2011-07-091-2/+0
| | |/
| * | OMAP2+: hwmod: Fix smart-standby + wakeup supportBenoit Cousson2011-07-091-1/+1
| |/
* | OMAP: dmtimer: add missing includePaul Walmsley2011-07-091-0/+1
|/
* omap: mcbsp: Remove port number enumsJarkko Nikula2011-07-071-9/+1
* omap: mcbsp: Remove rx_/tx_word_length variablesJarkko Nikula2011-07-071-2/+0
* Merge branch 'devel-timer' into devel-cleanupTony Lindgren2011-06-293-6/+256
|\
| * omap2+: Reserve clocksource and timesource and initialize dmtimer laterTony Lindgren2011-06-271-2/+1
| * omap2+: Remove gptimer_wakeup for nowTony Lindgren2011-06-201-1/+0
| * omap2+: Use dmtimer macros for clockeventTony Lindgren2011-06-201-0/+1
| * omap: Make a subset of dmtimer functions into inline functionsTony Lindgren2011-06-201-0/+119
| * omap: Move dmtimer defines to dmtimer.hTony Lindgren2011-06-201-0/+125
| * omap: Set separate timer init functions to avoid cpu_is_omap testsTony Lindgren2011-06-202-2/+5
| * omap: Use separate init_irq functions to avoid cpu_is_omap tests earlyTony Lindgren2011-06-161-1/+5
* | omap: mcbsp: Drop in-driver transfer supportJarkko Nikula2011-06-291-25/+0
* | omap: mcbsp: Drop SPI mode supportJarkko Nikula2011-06-291-37/+0
* | omap: cleanup NAND platform dataGrazvydas Ignotas2011-06-291-5/+1
|/
* ARM: OMAP4: MMC: no regulator off during probe for eMMCBalaji T K2011-06-011-0/+3
* OMAP: iovmm: fix SW flags passed by userOmar Ramirez Luna2011-06-011-3/+0
* OMAP: fix compilation errorJanusz Krzysztofik2011-05-311-0/+1
* Merge branch 'for_2.6.40/gpio-move' of git://git.kernel.org/pub/scm/linux/ker...Grant Likely2011-05-271-0/+103
|\
| * GPIO: OMAP: move register offset defines into <plat/gpio.h>Kevin Hilman2011-05-271-0/+103
* | Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-05-263-4/+3
|\ \
| * \ Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/...Tony Lindgren2011-05-241-1/+1
| |\ \
| | * | usb: musb: am35x: fix compile error when building am35xFelipe Balbi2011-05-181-1/+1
| * | | omap: Remove support for omap2evmTony Lindgren2011-05-131-1/+0
| * | | arm: omap: gpmc-smsc911x: minor style fixesIgor Grinberg2011-05-031-2/+1
| * | | omap: convert boards that use SMSC911x to use gpmc-smsc911xMike Rapoport2011-04-201-0/+1
| |/ /
* | | Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linuxPaul Mundt2011-05-243-659/+0
|\ \ \ | |_|/ |/| |
| * | OMAP: DSS2: Move nokia-dsi-panel.h to include/video/Tomi Valkeinen2011-05-111-31/+0
| * | OMAP: DSS2: Move panel-generic-dpi.h to include/video/Tomi Valkeinen2011-05-111-37/+0
| * | OMAP: DSS2: Move display.h to include/video/Tomi Valkeinen2011-05-113-593/+2
| |/
* | Merge branch 'devel-stable' into for-linusRussell King2011-05-231-2/+2
|\ \
| * \ Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into de...Russell King2011-05-071-2/+2
| |\ \ | | |/ | |/|
| | * ARM: zImage: remove the static qualifier from global data variablesNicolas Pitre2011-05-071-2/+2
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-232-37/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | | |/ | | |/|
| | | * ARM: consolidate SMP cross call implementationRussell King2011-05-231-30/+0
| | | * ARM: 6860/1: OMAP4: Move the privately used SMP boot functions to OMAP specif...Santosh Shilimkar2011-04-041-6/+0
| | |/
| * | ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a ...Marc Zyngier2011-05-201-1/+1
|/ /
* | Fix common misspellingsLucas De Marchi2011-03-312-2/+2
|/
* Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-03-271-1/+1
|\
| * ARM: OMAP2+: Fix warnings for GPMC interruptBalaji T K2011-03-181-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Artem Bityutskiy2011-03-2537-609/+478
|\ \
| * \ Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-03-241-4/+12
| |\ \
| | * | [media] ARM: OMAP3: Update Camera ISP definitions for OMAP3630Tuukka Toivonen2011-03-221-4/+12
| * | | Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linuxPaul Mundt2011-03-221-2/+13
| |\ \ \
OpenPOWER on IntegriCloud