linux/arch/arm/mach-shmobile
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: cleanups of io includes 2012-03-29 18:02:10 -07:00
Kconfig sh: intc: unify evt2irq/irq2evt macros for sh and arm 2012-01-25 20:37:47 -06:00
Makefile ARM: shmobile: convert to twd_local_timer_register() interface 2012-03-13 13:30:31 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
board-ag5evm.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
board-ap4evb.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
board-bonito.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
board-g3evm.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
board-g4evm.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
board-kota2.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
board-mackerel.c MTD merge for 3.4 2012-03-30 17:31:56 -07:00
board-marzen.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
clock-r8a7740.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-r8a7779.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh73a0.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh7367.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh7372.c MTD merge for 3.4 2012-03-30 17:31:56 -07:00
clock-sh7377.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
console.c ARM: mach-shmobile: early console support using earlyprintk 2010-02-09 10:34:12 +09:00
cpuidle.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2012-03-30 16:45:39 -07:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp.S ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT 2012-01-09 10:36:48 +09:00
hotplug.c ARM: mach-shmobile: Flush caches in platform_cpu_die() 2012-01-09 10:37:29 +09:00
intc-r8a7740.c ARM: shmobile: remove NR_IRQS 2012-01-25 20:37:51 -06:00
intc-r8a7779.c ARM: __io abuse cleanup 2012-03-13 21:25:21 -05:00
intc-sh73a0.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
intc-sh7367.c ARM: shmobile: remove NR_IRQS 2012-01-25 20:37:51 -06:00
intc-sh7372.c ARM: shmobile: remove NR_IRQS 2012-01-25 20:37:51 -06:00
intc-sh7377.c ARM: shmobile: remove NR_IRQS 2012-01-25 20:37:51 -06:00
pfc-r8a7740.c ARM: mach-shmobile: r8a7740: add PFC support. 2011-11-11 16:55:33 +09:00
pfc-r8a7779.c ARM: mach-shmobile: r8a7779 PFC IPSR4 fix 2012-02-24 13:24:59 +09:00
pfc-sh73a0.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
pfc-sh7367.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
pfc-sh7372.c ARM: mach-shmobile: add GPIO-to-IRQ translation to sh7372 2012-01-24 10:40:25 +09:00
pfc-sh7377.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
platsmp.c ARM: shmobile: convert to twd_local_timer_register() interface 2012-03-13 13:30:31 +00:00
pm-r8a7779.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
pm-sh7372.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
setup-r8a7740.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
setup-r8a7779.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
setup-sh73a0.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
setup-sh7367.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
setup-sh7372.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
setup-sh7377.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
sleep-sh7372.S PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode 2011-12-25 23:39:03 +01:00
smp-r8a7779.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
smp-sh73a0.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
suspend.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
timer.c Merge branch 'renesas/timer' into next/timer 2012-03-20 09:41:43 +00:00