summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
Commit message (Expand)AuthorAgeFilesLines
*-----. Merge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'o...Paul Walmsley2011-09-046-11/+23
|\ \ \ \
| | | | * OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force...Santosh Shilimkar2011-08-192-2/+2
| | | | * OMAP: powerdomains: Make all powerdomain target states as ON at initRajendra Nayak2011-08-191-9/+16
| | | * | OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]Paul Walmsley2011-09-041-0/+1
| | | |/
| | * / OMAP4: clock: fix compile warningPaul Walmsley2011-08-211-0/+2
| | |/
| * / OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomainPaul Walmsley2011-08-221-0/+2
| |/
* / OMAP4: clock: re-enable previous clockdomain enable/disable sequencePaul Walmsley2011-08-191-1/+7
|/
* omap: timer: Set dmtimer used as clocksource in autoreload modeHemant Pedanekar2011-08-101-1/+2
* OMAP3: am3517crane: remove NULL board_mux from board fileJohan Hovold2011-08-101-2/+0
* arm: mach-omap2: mux: use kstrdup()Thomas Meyer2011-08-101-10/+4
* Merge branch 'for_3.1/pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/...Tony Lindgren2011-08-103-15/+12
|\
| * OMAP2+: PM: SmartReflex: use put_sync_suspend for IRQ-safe disablingColin Cross2011-08-051-1/+1
| * OMAP3: beagle: don't touch omap_device internalsKevin Hilman2011-08-051-13/+10
| * OMAP3+: SR: ensure pm-runtime callbacks can be invoked with IRQs disabledNishanth Menon2011-08-051-0/+1
| * OMAP2+: Kconfig: don't select PM in OMAP2PLUS_TYPICALKevin Hilman2011-08-051-1/+0
* | OMAP: hwmod: fix build break on non-OMAP4 multi-OMAP2 buildsPaul Walmsley2011-08-101-1/+24
* | OMAP: Fix linking error in twl-common.c for OMAP2/3/4 only buildsPeter Ujfalusi2011-08-101-37/+41
|/
* Merge branch 'for-3.1-rc1' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds2011-08-011-23/+3
|\
| * OMAP: DSS2: Remove unused code from display.cTomi Valkeinen2011-07-251-10/+0
| * OMAP: DSS2: Remove unused opt_clock_availableTomi Valkeinen2011-07-251-12/+0
| * OMAP: DSS2: Use omap_pm_get_dev_context_loss_count to get ctx loss countTomi Valkeinen2011-07-251-1/+3
| * OMAP: DSS2: rewrite use of context_loss_countTomi Valkeinen2011-07-251-1/+1
* | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-07-301-0/+6
|\ \
| * | [media] OMAP3: RX-51: define vdds_csib regulator supplyKalle Jokiniemi2011-07-271-0/+5
* | | Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2011-07-2626-452/+1313
|\ \ \
| | \ \
| | \ \
| *-. \ \ Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/...Arnd Bergmann2011-07-1785-5549/+4669
| |\ \ \ \ | | |_|_|/ | |/| | |
| | | * | OMAP4: SDP4430: Add twl6040 codec platform supportMisael Lopez Cruz2011-07-041-1/+9
| | | * | OMAP4: SDP4430: Add twl6040 vibrator platform supportPeter Ujfalusi2011-07-041-0/+48
| | | * | MFD: twl4030-audio: Rename platform dataPeter Ujfalusi2011-07-043-13/+13
| | | | |
| | | \ \
| | | \ \
| | | \ \
| | *---. \ \ Merge branches 'omap4_clockdomain_hwmod_3.1', 'clock_debugfs_a_3.1', 'omap4_c...Paul Walmsley2011-07-104-92/+220
| | |\ \ \ \ \
| | | | | * | | OMAP: omap_device: Create clkdev entry for hwmod main_clkBenoit Cousson2011-07-104-68/+68
| | | | |/ / / | | | |/| | |
| | | | * | | OMAP4: clock data: Add missing divider selection for auxclksRajendra Nayak2011-07-101-24/+152
| | | |/ / /
| | * | | | OMAP2+: hwmod: Follow the recommended PRCM module enable sequenceRajendra Nayak2011-07-102-20/+51
| | * | | | OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls fro...Paul Walmsley2011-07-102-3/+27
| | * | | | OMAP2+: clockdomain: Add per clkdm lock to prevent concurrent state programmingRajendra Nayak2011-07-104-18/+50
| | * | | | OMAP2+: PM: idle clkdms only if already in idleRajendra Nayak2011-07-101-1/+3
| | * | | | OMAP2+: clockdomain: add clkdm_in_hwsup()Paul Walmsley2011-07-102-2/+34
| | * | | | OMAP2+: clockdomain: Add 2 APIs to control clockdomain from hwmod frameworkBenoit Cousson2011-07-102-36/+109
| | * | | | OMAP: clockdomain: Remove redundant call to pwrdm_wait_transition()Vaibhav Bedia2011-07-101-1/+0
| | * | | | OMAP4: hwmod: Introduce the module control in hwmod controlBenoit Cousson2011-07-101-2/+61
| | * | | | OMAP4: cm: Add two new APIs for modulemode controlBenoit Cousson2011-07-102-0/+45
| | * | | | OMAP4: hwmod data: Add modulemode entry in omap_hwmod structureBenoit Cousson2011-07-101-0/+55
| | * | | | OMAP4: hwmod data: Add PRM context register offsetBenoit Cousson2011-07-101-0/+74
| | * | | | OMAP4: prm: Remove deprecated functionsBenoit Cousson2011-07-102-41/+0
| | * | | | OMAP4: prm: Replace warm reset API with the offset based versionBenoit Cousson2011-07-105-22/+24
| | * | | | OMAP4: hwmod: Replace RSTCTRL absolute address with offset macrosBenoit Cousson2011-07-106-112/+123
| | * | | | OMAP: hwmod: Wait the idle status to be disabledBenoit Cousson2011-07-103-0/+66
| | * | | | OMAP4: hwmod: Replace CLKCTRL absolute address with offset macrosBenoit Cousson2011-07-105-96/+197
| | * | | | OMAP2+: hwmod: Init clkdm field at boot timeBenoit Cousson2011-07-101-1/+33
| | * | | | OMAP4: hwmod data: Add clock domain attributeBenoit Cousson2011-07-102-3/+84
| | |/ / /