Linus Torvalds 76d21c5635 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ...

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c

2011-03-24 09:50:13 -07:00

..

include/mach

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

board-2430sdp.c

Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus

2011-03-02 17:11:18 -08:00

board-3430sdp.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-3630sdp.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

board-4430sdp.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2011-03-24 07:59:01 -07:00

board-am3517crane.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

board-am3517evm.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

board-apollon.c

omap2+: Minimize board specific init_early calls

2011-02-25 10:19:21 -08:00

board-cm-t35.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-cm-t3517.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

board-devkit8000.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-flash.c

omap: Fix compile if MTD_NAND_OMAP2 is not selected

2011-02-25 10:19:21 -08:00

board-flash.h

omap3630: nand: fix device size to work in polled mode

2011-02-17 15:32:52 -08:00

board-generic.c

omap2+: Minimize board specific init_early calls

2011-02-25 10:19:21 -08:00

board-h4.c

omap: Fix H4 init_irq to not call h4_init_flash

2011-03-10 09:51:29 -08:00

board-igep0020.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-igep0030.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

board-ldp.c

ldp: Fix regulator mapping for ads7846 TS controller

2011-03-02 16:45:50 -08:00

board-n8x0.c

omap: mmc: split out init for 2420

2011-03-01 13:12:55 -08:00

board-omap3beagle.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-omap3evm.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-omap3logic.c

ARM: OMAP2: use early init hook

2011-02-14 15:40:20 -08:00

board-omap3pandora.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-omap3stalker.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-omap3touchbook.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

board-omap4panda.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2011-03-24 07:59:01 -07:00

board-overo.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

board-rm680.c

OMAP: hsmmc: Rename the device and driver

2011-03-01 13:13:27 -08:00

board-rx51-peripherals.c

OMAP2, 3: DSS2: VENC: create platform_driver, move init, exit to driver

2011-03-11 15:46:20 +02:00

board-rx51-video.c

OMAP2, 3: DSS2: board files: replace platform_device_register with omap_display_init()

2011-02-23 09:34:25 +02:00

board-rx51.c

omap2+: Minimize board specific init_early calls

2011-02-25 10:19:21 -08:00

board-ti8168evm.c

omap2+: Minimize board specific init_early calls

2011-02-25 10:19:21 -08:00

board-zoom-debugboard.c

OMAP2plus: Fix static function warnings

2010-10-08 10:02:49 -07:00

board-zoom-display.c

OMAP2, 3: DSS2: board files: replace platform_device_register with omap_display_init()

2011-02-23 09:34:25 +02:00

board-zoom-peripherals.c

OMAP2, 3: DSS2: DSI: create platform_driver, move init, exit to driver

2011-03-11 15:46:21 +02:00

board-zoom.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

clkt2xxx_apll.c

OMAP2xxx: clock: add clockfw autoidle support for APLLs

2011-03-07 20:02:13 -07:00

clkt2xxx_dpll.c

OMAP2: clock: add DPLL autoidle support

2011-03-07 20:02:05 -07:00

clkt2xxx_dpllcore.c

OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_"

2010-12-21 21:05:14 -07:00

clkt2xxx_osc.c

OMAP2+: clock: comment that osc_ck/osc_sys_ck should use clockfw autoidle control

2011-03-07 20:02:21 -07:00

clkt2xxx_sys.c

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

clkt2xxx_virt_prcm_set.c

OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_"

2010-12-21 21:05:14 -07:00

clkt34xx_dpll3m2.c

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clkt_clksel.c

arm: omap2: clksel: fix compile warningOrganization: Texas Instruments\n

2011-02-16 17:49:35 -08:00

clkt_dpll.c

Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024

2011-03-10 22:41:28 -07:00

clkt_iclk.c

OMAP2430/3xxx: clock: add modem clock autoidle support

2011-03-07 20:03:12 -07:00

clock2xxx.c

OMAP2/3 clock: combine OMAP2 & 3 boot-time MPU rate change code

2010-02-24 17:45:15 -07:00

clock2xxx.h

OMAP: clock: fix compile warning

2011-03-09 18:44:28 -07:00

clock3xxx_data.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

clock3xxx.c

OMAP2+: clock: disable autoidle on all clocks during clock init

2011-02-25 16:10:42 -07:00

clock3xxx.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock34xx.c

