2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 17:23:55 +08:00
linux-next/arch/arm/mach-omap1
Linus Torvalds 623ff7739e MTD merge for 3.4
Artem's cleanup of the MTD API continues apace.
 Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst others.
 More work on DiskOnChip G3, new driver for DiskOnChip G4.
 Clean up debug/warning printks in JFFS2 to use pr_<level>.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iEYEABECAAYFAk92K6UACgkQdwG7hYl686NrMACfWQJRWasR78MWKfkT2vWZwTFJ
 X5AAoKiSYO2pfo5gWJGOAahNC1zUqMX0
 =i3Vb
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

Pull MTD changes from David Woodhouse:
 - Artem's cleanup of the MTD API continues apace.
 - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst
   others.
 - More work on DiskOnChip G3, new driver for DiskOnChip G4.
 - Clean up debug/warning printks in JFFS2 to use pr_<level>.

Fix up various trivial conflicts, largely due to changes in calling
conventions for things like dmaengine_prep_slave_sg() (new inline
wrapper to hide new parameter, clashing with rewrite of previously last
parameter that used to be an 'append' flag, and is now a bitmap of
'unsigned long flags').

(Also some header file fallout - like so many merges this merge window -
and silly conflicts with sparse fixes)

* tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6: (120 commits)
  mtd: docg3 add protection against concurrency
  mtd: docg3 refactor cascade floors structure
  mtd: docg3 increase write/erase timeout
  mtd: docg3 fix inbound calculations
  mtd: nand: gpmi: fix function annotations
  mtd: phram: fix section mismatch for phram_setup
  mtd: unify initialization of erase_info->fail_addr
  mtd: support ONFI multi lun NAND
  mtd: sm_ftl: fix typo in major number.
  mtd: add device-tree support to spear_smi
  mtd: spear_smi: Remove default partition information from driver
  mtd: Add device-tree support to fsmc_nand
  mtd: fix section mismatch for doc_probe_device
  mtd: nand/fsmc: Remove sparse warnings and errors
  mtd: nand/fsmc: Add DMA support
  mtd: nand/fsmc: Access the NAND device word by word whenever possible
  mtd: nand/fsmc: Use dev_err to report error scenario
  mtd: nand/fsmc: Use devm routines
  mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform
  mtd: fsmc_nand: add pm callbacks to support hibernation
  ...
2012-03-30 17:31:56 -07:00
..
include/mach ARM: remove bunch of now unused mach/io.h files 2012-03-06 21:34:44 -06:00
ams-delta-fiq-handler.S ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
ams-delta-fiq.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
board-ams-delta.c ARM: board specific updates 2012-03-27 16:27:28 -07:00
board-fsample.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
board-generic.c ARM: restart: omap: use new restart hook 2012-01-05 12:57:16 +00:00
board-h2-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-h2.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-h2.h ARM: OMAP: No need to include board-h2.h from hardware.h 2009-03-23 18:07:33 -07:00
board-h3-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-h3.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-h3.h ARM: OMAP: No need to include board-h3.h from hardware.h 2009-03-23 18:07:33 -07:00
board-htcherald.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-innovator.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-nokia770.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-osk.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-palmte.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-palmtt.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-palmz71.c Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
board-perseus2.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
board-sx1-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-sx1.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
board-voiceblue.c ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq() 2012-03-29 08:41:01 -07:00
clock_data.c ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h 2012-02-24 10:34:35 -08:00
clock.c ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h 2012-02-24 10:34:35 -08:00
clock.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
common.h ARM: OMAP: Move omap_init_consistent_dma_size() to local common.h 2012-02-24 10:34:33 -08:00
devices.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
dma.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
flash.c MTD merge for 3.4 2012-03-30 17:31:56 -07:00
fpga.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
gpio7xx.c gpio/omap: fix bankwidth for OMAP7xx MPUIO 2012-02-06 14:13:44 +05:30
gpio15xx.c gpio/omap: remove bank->method & METHOD_* macros 2012-02-06 14:13:43 +05:30
gpio16xx.c Merge branch 'depends/omap/gpio/runtime-pm-cleanup' into next/cleanup 2012-03-02 13:05:00 +00:00
i2c.c omap: i2c: Fix muxing for command line enabled bus 2010-02-25 14:45:08 -08:00
id.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
io.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
iomap.h ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
irq.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
Kconfig ARM: board specific updates 2012-03-27 16:27:28 -07:00
lcd_dma.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
leds-h2p2-debug.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-innovator.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-osk.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
leds.h
mailbox.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
Makefile ARM: OMAP: Remove CONFIG_OMAP_MCBSP references 2012-03-12 13:34:24 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mcbsp.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
mux.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
opp_data.c ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
opp.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
pm_bus.c PM: Move clock-related definitions and headers to separate file 2011-08-25 15:34:19 +02:00
pm.c ARM: OMAP: pm: fix compilation break 2012-03-29 10:05:02 -07: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
reset.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
serial.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
sleep.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
sram.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
time.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timer32k.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timer.c ARM: OMAP1: dmtimer: conversion to platform devices 2011-09-21 15:50:31 -07:00
usb.c omap: Move omap1 USB platform init code into mach-omap1/usb.c 2010-07-05 16:31:30 +03:00