summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2011-07-264-39/+111
|\
| *-. Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/...Arnd Bergmann2011-07-1715-920/+432
| |\ \
| | | * 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
| | | | |
| | | \ \
| | | \ \
| | | \ \
| | *---. \ \ Merge branches 'omap4_clockdomain_hwmod_3.1', 'clock_debugfs_a_3.1', 'omap4_c...Paul Walmsley2011-07-102-35/+89
| | |\ \ \ \ \
| | | | | * | | OMAP: omap_device: Create clkdev entry for hwmod main_clkBenoit Cousson2011-07-101-35/+50
| | | | |/ / /
| | | * | | | OMAP: Add debugfs node to show the summary of all clocksJon Hunter2011-07-101-0/+39
| | | |/ / /
| | * | | | 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-102-14/+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-265-6/+38
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Arnd Bergmann2011-07-1110-137/+82
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge branch 'prcm-fixes-3.1' of git://git.pwsan.com/linux-2.6 into fixes-part-2Tony Lindgren2011-07-112-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
| | * | | | | ASoC: omap: McBSP: fix build breakage on OMAP1Paul Walmsley2011-07-111-0/+27
| * | | | | | Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into deve...Tony Lindgren2011-07-041-3/+3
| |\ \ \ \ \ \
| | * | | | | | omap: iovmm: s/sg_dma_len(sg)/sg->length/Ohad Ben-Cohen2011-07-041-3/+3
| * | | | | | | OMAP4: DMTIMER: enable autoidle modeAmbresh K2011-07-041-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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-2513-970/+352
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into cleanup...Tony Lindgren2011-07-106-35/+14
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | | | | |
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | *-------. \ \ \ \ Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine...Paul Walmsley2011-07-095-35/+13
| | |\ \ \ \ \ \ \ \ \
| | | | | | | * | | | | OMAP: omap_device: replace _find_by_pdev() with to_omap_device()Kevin Hilman2011-07-091-10/+5
| | | | | | | | |_|_|/ | | | | | | | |/| | |
| | | | | | * | | | | OMAP PM: remove OMAP_PM_NONE config optionJean Pihet2011-07-092-11/+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
| | |/ / / /
| * | | | | Convert OMAPs 32kHz clocksource implementation to use the generic MMIORussell King - ARM Linux2011-07-101-87/+34
| |/ / / /
| * | | | omap: mcbsp: Remove port number enumsJarkko Nikula2011-07-071-9/+1
| * | | | omap: mcbsp: Remove rx_/tx_word_length variablesJarkko Nikula2011-07-072-5/+0
| |/ / /
| * | | Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/g...Tony Lindgren2011-06-291-2/+17
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'devel-timer' into devel-cleanupTony Lindgren2011-06-295-190/+283
| |\ \ \
| | * | | omap2+: Use dmtimer macros for clocksourceTony Lindgren2011-06-271-1/+1
OpenPOWER on IntegriCloud