OMAP3: clock: use autoidle clkops for all autoidle-controllable interface clocks

2011-03-07 20:04:03 -07:00

clock34xx.h

OMAP3: clock: use autoidle clkops for all autoidle-controllable interface clocks

2011-03-07 20:04:03 -07:00

clock36xx.c

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock36xx.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock44xx_data.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

clock44xx.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock2420_data.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

clock2430_data.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

clock2430.c

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

clock3517.c

OMAP3: clock: use autoidle clkops for all autoidle-controllable interface clocks

2011-03-07 20:04:03 -07:00

clock3517.h

OMAP3/4 clock: split into per-chip family files

2010-02-24 12:16:15 -07:00

clock_common_data.c

OMAP2xxx: clock: remove dsp_irate_ick

2011-03-07 20:21:17 -07:00

clock.c

perf: add OMAP support for the new power events

2011-03-11 07:21:44 -08:00

clock.h

OMAP2xxx: clock: remove dsp_irate_ick

2011-03-07 20:21:17 -07:00

clockdomain2xxx_3xxx.c

OMAP: clockdomain: Arch specific funcs for clkdm_clk_enable/disable

2011-02-25 16:06:48 -07:00

clockdomain44xx.c

OMAP4: clockdomain: Add wkup/sleep dependency support

2011-02-25 16:09:05 -07:00

clockdomain.c

Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024

2011-03-10 22:41:28 -07:00

clockdomain.h

Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024

2011-03-10 22:41:28 -07:00

clockdomains2xxx_3xxx_data.c

omap2/3: clockdomains: fix compile-time warnings

2011-03-07 20:21:17 -07:00

clockdomains44xx_data.c

Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024

2011-03-10 22:41:28 -07:00

cm1_44xx.h

OMAP4: CM instances: add clockdomain register offsets

2010-12-21 21:05:15 -07:00

cm2_44xx.h

OMAP4: CM instances: add clockdomain register offsets

2010-12-21 21:05:15 -07:00

cm2xxx_3xxx.c

OMAP2xxx: clock: add clockfw autoidle support for APLLs

2011-03-07 20:02:13 -07:00

cm2xxx_3xxx.h

OMAP2xxx: clock: add clockfw autoidle support for APLLs

2011-03-07 20:02:13 -07:00

cm44xx.c

OMAP4: PRCM: add OMAP4-specific accessor/mutator functions

2010-12-21 21:05:14 -07:00

cm44xx.h

OMAP4: clockdomain: Add wkup/sleep dependency support

2011-02-25 16:09:05 -07:00

cm-regbits-24xx.h

OMAP2420: clock: use autoidle clkops for all autoidle-controllable interface clocks

2011-03-07 20:02:57 -07:00

cm-regbits-34xx.h

OMAP4: clockdomains: add OMAP4 PRCM data and OMAP4 support

2010-12-21 21:05:15 -07:00

cm-regbits-44xx.h

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

cm.h

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

cminst44xx.c

OMAP4: CM: Add CM accesor api for bitwise control

2011-02-25 16:09:05 -07:00

cminst44xx.h

OMAP4: CM: Add CM accesor api for bitwise control

2011-02-25 16:09:05 -07:00

common.c

Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

2011-03-10 18:54:14 -08:00

control.c

OMAP3: control/PM: move padconf save code to mach-omap2/control.c

2010-12-21 21:05:16 -07:00

control.h

TI816X: Update common OMAP machine specific sources

2011-02-16 08:31:39 -08:00

cpuidle34xx.c

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

2011-03-11 09:20:03 -08:00

devices.c

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2011-03-24 09:50:13 -07:00

devices.h

[media] omap3: Add function to register omap3isp platform device structure

2011-03-22 04:53:42 -03:00

display.c

OMAP2PLUS:DSS2: add opt_clock_available in pdata

2011-03-11 15:46:26 +02:00

dma.c

arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR

2011-01-27 16:25:35 -08:00

dpll3xxx.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-01-06 19:13:58 -08:00

dpll44xx.c

omap4: dpll: Enable auto gate control for all MX postdividers

2011-02-25 16:10:17 -07:00

dsp.c

OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_"

2010-12-21 21:05:14 -07:00

emu.c

omap2/3: Fix initcalls for multi-omap

2010-02-15 09:27:05 -08:00

