summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-284-106/+12
|\
| * ARM: mach-omap2: remove mach/memory.hNicolas Pitre2011-09-261-46/+0
| * ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.hNicolas Pitre2011-09-261-44/+1
| * ARM: plat-omap: make OMAP_UART_INFO into a relative offsetNicolas Pitre2011-09-262-4/+10
| * ARM: omap: Setup consistent dma size at boot timeJon Medhurst2011-08-222-13/+2
* | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-271-20/+0
|\ \ | |/ |/|
| * ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-2/+0
| * ARM: gpio: consolidate gpio_to_irqRussell King2011-08-121-5/+0
| * ARM: gpio: consolidate trivial gpiolib implementationsRussell King2011-08-121-14/+1
* | am3505/3517: Various platform defines for UART4Raphaël Assénat2011-08-103-0/+9
|/
* Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2011-07-262-4/+22
|\
| *-. Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/...Arnd Bergmann2011-07-179-111/+295
| |\ \
| | | * Merge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-a...Tony Lindgren2011-07-071-2/+10
| | | |\
| | | | * mfd: twl6040: Add initial supportMisael Lopez Cruz2011-07-041-2/+10
| | * | | OMAP4: hwmod data: Add modulemode entry in omap_hwmod structureBenoit Cousson2011-07-101-0/+6
| | * | | OMAP4: hwmod data: Add PRM context register offsetBenoit Cousson2011-07-101-0/+1
| | * | | OMAP4: hwmod: Replace RSTCTRL absolute address with offset macrosBenoit Cousson2011-07-101-1/+2
| | * | | OMAP4: hwmod: Replace CLKCTRL absolute address with offset macrosBenoit Cousson2011-07-101-1/+1
| | * | | OMAP2+: hwmod: Init clkdm field at boot timeBenoit Cousson2011-07-101-0/+1
| | * | | OMAP4: hwmod data: Add clock domain attributeBenoit Cousson2011-07-101-0/+1
* | | | | Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2011-07-262-1/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'cleanup-part-2' into devel-boardTony Lindgren2011-07-101-11/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | OMAP4: Keyboard: Mux changes in the board fileShubhrajyoti Datta2011-07-051-1/+2
| * | | | | arm: omap3: cm-t35: add support for cm-t3730Igor Grinberg2011-07-051-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-261-13/+0
|\ \ \ \ \
| * | | | | ARM: Consolidate the clkdev header filesKyungmin Park2011-07-191-13/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2011-07-262-1/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | OMAP: hwmod: fix the i2c-reset timeout during bootupAvinash.H.M2011-07-102-0/+4
| * | | | I2C: OMAP2+: Introduce I2C IP versioning constantsAndy Green2011-07-101-0/+1
| * | | | I2C: OMAP2+: increase omap_i2c_dev_attr flags from u8 to u32Andy Green2011-07-101-1/+1
* | | | | Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/...Linus Torvalds2011-07-263-3/+35
|\ \ \ \ \
| * | | | | OMAP4: clocks: Update the clock tree with 4460 clock nodesRajendra Nayak2011-07-082-0/+3
| * | | | | OMAP4: ID: add omap_has_feature for max freq supportedAneesh V2011-07-081-2/+21
| * | | | | OMAP: ID: introduce chip detection for OMAP4460Aneesh V2011-07-081-1/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-07-258-106/+267
|\ \ \ \ \ | | |/ / / | |/| | |
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *-------. \ \ \ 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
OpenPOWER on IntegriCloud