From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 00:16:02 +0000 (+1100)
Subject: Merge remote-tracking branch 'mtd/master'
X-Git-Tag: next-20121008~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=beaf947a0283ff2eeae16af30459635647b9b32b;p=karo-tx-linux.git

Merge remote-tracking branch 'mtd/master'

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c
---

beaf947a0283ff2eeae16af30459635647b9b32b
diff --cc arch/arm/mach-imx/clk-imx51-imx53.c
index e5165a84f93f,e81f17a70f00..a0bf84803eac
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@@ -461,10 -456,7 +462,11 @@@ int __init mx53_clocks_init(unsigned lo
  	clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi");
  	clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi");
  	clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi");
+ 	clk_register_clkdev(clk[nfc_gate], NULL, "63fdb000.nand");
 +	clk_register_clkdev(clk[can1_ipg_gate], "ipg", "53fc8000.can");
 +	clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can");
 +	clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can");
 +	clk_register_clkdev(clk[can2_serial_gate], "per", "53fcc000.can");
  
  	/* set SDHC root clock to 200MHZ*/
  	clk_set_rate(clk[esdhc_a_podf], 200000000);
diff --cc drivers/mtd/nand/davinci_nand.c
index f1deb1ee2c95,df1ab7dc3440..945047ad0952
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@@ -33,9 -33,10 +33,10 @@@
  #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
  #include <linux/slab.h>
+ #include <linux/of_device.h>
  
 -#include <mach/nand.h>
 -#include <mach/aemif.h>
 +#include <linux/platform_data/mtd-davinci.h>
 +#include <linux/platform_data/mtd-davinci-aemif.h>
  
  /*
   * This is a device driver for the NAND flash controller found on the
diff --cc drivers/mtd/nand/orion_nand.c
index 131b58a133f1,9ee436d30932..aefaf8cd31ef
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@@ -21,8 -21,7 +21,7 @@@
  #include <linux/err.h>
  #include <asm/io.h>
  #include <asm/sizes.h>
- #include <mach/hardware.h>
 -#include <plat/orion_nand.h>
 +#include <linux/platform_data/mtd-orion_nand.h>
  
  static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
  {
diff --cc drivers/mtd/nand/s3c2410.c
index d8040619ad8d,792cee846221..295e4bedad96
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@@ -43,24 -46,9 +46,9 @@@
  #include <linux/mtd/nand_ecc.h>
  #include <linux/mtd/partitions.h>
  
- #include <asm/io.h>
- 
  #include <plat/regs-nand.h>
 -#include <plat/nand.h>
 +#include <linux/platform_data/mtd-nand-s3c2410.h>
  
- #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
- static int hardware_ecc = 1;
- #else
- static int hardware_ecc = 0;
- #endif
- 
- #ifdef CONFIG_MTD_NAND_S3C2410_CLKSTOP
- static const int clock_stop = 1;
- #else
- static const int clock_stop = 0;
- #endif
- 
- 
  /* new oob placement block for use with hardware ecc generation
   */