gpio.c

OMAP2+: GPIO: device registration

2010-12-07 16:26:57 -08:00

gpmc-nand.c

omap3630: nand: fix device size to work in polled mode

2011-02-17 15:32:52 -08:00

gpmc-onenand.c

OMAP: OneNAND: let boards determine OneNAND frequency

2011-02-17 15:44:46 -08:00

gpmc-smc91x.c

omap: use smc91x_platdata to setup smc91x

2009-12-11 16:16:33 -08:00

gpmc-smsc911x.c

ARM: OMAP3LOGIC: Add generic smsc911x support when connected to GPMC

2010-09-28 11:39:18 -07:00

gpmc.c

omap3: nand: configurable fifo threshold to gain the throughput

2011-02-17 15:32:54 -08:00

hsmmc.c

OMAP: hsmmc: Rename the device and driver

2011-03-01 13:13:27 -08:00

hsmmc.h

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2010-10-25 13:46:56 -07:00

hwspinlock.c

omap: add hwspinlock device

2011-02-17 09:52:43 -08:00

i2c.c

omap: mux: Convert 2420 platform init code to use new mux code

2010-07-05 16:31:40 +03:00

id.c

OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430

2011-03-14 11:12:54 -07:00

io.c

Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024

2011-03-10 22:41:28 -07:00

io.h

OMAP: plat-omap: Fix static function warnings

2010-10-08 10:12:38 -07:00

iommu2.c

omap: IOMMU: add support to callback during fault handling

2011-02-24 14:23:17 -08:00

irq.c

Merge branches 'devel-cleanup', 'devel-board', 'devel-early-init' and 'devel-ti816x' into omap-for-linus

2011-02-16 11:32:38 -08:00

Kconfig

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

2011-03-23 20:37:26 -07:00

mailbox.c

Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

2011-03-10 18:54:14 -08:00

Makefile

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

Makefile.boot

…

mcbsp.c

OMAP: McBSP: APIs to pass DMA params from McBSP driver to client drivers

2011-02-24 13:03:52 -08:00

mux34xx.c

omap3|4: mux: make local structures static

2011-01-06 19:58:28 -08:00

mux34xx.h

omap: mux: Add 36xx CBP package support

2009-12-11 16:16:33 -08:00

mux44xx.c

omap4: mux: Remove duplicate mux modes

2011-03-14 09:51:14 -07:00

mux44xx.h

OMAP4: mux: Add CBS package data for OMAP4430 ES2

2010-11-17 12:01:52 +01:00

mux2420.c

OMAP: mux: Add __func__ macro to pr_xxx macros

2010-11-17 12:01:54 +01:00

mux2420.h

omap: mux: Add data for 2420

2010-07-05 16:31:36 +03:00

mux2430.c

OMAP: mux: Add __func__ macro to pr_xxx macros

2010-11-17 12:01:54 +01:00

mux2430.h

omap: mux: Add data for 2430

2010-07-05 16:31:36 +03:00

mux.c

omap2+: mux: Remove the use of IDLE flag

2011-03-11 11:32:25 -08:00

mux.h

omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init

2011-03-11 11:32:26 -08:00

omap4-common.c

ARM: 6755/1: omap4: l2x0: Populate set_debug() function and enable Errata 727915

2011-03-09 00:18:47 +00:00

omap44xx-smc.S

ARM: omap4: Convert END() to ENDPROC() for correct linkage with CONFIG_THUMB2_KERNEL

2011-03-09 16:38:36 -08:00

omap_hwmod_3xxx_data.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

omap_hwmod_44xx_data.c

OMAP4: hwmod_data: Add address space and irq in L3 hwmod.

2011-03-09 17:23:57 +05:30

omap_hwmod_2420_data.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

omap_hwmod_2430_data.c

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-03-22 14:27:36 +09:00

omap_hwmod_common_data.c

OMAP: hwmod data: add class for IVA hwmods

2010-07-26 16:34:31 -06:00

omap_hwmod_common_data.h

OMAP: hwmod data: add class for IVA hwmods

2010-07-26 16:34:31 -06:00

omap_hwmod.c

omap2+: Add separate list for dynamic pads to mux

2011-03-11 11:32:25 -08:00

omap_l3_noc.c

OMAP4: l3: Introduce l3-interconnect error handling driver

