q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/mach-omap1
History
Linus Torvalds 0df0914d41 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
  omap: zoom: host should not pull up wl1271's irq line
  arm: plat-omap: iommu: fix request_mem_region() error path
  OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
  omap4: mux: Remove duplicate mux modes
  omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
  omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
  omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
  omap4: board-omap4panda: Initialise the serial pads
  omap3: board-3430sdp: Initialise the serial pads
  omap4: board-4430sdp: Initialise the serial pads
  omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
  omap2+: mux: Remove the use of IDLE flag
  omap2+: Add separate list for dynamic pads to mux
  perf: add OMAP support for the new power events
  OMAP4: Add IVA OPP enteries.
  OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
  OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
  OMAP3+: OPP: Replace voltage values with Macros
  OMAP3: wdtimer: Fix CORE idle transition
  Watchdog: omap_wdt: add fine grain runtime-pm
  ...

Fix up various conflicts in
 - arch/arm/mach-omap2/board-omap3evm.c
 - arch/arm/mach-omap2/clock3xxx_data.c
 - arch/arm/mach-omap2/usb-musb.c
 - arch/arm/plat-omap/include/plat/usb.h
 - drivers/usb/musb/musb_core.h
2011-03-17 19:28:15 -07:00
..
include/mach ARM: 6651/1: omap: Fix DEBUG_LL code for p2v changes 2011-02-17 23:27:31 +00:00
ams-delta-fiq-handler.S
ams-delta-fiq.c ARM: omap1: irq_data conversion. 2011-01-13 17:18:51 +01:00
board-ams-delta.c wip: fix section mismatches in omap1_defconfig 2011-02-09 16:40:30 -08:00
board-fsample.c wip: fix section mismatches in omap1_defconfig 2011-02-09 16:40:30 -08:00
board-generic.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
board-h2-mmc.c omap: Fix spotty MMC voltages 2010-10-12 16:07:51 -07:00
board-h2.c arm: mach-omap1: board-h2: make h2_nand_platdata static 2011-01-27 16:39:48 -08:00
board-h2.h
board-h3-mmc.c omap: Fix spotty MMC voltages 2010-10-12 16:07:51 -07:00
board-h3.c arm: mach-omap1: board-h3: make nand_platdata static 2011-01-27 16:39:48 -08:00
board-h3.h
board-htcherald.c arm: mach-omap1: board-htcherald: make htcpld_chips and htcpld_pfdata static 2011-01-27 16:39:48 -08:00
board-innovator.c arm: mach-omap1: board-innovator: make innovator_mmc_init() static 2011-01-27 16:39:48 -08:00
board-nokia770.c ARM: omap1/nokia770: mark some functions __init 2011-02-09 16:36:39 -08:00
board-osk.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-palmte.c arm: omap1: fix compile warning 2011-01-27 16:39:41 -08:00
board-palmtt.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-palmz71.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-perseus2.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-sx1-mmc.c omap: Fix spotty MMC voltages 2010-10-12 16:07:51 -07:00
board-sx1.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
board-voiceblue.c arm: mach-omap1: board-voiceblue: add missing include 2011-01-27 16:39:48 -08:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h
clock_data.c OMAP1: clock_data: use runtime cpu / machine checks 2010-12-21 21:08:15 -07:00
devices.c omap1: Add initcall checks for omap1 and booted board 2010-12-10 09:46:24 -08:00
dma.c OMAP: DMA: Convert DMA library into platform driver 2010-12-20 18:38:31 -08:00
flash.c arm: omap1: add missing includes 2010-11-24 16:46:48 -08:00
fpga.c ARM: omap1: irq_data conversion. 2011-01-13 17:18:51 +01:00
gpio7xx.c omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx 2010-12-07 16:26:58 -08:00
gpio15xx.c omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx 2010-12-07 16:26:58 -08:00
gpio16xx.c omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx 2010-12-07 16:26:58 -08:00
i2c.c
id.c
io.c omap: Split omap_read/write functions for omap1 and omap2+ 2010-12-10 09:46:24 -08:00
irq.c omap1: Simplify use of omap_irq_flags 2011-01-27 15:52:16 -08:00
Kconfig omap1: Fix booting for 15xx and 730 with omap1_defconfig 2011-01-19 10:38:43 -08:00
lcd_dma.c OMAP1: Fix non-working LCD on OMAP310 2011-02-02 12:13:50 -08:00
leds-h2p2-debug.c
leds-innovator.c
leds-osk.c
leds.c omap1: Add initcall checks for omap1 and booted board 2010-12-10 09:46:24 -08:00
leds.h
mailbox.c arm: omap1: mbox: delete unused variable 2010-11-24 16:48:47 -08:00
Makefile ARM: OMAP: Allow platforms to hook reset cleanly 2011-01-27 16:39:48 -08:00
Makefile.boot
mcbsp.c OMAP1: McBSP: fix build break for non-multi-OMAP1 configs 2011-03-08 15:10:17 -08:00
mux.c arm: omap1: make some functions static 2010-11-24 16:48:25 -08:00
opp.h
opp_data.c
pm.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.h ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM 2011-02-04 14:26:08 +00:00
pm_bus.c omap1: pm_bus: Fix compilation warning 2010-12-20 17:53:04 -08:00
reset.c ARM: OMAP: Allow platforms to hook reset cleanly 2011-01-27 16:39:48 -08:00
serial.c omap1: Add initcall checks for omap1 and booted board 2010-12-10 09:46:24 -08:00
sleep.S ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM 2011-02-04 14:26:08 +00:00
sram.S ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM 2011-02-04 14:26:08 +00:00
time.c omap1: remove duplicated #include 2011-02-01 15:53:00 -08:00
timer32k.c omap1: Fix booting for 15xx and 730 with omap1_defconfig 2011-01-19 10:38:43 -08:00
usb.c