Linus Torvalds 9affd6becb arm: fix mismerge of arch/arm/mach-omap2/timer.c ...

I badly screwed up the merge in commit 6fa52ed33bea ("Merge tag
'drivers-for-linus' of git://git.kernel.org/pub/.../arm-soc") by
incorrectly taking the arch/arm/mach-omap2/* data fully from the merge
target because the 'drivers-for-linus' branch seemed to be a proper
superset of the duplicate ARM commits.

That was bogus: commit ff931c821bab ("ARM: OMAP: clocks: Delay clk inits
atleast until slab is initialized") only existed in head, and the
changes to arch/arm/mach-omap2/timer.c from that commit got list.

Re-doing the merge more carefully, I do think this part was the only
thing I screwed up.  Knock wood.

Reported-by: Tony Lindgren <tony@atomide.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2013-05-07 17:59:53 -07:00

..

include/mach

ARM: OMAP2+: Remove now obsolete uncompress.h and debug-macro.S

2013-01-11 11:24:20 -08:00

am33xx-restart.c

ARM: OMAP2+: AM33xx: Add SoC specific restart hook

2013-02-01 14:50:18 -08:00

am33xx.h

ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code

2012-11-08 12:33:07 -07:00

am35xx-emac.c

ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default

2013-02-12 09:00:33 -08:00

am35xx-emac.h

…

am35xx.h

ARM: OMAP2+: Make am35xx.h local

2012-09-20 15:02:23 -07:00

board-2430sdp.c

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2013-05-02 19:40:34 -07:00

board-3430sdp.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-3630sdp.c

ARM: OMAP3: 3630SDP: Adapt to ehci-omap changes

2013-04-02 09:59:54 -07:00

board-4430sdp.c

An urgent fix for a timer mismerge for and a regression fix for

2013-05-07 14:47:17 +02:00

board-am3517crane.c

ARM: OMAP: AM3517crane: Adapt to ehci-omap changes

2013-04-02 09:59:55 -07:00

board-am3517evm.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-cm-t35.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-cm-t3517.c

Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:

2013-04-08 19:30:48 +02:00

board-devkit8000.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-flash.c

ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2

2012-10-18 16:23:46 -07:00

board-flash.h

ARM: OMAP2+: gpmc: localize gpmc header

2012-10-15 14:42:15 +05:30

board-generic.c

ARM: arm-soc device tree changes, part 2

2013-05-07 11:06:17 -07:00

board-h4.c

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2013-05-02 19:40:34 -07:00

board-igep0020.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-ldp.c

arm: omap: board-ldp: use generic dpi panel's gpio handling

2013-04-04 11:50:40 +03:00

board-n8x0.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

board-omap3beagle.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-omap3evm.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-omap3logic.c

arm-soc: cleanups

2013-02-21 14:58:40 -08:00

board-omap3pandora.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-omap3stalker.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-omap3touchbook.c

ARM: OMAP3: omap3touchbook: Adapt to ehci-omap changes

2013-04-02 10:00:01 -07:00

board-omap4panda.c

ARM: OMAP4: change the device names in usb_bind_phy

2013-05-06 16:39:16 -07:00

board-overo.c

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

board-rm680.c

arm-soc: cleanups

2013-02-21 14:58:40 -08:00

board-rx51-peripherals.c

ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d

2013-04-08 13:59:51 -07:00

board-rx51-video.c

arm: omap: board-rx-51: use acx565akm panel's gpio handling

2013-04-04 11:50:56 +03:00

board-rx51.c

ARM: OMAP: RX-51: add missing USB phy binding

2013-03-05 08:24:56 -08:00

board-rx51.h

ARM: OMAP2+: Make board-rx51.h local

2012-09-20 15:02:27 -07:00

board-ti8168evm.c

ARM: delete struct sys_timer

2012-12-24 09:36:38 -07:00

board-zoom-debugboard.c

ARM: OMAP2+: Make board-zoom.h local

2012-10-17 11:36:46 -07:00

board-zoom-display.c

ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight

2013-04-08 14:01:04 -07:00

board-zoom-peripherals.c

ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight

2013-04-08 14:01:04 -07:00

board-zoom.c

ARM: OMAP: zoom: Adapt to ehci-omap changes

2013-04-02 10:00:02 -07:00

board-zoom.h

ARM: OMAP2+: Make board-zoom.h local

2012-10-17 11:36:46 -07:00

cclock3xxx_data.c

ARM: OMAP3xxx: hwmod: Convert AES crypto device data to hwmod

2013-03-30 15:51:48 -06:00

cclock33xx_data.c

ARM: arm-soc platform updates for 3.10, part 1

2013-05-02 09:31:45 -07:00

cclock44xx_data.c

Merge branch 'fixes' into next/cleanup

2013-04-28 15:01:12 -07:00

cclock2420_data.c

ARM: OMAP2+: clock data: Remove CK_* flags

2013-03-18 09:57:39 -06:00

cclock2430_data.c

ARM: OMAP2xxx: hwmod: Convert AES crypto devcie data to hwmod

2013-03-30 15:51:33 -06:00

clkt2xxx_apll.c

ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clkt2xxx_dpll.c

ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clkt2xxx_dpllcore.c

omap prcm changes via Paul Walmsley <paul@pwsan.com>:

2012-11-30 08:40:31 -08:00

clkt2xxx_osc.c

ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clkt2xxx_sys.c

ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clkt2xxx_virt_prcm_set.c

omap prcm changes via Paul Walmsley <paul@pwsan.com>:

2012-11-30 08:40:31 -08:00

clkt34xx_dpll3m2.c

omap prcm changes via Paul Walmsley <paul@pwsan.com>:

2012-11-30 08:40:31 -08:00

clkt_clksel.c

ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clkt_dpll.c

ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clkt_iclk.c

ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clock2xxx.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

clock2xxx.h

ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clock3xxx.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

clock3xxx.h

ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:50 -07:00

clock34xx.c

ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:50 -07:00

clock34xx.h

…

clock36xx.c

ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:50 -07:00

clock36xx.h

ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:50 -07:00

clock44xx.h

…

clock2430.c

ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clock3517.c

ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:50 -07:00

clock3517.h

…

clock_common_data.c

ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts

2012-11-12 19:18:51 -07:00

clock.c

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2013-05-03 09:13:19 -07:00

clock.h

ARM: OMAP2+: clock data: Remove CK_* flags

2013-03-18 09:57:39 -06:00

clockdomain.c

ARM: OMAP2+: clockdomain: convert existing atomic usecounts into spinlock-protected shorts/ints

2013-01-29 14:59:58 -07:00

clockdomain.h

ARM: OMAP2+: clockdomain: convert existing atomic usecounts into spinlock-protected shorts/ints

2013-01-29 14:59:58 -07:00

clockdomains2xxx_3xxx_data.c

ARM: OMAP2+: hwmod code/clockdomain data: fix 32K sync timer

2012-07-05 17:25:38 -07:00

clockdomains3xxx_data.c

ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2

2012-10-18 16:23:46 -07:00

clockdomains33xx_data.c

ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations

2012-06-18 12:08:06 -06:00

clockdomains44xx_data.c

ARM: OMAP2+: clockdomain: Fix OMAP4 ISS clk domain to support only SWSUP

2012-10-29 22:02:13 -06:00

clockdomains2420_data.c

ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2

2012-10-18 16:23:46 -07:00

clockdomains2430_data.c

ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2

2012-10-18 16:23:46 -07:00

cm1_44xx.h

…

cm2_44xx.h

…

cm2xxx_3xxx.h

ARM: OMAP3: clock: Add 3xxx data using common struct clk

2012-11-12 19:18:49 -07:00

cm2xxx.c

ARM: OMAP2xxx: CM: remove autodep handling

2013-01-29 14:59:57 -07:00

cm2xxx.h

ARM: OMAP2+: CM/clock: convert _omap2_module_wait_ready() to use SoC-independent CM functions

2012-11-08 12:33:08 -07:00

cm3xxx.c

ARM: OMAP2+: clockdomain: convert existing atomic usecounts into spinlock-protected shorts/ints

2013-01-29 14:59:58 -07:00

cm3xxx.h

ARM: OMAP2+: CM/clock: convert _omap2_module_wait_ready() to use SoC-independent CM functions

2012-11-08 12:33:08 -07:00

cm33xx.c

ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug

2013-02-08 08:21:13 -07:00

cm33xx.h

ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files

2013-02-08 07:24:30 -07:00

cm44xx.c

…

cm44xx.h

…

cm_common.c

ARM: OMAP2: Fix compillation error in cm_common

2012-11-12 13:42:46 -08:00

cm-regbits-24xx.h

ARM: OMAP2: clock: Add 24xx data using common struct clk

2012-11-12 19:18:49 -07:00

cm-regbits-33xx.h

ARM: AM33XX: cm: Add bit-field width values

2012-09-22 10:53:08 -06:00

cm-regbits-34xx.h

ARM: OMAP3: clock: Add 3xxx data using common struct clk

2012-11-12 19:18:49 -07:00

cm-regbits-44xx.h

ARM: OMAP4: cm: add bitfield width values

2012-09-22 10:52:59 -06:00

cm.h

ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup

2012-11-08 15:09:26 -07:00

cminst44xx.c

ARM: OMAP2+: clockdomain: convert existing atomic usecounts into spinlock-protected shorts/ints

2013-01-29 14:59:58 -07:00

cminst44xx.h

ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup

2012-11-08 15:09:26 -07:00

common-board-devices.c

ARM: arm-soc: Header cleanups

2012-12-12 11:45:16 -08:00

common-board-devices.h

ARM: OMAP2+: nand: unify init functions

2012-10-15 12:00:44 +05:30

common.c

ARM: OMAP2+: common: remove use of vram

2012-12-16 11:19:48 -08:00

common.h

Merge branch 'late/clksrc' into late/cleanup

2013-05-06 23:43:45 +02:00

control.c

ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code

2012-11-08 12:33:07 -07:00

control.h

OMAP2: Fix a typo - replace regist with register.

2012-12-17 10:50:41 -08:00

cpuidle34xx.c

ARM: arm-soc cleanup for 3.10

2013-05-02 09:03:55 -07:00

cpuidle44xx.c

ARM: arm-soc cleanup for 3.10

2013-05-02 09:03:55 -07:00

ctrl_module_core_44xx.h

ARM: OMAP2+: Make ctrl_module_core_44xx.h local

2012-09-20 15:02:29 -07:00

ctrl_module_pad_core_44xx.h

ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local

2012-09-20 15:02:30 -07:00

ctrl_module_pad_wkup_44xx.h

ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local

2012-09-20 15:02:32 -07:00

ctrl_module_wkup_44xx.h

ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local

2012-09-20 15:02:33 -07:00

devices.c

ARM: OMAP2+: Only manually add hwmod data when DT not used.

2013-03-30 15:52:05 -06:00

devices.h

…

display.c

ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code

2013-01-26 00:48:53 -07:00

display.h

…

dma.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

dma.h

ARM: OMAP2+: Remove unused DMA channel definitions

2013-03-20 09:41:58 -07:00

dpll3xxx.c

Merge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/fixes-non-critical

2013-04-01 09:30:47 -07:00

dpll44xx.c

ARM: OMAP4: Enhance support for DPLLs with 4X multiplier

2012-12-15 01:35:46 -07:00

drm.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

dsp.c

ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"

2013-04-01 08:52:50 -07:00

dss-common.c

arm: dss-common: don't use reset_gpio from omap4_panda_dvi_device

2013-04-04 11:51:21 +03:00

dss-common.h

OMAP: omap4sdp: move display init from board file to dss-common.c

2012-11-07 13:26:51 -08:00

emu.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

fb.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

gpio.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

gpmc-nand.c

ARM: OMAP2+: Convert NAND to retrieve GPMC settings from DT

2013-04-03 20:13:38 -05:00

gpmc-nand.h

ARM: OMAP2+: gpmc: localize gpmc header

2012-10-15 14:42:15 +05:30

gpmc-onenand.c

Merge branch 'cleanup' into for-linus

2013-05-02 21:31:29 +01:00

gpmc-onenand.h

ARM: OMAP2+: onenand: header cleanup

2012-10-15 14:42:03 +05:30

gpmc-smc91x.c

ARM: OMAP2+: Convert SMC91x to use gpmc_cs_program_settings()

2013-04-01 14:53:43 -05:00

gpmc-smc91x.h

ARM: OMAP2+: Make gpmc-smc91x.h local

2012-09-20 15:02:49 -07:00

gpmc-smsc911x.c

ARM: OMAP2+: gpmc: localize gpmc header

2012-10-15 14:42:15 +05:30

gpmc-smsc911x.h

ARM: OMAP2+: Make gpmc-smsc911x.h local

2012-09-20 15:03:55 -07:00

gpmc.c

Merge branch 'cleanup' into for-linus

2013-05-02 21:31:29 +01:00

gpmc.h

ARM: OMAP2+: Add function to read GPMC settings from device-tree

2013-04-01 14:53:45 -05:00

hdq1w.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

hdq1w.h

ARM: OMAP: Make plat/omap_hwmod.h local to mach-omap2

2012-10-18 16:05:55 -07:00

hsmmc.c

ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code

2013-01-26 00:48:53 -07:00

hsmmc.h

…

hwspinlock.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

i2c.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

i2c.h

ARM: OMAP: Fix relative includes for shared i2c.h file

2012-10-31 15:37:13 -07:00

id.c

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2013-05-03 09:13:19 -07:00

id.h

ARM: OMAP2+: Make id.h local

2012-09-20 15:02:22 -07:00

io.c

Merge branch 'late/dt' into next/dt2

2013-05-06 23:38:00 +02:00

iomap.h

ARM: OMAP5: Add minimal support for OMAP5430 SOC

2012-07-09 19:14:39 +05:30

irq.c

These fixes are needed to fix non-omap build breakage for

2012-09-23 17:15:44 -06:00

Kconfig

ARM: arm-soc multiplatform updates for 3.10

2013-05-02 09:38:16 -07:00

l3_2xxx.h

ARM: OMAP2+: Make l3_2xxx.h local

2012-09-20 15:03:59 -07:00

l3_3xxx.h

ARM: OMAP2+: Make l3_3xxx.h local

2012-09-20 15:04:00 -07:00

l4_2xxx.h

ARM: OMAP2+: Make l4_2xxx.h local

2012-09-20 15:04:01 -07:00

l4_3xxx.h

ARM: OMAP2+: Make l4_3xxx.h local

2012-09-20 15:04:03 -07:00

mailbox.c

ARM: drivers: remove __dev* attributes.

2013-01-03 15:57:04 -08:00

Makefile

omap2+: Remove useless Makefile line

2013-04-08 14:01:04 -07:00

Makefile.boot

ARM: dtb: move all dtb targets to common Makefile

2012-09-20 22:58:17 -07:00

mcbsp.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

mmc.h

ARM: OMAP: Split plat/mmc.h into local headers and platform_data

2012-10-15 12:09:43 -07:00

msdi.c

ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code

2013-01-26 00:48:53 -07:00

mux34xx.c

OMAP2+: mux: Fixed gpio mux mode analysis

2012-12-14 11:11:34 -08:00

mux34xx.h

…

mux44xx.c

…

mux44xx.h

…

mux2420.c

…

mux2420.h

…

mux2430.c

…

mux2430.h

…

mux.c

ARM: OMAP2+: mux: correct wrong error messages

2013-03-04 11:37:31 -08:00

mux.h

OMAP2+: mux: Fixed gpio mux mode analysis

2012-12-14 11:11:34 -08:00

omap2-restart.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

omap3-restart.c

ARM: OMAP2+: PRCM: create SoC-specific chip restart functions

2012-11-08 12:33:08 -07:00

omap4-common.c

ARM: arm-soc cleanup for 3.10

2013-05-02 09:03:55 -07:00

omap4-keypad.h

ARM: OMAP2+: Make omap4-keypad.h local

2012-09-20 15:04:04 -07:00

omap4-sar-layout.h

ARM: arm-soc cleanup for 3.10

2013-05-02 09:03:55 -07:00

omap24xx.h

ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2

2012-09-12 18:06:31 -07:00

omap34xx.h

ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2

2012-09-12 18:06:31 -07:00

omap44xx.h

ARM: OMAP: Make use of available scu_a9_get_base() interface

2013-01-28 10:41:39 -07:00

omap54xx.h

ARM: OMAP5: Update SAR RAM base address

2013-03-19 12:57:01 +05:30

omap_device.c

Merge branch 'cleanup' into for-linus

2013-05-02 21:31:29 +01:00

omap_device.h

ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code

2013-01-26 00:48:53 -07:00

omap_hwmod_2xxx_3xxx_interconnect_data.c

ARM: OMAP: Split plat/serial.h for omap1 and omap2+

2012-10-24 13:34:31 -07:00

omap_hwmod_2xxx_3xxx_ipblock_data.c

ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h

2012-11-30 08:41:50 -08:00

omap_hwmod_2xxx_interconnect_data.c

ARM: OMAP2xxx: hwmod: Convert AES crypto devcie data to hwmod

2013-03-30 15:51:33 -06:00

omap_hwmod_2xxx_ipblock_data.c

ARM: OMAP2xxx: hwmod: Convert AES crypto devcie data to hwmod

2013-03-30 15:51:33 -06:00

omap_hwmod_3xxx_data.c

Changes needed for enabling SOC_BUS for the SoC revision

2013-04-09 16:40:45 +02:00

omap_hwmod_33xx_data.c

ARM: arm-soc platform updates for 3.10, part 1

2013-05-02 09:31:45 -07:00

omap_hwmod_44xx_data.c

ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock

2013-04-10 13:26:07 -07:00

omap_hwmod_2420_data.c

ARM: OMAP2xxx: hwmod: Convert AES crypto devcie data to hwmod

2013-03-30 15:51:33 -06:00

omap_hwmod_2430_data.c

ARM: OMAP2xxx: hwmod: Convert AES crypto devcie data to hwmod

2013-03-30 15:51:33 -06:00

omap_hwmod_common_data.c

ARM: OMAP: Make plat/omap_hwmod.h local to mach-omap2

2012-10-18 16:05:55 -07:00

omap_hwmod_common_data.h

ARM: OMAP2xxx: hwmod: Convert AES crypto devcie data to hwmod

2013-03-30 15:51:33 -06:00

omap_hwmod_reset.c

ARM: omap2: include linux/errno.h in hwmod_reset

2013-02-15 13:36:47 +01:00

omap_hwmod.c

ARM: arm-soc device tree changes, part 2

2013-05-07 11:06:17 -07:00

omap_hwmod.h

Merge branch 'late/dt' into next/dt2

2013-05-06 23:38:00 +02:00

omap_opp_data.h

Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock

2012-11-13 13:25:38 -08:00

omap_phy_internal.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

omap_twl.c

ARM: OMAP2+: omap_twl: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER

2012-12-17 10:50:41 -08:00

omap-headsmp.S

ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.

2012-11-05 14:26:43 -08:00

omap-hotplug.c

ARM: cpu hotplug: remove majority of cache flushing from platforms

2013-04-18 20:08:04 +01:00

omap-iommu.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

omap-mpuss-lowpower.c

ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state()

2013-04-09 09:45:46 -07:00

omap-pm-noop.c

ARM: OMAP: Move omap-pm-noop.c local to mach-omap2

2012-10-31 15:37:13 -07:00

omap-pm.h

ARM: OMAP: Make plat/omap-pm.h local to mach-omap2

2012-10-18 16:22:08 -07:00

omap-secure.c

ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2

2012-10-18 16:22:24 -07:00

omap-secure.h

ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2

2012-10-18 16:22:24 -07:00

omap-smc.S

…

omap-smp.c

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2013-05-03 09:13:19 -07:00

omap-wakeupgen.c

arm-soc: cleanups

2013-02-21 14:58:40 -08:00

omap-wakeupgen.h

ARM: OMAP2+: Make omap-wakeupgen.h local

2012-09-20 15:02:37 -07:00

opp2xxx.h

…

opp3xxx_data.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

opp4xxx_data.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

opp2420_data.c

ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+

2012-09-12 18:06:31 -07:00

opp2430_data.c

ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+

2012-09-12 18:06:31 -07:00

opp.c

ARM: OMAP: Make omap_device local to mach-omap2

2012-10-17 12:08:40 -07:00

pm24xx.c

ARM: OMAP2+: PM: Remove bogus fiq_[enable/disable] tuple

2013-03-28 12:55:58 +05:30

pm34xx.c

ARM: OMAP2+: PM: Remove bogus fiq_[enable/disable] tuple

2013-03-28 12:55:58 +05:30

pm44xx.c

ARM: arm-soc cleanup for 3.10

2013-05-02 09:03:55 -07:00

pm-debug.c

Merge branch 'cleanup' into for-linus

2013-05-02 21:31:29 +01:00

pm.c

Power management and ACPI updates for 3.10-rc1

2013-04-30 15:21:02 -07:00

pm.h

ARM: OMAP2+: PM/powerdomain: move omap_set_pwrdm_state() to powerdomain code

2013-01-29 14:59:57 -07:00

pmu.c

ARM: OMAP2+: Prepare for device-tree PMU support

2013-04-09 00:21:04 +02:00

powerdomain-common.c

…

powerdomain.c

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2013-05-03 09:13:19 -07:00

powerdomain.h

ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments

2013-01-29 14:59:58 -07:00

powerdomains2xxx_3xxx_data.c

ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments

2013-01-29 14:59:58 -07:00

powerdomains2xxx_3xxx_data.h

…

powerdomains2xxx_data.c

ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments

2013-01-29 14:59:58 -07:00

powerdomains3xxx_data.c

ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments

2013-01-29 14:59:58 -07:00

powerdomains33xx_data.c

ARM: OMAP AM33xx: powerdomains: add AM335x support

2012-06-18 12:08:06 -06:00

powerdomains44xx_data.c

…

prcm44xx.h

…

prcm_mpu44xx.c

ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup

2012-11-08 15:09:26 -07:00

prcm_mpu44xx.h

ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup

2012-11-08 15:09:26 -07:00

prcm-common.h

ARM: OMAP2+: PRCM: consolidate PRCM-related timeout macros

2012-11-08 15:09:26 -07:00

prm2xxx_3xxx.c

ARM: OMAP2+: clockdomain: convert existing atomic usecounts into spinlock-protected shorts/ints

2013-01-29 14:59:58 -07:00

prm2xxx_3xxx.h

ARM: OMAP3: clock: Add 3xxx data using common struct clk

2012-11-12 19:18:49 -07:00

prm2xxx.c

Some OMAP PRCM and sparse fixes against v3.8-rc1. A basic set of test

2013-01-03 11:04:21 -08:00

prm2xxx.h

ARM: OMAP2+: PRM: initialize some PRM functions early

2012-11-21 16:15:16 -07:00

prm3xxx.c

ARM: OMAP2+: Use omap initcalls

2013-01-11 11:24:18 -08:00

prm3xxx.h

ARM: OMAP2+: PRM: initialize some PRM functions early

2012-11-21 16:15:16 -07:00

prm33xx.c

ARM: OMAP2+: AM33XX: Update the hardreset API

2013-02-08 07:25:28 -07:00

prm33xx.h

ARM: OMAP2+: AM33XX: Update the hardreset API

2013-02-08 07:25:28 -07:00

prm44xx.c

ARM: OMAP5: Reuse prm read_inst/write_inst

2013-03-19 12:57:00 +05:30

prm44xx.h

ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets

2013-01-02 12:07:16 -07:00

prm_common.c

omap prcm changes via Paul Walmsley <paul@pwsan.com>:

2012-11-30 08:40:31 -08:00

prm-regbits-24xx.h

ARM: OMAP2: clock: Add 24xx data using common struct clk

2012-11-12 19:18:49 -07:00

prm-regbits-33xx.h

ARM: OMAP AM33xx: PRM: add PRM support

2012-06-18 12:08:06 -06:00

prm-regbits-34xx.h

ARM: OMAP3: clock: Add 3xxx data using common struct clk

2012-11-12 19:18:49 -07:00

prm-regbits-44xx.h

…

prm.h

ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count

2012-11-21 16:15:17 -07:00

prminst44xx.c

…

prminst44xx.h

ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup

2012-11-08 15:09:26 -07:00

scrm44xx.h

ARM: OMAP4: clock: Add 44xx data using common struct clk

2012-11-12 19:10:20 -07:00

sdram-hynix-h8mbx00u0mer-0em.h

ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h

2012-10-17 10:18:37 -07:00

sdram-micron-mt46h32m32lf-6.h

ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h

2012-10-17 10:18:37 -07:00

sdram-nokia.c

ARM: OMAP: remove plat/clock.h

2012-10-18 16:23:20 -07:00

sdram-nokia.h

…

sdram-numonyx-m65kxxxxam.h

ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h

2012-10-17 10:18:37 -07:00

sdram-qimonda-hyb18m512160af-6.h

ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h

2012-10-17 10:18:37 -07:00

sdrc2xxx.c

omap prcm changes via Paul Walmsley <paul@pwsan.com>:

2012-11-30 08:40:31 -08:00

sdrc.c

omap prcm changes via Paul Walmsley <paul@pwsan.com>:

2012-11-30 08:40:31 -08:00

sdrc.h

ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code

2012-11-08 12:33:07 -07:00

serial.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

serial.h

ARM: OMAP2+: Fix relative includes for serial.h

2012-10-31 15:37:14 -07:00

sleep24xx.S

ARM: OMAP2xxx: PM: enter WFI via inline asm if CORE stays active

2013-02-06 13:48:14 -07:00

sleep34xx.S

omap prcm changes via Paul Walmsley <paul@pwsan.com>:

2012-11-30 08:40:31 -08:00

sleep44xx.S

ARM: OMAP2+: Make omap-secure.h local

2012-09-20 15:02:35 -07:00

smartreflex-class3.c

ARM: OMAP2+: Make sure files with omap initcalls include soc.h

2013-02-09 20:26:31 -08:00

soc.h

ARM: OMAP5: Update SOC id detection code for ES2

2013-03-19 12:56:59 +05:30

sr_device.c

ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default

2013-02-12 09:00:33 -08:00

sram34xx.S

ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files

2012-10-21 01:01:11 -06:00

sram242x.S

ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files

2012-10-21 01:01:11 -06:00

sram243x.S

ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files

2012-10-21 01:01:11 -06:00

sram.c

ARM: OMAP: Move omap2+ specific parts of sram.c to mach-omap2

2012-10-31 10:14:14 -07:00

sram.h

ARM: OMAP: Split sram.h to local headers and minimal shared header

2012-10-31 10:14:13 -07:00

ti81xx.h

ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code

2012-11-08 12:33:07 -07:00

timer.c

arm: fix mismerge of arch/arm/mach-omap2/timer.c

2013-05-07 17:59:53 -07:00

twl-common.c

arm-soc: board specific changes

2013-02-21 15:33:45 -08:00

twl-common.h

ARM: OMAP2+: twl-common: Allow boards to customize the twl4030 audio setup

2013-01-22 10:34:50 +01:00

usb-host.c

ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys()

2013-04-02 09:59:52 -07:00

usb-musb.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

usb-tusb6010.c

ARM: OMAP2+: Convert TUSB to use gpmc_cs_program_settings()

2013-04-01 14:53:43 -05:00

usb.h

ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys()

2013-04-02 09:59:52 -07:00

vc3xxx_data.c

ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains

2012-11-05 15:08:22 -08:00

vc44xx_data.c

ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains

2012-11-05 15:08:22 -08:00

vc.c

Merge branch 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/pm

2012-11-30 09:12:33 -08:00

vc.h

ARM: OMAP3: VC: calculate ramp times

2012-11-05 15:08:23 -08:00

voltage.c

ARM: OMAP: unwrap strings

2012-09-12 02:57:10 -06:00

voltage.h

ARM: OMAP4: VC: setup I2C parameters based on board data

2012-11-05 15:31:12 -08:00

voltagedomains2xxx_data.c

…

voltagedomains3xxx_data.c

ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains

2012-11-05 15:08:22 -08:00

voltagedomains33xx_data.c

ARM: OMAP AM33xx: voltagedomain: Add voltage domain data

2012-06-18 00:47:26 -06:00

voltagedomains44xx_data.c

Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock

2012-11-13 13:25:38 -08:00

vp3xxx_data.c

ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains

2012-11-05 15:08:22 -08:00

vp44xx_data.c

ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains

2012-11-05 15:08:22 -08:00

vp.c

OMAP voltage layer updates towards supporting auto-retention/auto-off

2012-11-06 17:06:37 -08:00

vp.h

ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains

2012-11-05 15:08:22 -08:00

wd_timer.c

arm-soc: soc-specific updates

2013-02-21 15:27:22 -08:00

wd_timer.h

ARM: OMAP: Make plat/omap_hwmod.h local to mach-omap2

2012-10-18 16:05:55 -07:00