2011-03-09 17:23:58 +05:30

omap_l3_noc.h

OMAP4: l3: Introduce l3-interconnect error handling driver

2011-03-09 17:23:58 +05:30

omap_l3_smx.c

OMAP3: l3: Introduce l3-interconnect error handling driver

2011-03-09 17:23:57 +05:30

omap_l3_smx.h

OMAP3: l3: Introduce l3-interconnect error handling driver

2011-03-09 17:23:57 +05:30

omap_opp_data.h

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

omap_phy_internal.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

omap_twl.c

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

2011-03-11 09:20:03 -08:00

omap-headsmp.S

ARM: omap4: Convert END() to ENDPROC() for correct linkage with CONFIG_THUMB2_KERNEL

2011-03-09 16:38:36 -08:00

omap-hotplug.c

ARM: CPU hotplug: remove bug checks in platform_cpu_die()

2010-12-20 15:09:10 +00:00

omap-iommu.c

OMAP: iommu: make iva2 iommu selectable

2010-12-15 11:33:31 -06:00

omap-smp.c

Merge branch 'misc' into devel

2011-01-06 22:32:52 +00:00

opp2xxx.h

omap: Start using CONFIG_SOC_OMAP

2011-01-27 16:39:40 -08:00

opp3xxx_data.c

Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

2011-03-11 09:39:58 -08:00

opp4xxx_data.c

Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

2011-03-11 09:39:58 -08:00

opp2420_data.c

OMAP2xxx OPP: clean up comments in OPP data

2010-01-08 15:23:15 -07:00

opp2430_data.c

OMAP2xxx OPP: clean up comments in OPP data

2010-01-08 15:23:15 -07:00

opp.c

omap: opp: add OMAP3 OPP table data and common init

2010-12-21 14:30:40 -08:00

pm24xx.c

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

2011-03-11 09:20:03 -08:00

pm34xx.c

Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

2011-03-11 09:39:58 -08:00

pm44xx.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

pm_bus.c

omap2+: pm_bus: make functions used as pointers as static

2011-01-07 13:33:08 -08:00

pm-debug.c

mach-omap2: pm: world-writable debugfs timer files

2011-02-04 12:08:12 -08:00

pm.c

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

2011-03-11 09:20:03 -08:00

pm.h

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

powerdomain2xxx_3xxx.c

OMAP: PRCM: remove duplicated headers

2011-01-18 12:36:53 -07:00

powerdomain44xx.c

OMAP2+: powerdomain: move header file from plat-omap to mach-omap2

2010-12-21 21:05:16 -07:00

powerdomain-common.c

OMAP2+: powerdomain: move header file from plat-omap to mach-omap2

2010-12-21 21:05:16 -07:00

powerdomain.c

perf: add OMAP support for the new power events

2011-03-11 07:21:44 -08:00

powerdomain.h

Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024

2011-03-10 22:41:28 -07:00

powerdomains2xxx_3xxx_data.c

OMAP2+: powerdomain: fix bank power state bitfields

2011-03-07 19:28:15 -07:00

powerdomains2xxx_3xxx_data.h

OMAP2+: powerdomain: move header file from plat-omap to mach-omap2

2010-12-21 21:05:16 -07:00

powerdomains2xxx_data.c

Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024

2011-03-10 22:41:28 -07:00

powerdomains3xxx_data.c

OMAP2+: powerdomain: fix bank power state bitfields

2011-03-07 19:28:15 -07:00

powerdomains44xx_data.c

OMAP2+: powerdomain: fix bank power state bitfields

2011-03-07 19:28:15 -07:00

prcm44xx.h

OMAP4: PRCM: add OMAP4-specific accessor/mutator functions

2010-12-21 21:05:14 -07:00

prcm_mpu44xx.c

OMAP4: PRCM: add OMAP4-specific accessor/mutator functions

2010-12-21 21:05:14 -07:00

prcm_mpu44xx.h

omap4: clockdomain: Fix the CPUx domain name

2011-03-01 16:36:20 -07:00

prcm-common.h

Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus

2011-03-02 17:11:18 -08:00

prcm.c

ARM: OMAP: Allow platforms to hook reset cleanly

2011-01-27 16:39:48 -08:00

prm2xxx_3xxx.c

OMAP2+: hwmod: use status bit info for reset line

2011-03-10 03:23:56 -07:00

