mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity
linux-stable/arch/arm/mach-mxs
History
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
..
devices ARM: driver specific updates 2012-03-27 16:41:24 -07:00
include/mach MTD merge for 3.4 2012-03-30 17:31:56 -07:00
clock-mx23.c ARM: driver specific updates 2012-03-27 16:41:24 -07:00
clock-mx28.c ARM: driver specific updates 2012-03-27 16:41:24 -07:00
clock.c ARM: mxs: select HAVE_CLK_PREPARE for clock 2011-12-28 21:35:08 +08:00
devices-mx23.h ARM: mxs: add GPMI-NAND support for imx23/imx28 2012-02-11 07:39:53 -08:00
devices-mx28.h ARM: mxs: add GPMI-NAND support for imx23/imx28 2012-02-11 07:39:53 -08:00
devices.c ARM: amba: mxs: convert to use amba_device_alloc 2012-01-25 11:02:02 +00:00
icoll.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
iomux.c
Kconfig ARM: mxs: Add initial support for Bluegiga APX4 Development Kit 2012-02-04 07:35:54 +08:00
mach-apx4devkit.c ARM: mxs: Add initial support for Bluegiga APX4 Development Kit 2012-02-04 07:35:54 +08:00
mach-m28evk.c ARM: mxs: read correct values when setting up MAC 2012-01-31 23:08:52 +08:00
mach-mx23evk.c ARM: restart: mxs: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx28evk.c ARM: mxs: read correct values when setting up MAC 2012-01-31 23:08:52 +08:00
mach-stmp378x_devb.c ARM: restart: mxs: use new restart hook 2012-01-05 12:57:15 +00:00
mach-tx28.c ARM: restart: mxs: use new restart hook 2012-01-05 12:57:15 +00:00
Makefile ARM: mxs: Add initial support for Bluegiga APX4 Development Kit 2012-02-04 07:35:54 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mm.c ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file 2011-10-04 10:08:06 +02:00
module-tx28.c ARM: mxs/tx28: add __initconst for fec pdata 2011-12-02 13:27:22 +08:00
module-tx28.h ARM: mxs: configure and register the second FEC device on TX28/STK5-V4 2011-03-23 15:08:14 +01:00
ocotp.c arm: mxs: include asm/processor.h for cpu_relax() 2011-06-06 09:50:04 +02:00
pm.c ARM: substitute arch_idle() 2012-01-20 18:55:19 -05:00
regs-clkctrl-mx23.h
regs-clkctrl-mx28.h
system.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timer.c ARM: mxs: convert platform code to clk_prepare/clk_unprepare 2011-12-28 21:26:07 +08:00