openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/plat-omap/include/plat
History
Linus Torvalds 2a8ba8f032 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)
  random: simplify fips mode
  crypto: authenc - Fix cryptlen calculation
  crypto: talitos - add support for sha224
  crypto: talitos - add hash algorithms
  crypto: talitos - second prepare step for adding ahash algorithms
  crypto: talitos - prepare for adding ahash algorithms
  crypto: n2 - Add Niagara2 crypto driver
  crypto: skcipher - Add ablkcipher_walk interfaces
  crypto: testmgr - Add testing for async hashing and update/final
  crypto: tcrypt - Add speed tests for async hashing
  crypto: scatterwalk - Fix scatterwalk_done() test
  crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk
  padata: Use get_online_cpus/put_online_cpus in padata_free
  padata: Add some code comments
  padata: Flush the padata queues actively
  padata: Use a timer to handle remaining objects in the reorder queues
  crypto: shash - Remove usage of CRYPTO_MINALIGN
  crypto: mv_cesa - Use resource_size
  crypto: omap - OMAP macros corrected
  padata: Use get_online_cpus/put_online_cpus
  ...

Fix up conflicts in arch/arm/mach-omap2/devices.c
 		2010-05-21 14:46:51 -07:00
..
blizzard.h omap: Checkpatch cleanup for blizzard.h 2010-03-11 14:50:00 -08:00
board-ams-delta.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board-sx1.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board-voiceblue.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board.h omap1: Fix compile for omap1_bl.c 2010-01-08 10:29:06 -08:00
clkdev.h
…
clkdev_omap.h OMAP3 clock: reorganize CK_* platform flags 2010-01-26 20:12:56 -07:00
clock.h OMAP3 clock: rename RATE_IN_343X, RATE_IN_3430ES2 to match reality 2010-05-20 12:31:07 -06:00
clockdomain.h OMAP clockdomain/powerdomain: improve documentation 2010-01-26 20:13:02 -07:00
common.h omap4: Move SOC specific code from board file 2010-05-20 11:17:51 -07:00
control.h omap4: Adding PBIAS Configuration for MMC1 Controller 2010-05-20 11:21:22 -07:00
cpu.h OMAP2: cpu_is_omap2*: fix compile-time removal of unused code 2010-03-11 15:55:43 -08:00
display.h OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper 2010-02-25 18:28:41 +02:00
dma-44xx.h omap4: Add auto-generated irq and dma headers 2010-02-23 14:02:52 -08:00
dma.h omap4: Use dma line defines from dma-44xx.h 2010-02-23 14:02:53 -08:00
dmtimer.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
dsp_common.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
flash.h omap: convert boards to use physmap-flash 2010-02-15 10:03:32 -08:00
fpga.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
gpio-switch.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
gpio.h OMAP2/3: GPIO: generalize prepare for idle 2010-05-12 09:39:16 -07:00
gpmc-smc91x.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
gpmc.h omap3: SDP: Introducing 'board-sdp-flash.c' for flash init 2010-02-15 10:03:33 -08:00
hardware.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
hwa742.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
i2c.h omap: i2c: Fix muxing for command line enabled bus 2010-02-25 14:45:08 -08:00
io.h omap3/4: Remove overlapping mapping of L4_WKUP io space 2010-02-23 10:57:41 -08:00
iommu.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
iommu2.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
iovmm.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
irda.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
irqs-44xx.h omap4: Add auto-generated irq and dma headers 2010-02-23 14:02:52 -08:00
irqs.h omap: add missing FIQ_START definition required forarch/arm/kernel/fiq.c compilation 2010-05-05 11:11:10 -07:00
keypad.h Merge branch '7xx-iosplit-plat' with omap-fixes 2009-11-10 18:10:34 -08:00
lcd_mipid.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
led.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
mailbox.h omap: mailbox: OMAP4 Mailbox-driver Patch to support tasklet implementation 2009-11-22 10:24:33 -08:00
mcbsp.h Merge branch 'topic/asoc' into for-linus 2010-05-20 12:00:43 +02:00
mcspi.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
memory.h omap2/3/4: Replace orred CONFIG_ARCH_OMAP2/3/4 with CONFIG_ARCH_OMAP2PLUS 2010-02-15 09:27:04 -08:00
menelaus.h omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2 2010-02-15 09:27:01 -08:00
mmc.h omap: hsmmc: fix the hsmmc driver for am3517 2010-05-20 11:17:51 -07:00
multi.h omap2/3/4: Fix multi.h when omap3 and omap4 are selected without omap2 2010-05-03 17:21:31 -07:00
mux.h omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2 2010-02-15 09:27:01 -08:00
nand.h omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabled 2010-04-23 15:35:11 -07:00
omap-alsa.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap-pm.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap7xx.h omap1: Add 7xx clocks and pin muxes for SPI 2010-01-08 10:29:05 -08:00
omap16xx.h omap: Clean the serial port defines 2010-02-15 08:48:53 -08:00
omap24xx.h omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2 2010-02-15 09:27:01 -08:00
omap34xx.h crypto: omap - Updates omap sham device related platform code 2010-05-03 11:10:03 +08:00
omap44xx.h OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention 2010-05-20 12:31:11 -06:00
omap730.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap850.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap1510.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap_device.h OMAP: HWMOD: Add support for early device register into omap device layer 2010-02-24 12:05:58 -07:00
omap_hwmod.h OMAP4: hwmod: Replace OCPIF_HAS_IDLEST by HWMOD_NO_IDLEST 2010-05-20 12:31:09 -06:00
onenand.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
param.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
powerdomain.h OMAP4 powerdomain: Support LOWPOWERSTATECHANGE for powerdomains 2010-05-20 12:31:13 -06:00
prcm.h omap: pass the reboot command to the boot loader 2010-03-11 14:50:00 -08:00
sdrc.h OMAP2: Add funcs for writing SMS_ROT_* registers 2009-12-09 11:44:32 +02:00
serial.h omap2/3: Fix DEBUG_LL for omap zoom2/3 2010-05-03 17:53:08 -07:00
smp.h OMAP4: AuxCoreBoot registers only accessible in secure mode 2009-12-11 16:16:35 -08:00
sram.h OMAP3: PM: CORE domain off-mode support 2009-11-11 14:42:25 -08:00
system.h omap: pass the reboot command to the boot loader 2010-03-11 14:50:00 -08:00
tc.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
timer-gp.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
timex.h
…
uncompress.h omap: Use a memory address for storing the debug port info instead of UART1 scratchpad 2010-05-03 17:53:08 -07:00
usb.h USB: omap3: add platform init code for OHCI driver 2010-05-20 13:21:44 -07:00
vram.h OMAP: Add VRAM manager 2009-12-09 12:04:33 +02:00
vrfb.h OMAP: Add support for VRFB rotation engine 2009-12-09 12:04:33 +02:00