prm2xxx_3xxx.h

OMAP2+: hwmod: use status bit info for reset line

2011-03-10 03:23:56 -07:00

prm44xx.c

OMAP4: PRCM: move global reset function for OMAP4 to an OMAP4-specific file

2010-12-21 21:05:14 -07:00

prm44xx.h

OMAP4: CM instances: add clockdomain register offsets

2010-12-21 21:05:15 -07:00

prm-regbits-24xx.h

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

prm-regbits-34xx.h

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

prm-regbits-44xx.h

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

prm.h

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

prminst44xx.c

OMAP4: PRCM: add OMAP4-specific accessor/mutator functions

2010-12-21 21:05:14 -07:00

prminst44xx.h

OMAP4: PRCM: add OMAP4-specific accessor/mutator functions

2010-12-21 21:05:14 -07:00

scrm44xx.h

OMAP4: PRCM: Add SCRM header file

2010-12-21 20:01:54 -07:00

sdram-hynix-h8mbx00u0mer-0em.h

omap3: zoom: Introduce zoom3 board support

2009-11-22 10:24:33 -08:00

sdram-micron-mt46h32m32lf-6.h

…

sdram-nokia.c

arm: omap: sdram-nokia: add 97.6/195.2 MHz timing data

2010-12-17 15:13:46 -08:00

sdram-nokia.h

arm: omap: add sdram-nokia.h

2010-12-17 15:13:44 -08:00

sdram-numonyx-m65kxxxxam.h

omap3: SDRC: add timing data for Numonyx M65KxxxxAM

2010-02-17 17:23:20 -08:00

sdram-qimonda-hyb18m512160af-6.h

…

sdrc2xxx.c

OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_"

2010-12-21 21:05:14 -07:00

sdrc.c

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files

2010-12-21 20:01:55 -07:00

sdrc.h

OMAP2+: use global values for the SRAM PA addresses

2010-12-21 14:45:56 -08:00

serial.c

OMAP2+: hwmod: rename some init functions

2011-02-28 12:04:35 -07:00

sleep24xx.S

ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM

2011-02-04 14:26:08 +00:00

sleep34xx.S

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

smartreflex-class3.c

OMAP: smartreflex: move plat/smartreflex.h to mach-omap2/smartreflex.h

2011-03-07 20:05:08 -07:00

smartreflex.c

Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus

2011-03-11 09:20:03 -08:00

smartreflex.h

OMAP: voltage: move plat/voltage.h to mach-omap2/voltage.h

2011-03-07 20:05:08 -07:00

sr_device.c

OMAP: voltage: move plat/voltage.h to mach-omap2/voltage.h

2011-03-07 20:05:08 -07:00

sram34xx.S

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

sram242x.S

ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM

2011-02-04 14:26:08 +00:00

sram243x.S

ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM

2011-02-04 14:26:08 +00:00

timer-gp.c

Merge branch 'devel-cleanup' into omap-for-linus

2011-03-02 17:07:14 -08:00

timer-gp.h

OMAP2plus: Fix static function warnings

2010-10-08 10:02:49 -07:00

timer-mpu.c

ARM: 6753/1: omap4: Enable ARM local timers with OMAP4430 es1.0 exception

2011-02-23 17:54:55 +00:00

usb-fs.c

OMAP: control: move plat-omap/control.h to mach-omap2/control.h

2010-10-08 11:40:20 -06:00

usb-host.c

arm: omap: usb: cleanup ehci and ohci resources and devices

2011-03-01 17:02:44 +02:00

usb-musb.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2011-03-17 19:28:15 -07:00

usb-tusb6010.c

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

2011-01-07 13:16:28 -08:00

vc3xxx_data.c

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

vc44xx_data.c

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

vc.h

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

voltage.c

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

voltage.h

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

voltagedomains3xxx_data.c

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

voltagedomains44xx_data.c

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

vp3xxx_data.c

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

vp44xx_data.c

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

vp.h

OMAP2+: voltage: reorganize, split code from data

2011-03-10 22:17:45 -07:00

wd_timer.c

omap2+: wdt: trivial sparse fixes

2011-01-06 19:58:28 -08:00

wd_timer.h

OMAP2+: wd_timer: separate watchdog disable code from the rest of mach-omap2/devices.c

2010-12-21 19:56:17 -07:00