Commit 623ff773 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents c39e8ede 7b0e67f6

Documentation/devicetree/bindings/mtd/fsmc-nand.txt

0 → 100644
+33 −0
Original line number Original line Diff line number Diff line 
* FSMC NAND



Required properties:

- compatible : "st,spear600-fsmc-nand"

- reg : Address range of the mtd chip

- reg-names: Should contain the reg names "fsmc_regs" and "nand_data"

- st,ale-off : Chip specific offset to ALE

- st,cle-off : Chip specific offset to CLE



Optional properties:

- bank-width : Width (in bytes) of the device.  If not present, the width

  defaults to 1 byte

- nand-skip-bbtscan: Indicates the the BBT scanning should be skipped



Example:



	fsmc: flash@d1800000 {

		compatible = "st,spear600-fsmc-nand";

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0xd1800000 0x1000	/* FSMC Register */

		       0xd2000000 0x4000>;	/* NAND Base */

		reg-names = "fsmc_regs", "nand_data";

		st,ale-off = <0x20000>;

		st,cle-off = <0x10000>;



		bank-width = <1>;

		nand-skip-bbtscan;



		partition@0 {

			...

		};

	};

Documentation/devicetree/bindings/mtd/spear_smi.txt

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
* SPEAr SMI



Required properties:

- compatible : "st,spear600-smi"

- reg : Address range of the mtd chip

- #address-cells, #size-cells : Must be present if the device has sub-nodes

  representing partitions.

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device

- interrupts: Should contain the STMMAC interrupts

- clock-rate : Functional clock rate of SMI in Hz



Optional properties:

- st,smi-fast-mode : Flash supports read in fast mode



Example:



	smi: flash@fc000000 {

		compatible = "st,spear600-smi";

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0xfc000000 0x1000>;

		interrupt-parent = <&vic1>;

		interrupts = <12>;

		clock-rate = <50000000>;	/* 50MHz */



		flash@f8000000 {

			st,smi-fast-mode;

			...

		};

	};

arch/arm/mach-omap1/flash.c

+6 −14
Original line number Original line Diff line number Diff line
@@ -17,20 +17,12 @@ 




void omap1_set_vpp(struct platform_device *pdev, int enable)

void omap1_set_vpp(struct platform_device *pdev, int enable)

{

{

	static int count;

	u32 l;

	u32 l;





	if (enable) {

		if (count++ == 0) {

	l = omap_readl(EMIFS_CONFIG);

	l = omap_readl(EMIFS_CONFIG);

	if (enable)

		l |= OMAP_EMIFS_CONFIG_WP;

		l |= OMAP_EMIFS_CONFIG_WP;

			omap_writel(l, EMIFS_CONFIG);

	else

		}

	} else {

		if (count && (--count == 0)) {

			l = omap_readl(EMIFS_CONFIG);

		l &= ~OMAP_EMIFS_CONFIG_WP;

		l &= ~OMAP_EMIFS_CONFIG_WP;

	omap_writel(l, EMIFS_CONFIG);

	omap_writel(l, EMIFS_CONFIG);

}
 
}
 
	}

}

arch/arm/mach-s3c24xx/simtec-nor.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -35,9 +35,7 @@ 
static void simtec_nor_vpp(struct platform_device *pdev, int vpp)

static void simtec_nor_vpp(struct platform_device *pdev, int vpp)

{

{

	unsigned int val;

	unsigned int val;

	unsigned long flags;





	local_irq_save(flags);

	val = __raw_readb(BAST_VA_CTRL3);

	val = __raw_readb(BAST_VA_CTRL3);





	printk(KERN_DEBUG "%s(%d)\n", __func__, vpp);

	printk(KERN_DEBUG "%s(%d)\n", __func__, vpp);
@@ -48,7 +46,6 @@ static void simtec_nor_vpp(struct platform_device *pdev, int vpp) 
		val &= ~BAST_CPLD_CTRL3_ROMWEN;

		val &= ~BAST_CPLD_CTRL3_ROMWEN;





	__raw_writeb(val, BAST_VA_CTRL3);

	__raw_writeb(val, BAST_VA_CTRL3);

	local_irq_restore(flags);

}

}





static struct physmap_flash_data simtec_nor_pdata = {

static struct physmap_flash_data simtec_nor_pdata = {

arch/arm/mach-shmobile/board-mackerel.c

+71 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/sh_flctl.h>

#include <linux/pm_clock.h>

#include <linux/pm_clock.h>

#include <linux/smsc911x.h>

#include <linux/smsc911x.h>

#include <linux/sh_intc.h>

#include <linux/sh_intc.h>
@@ -956,6 +957,50 @@ static struct platform_device fsi_ak4643_device = { 
	},

	},

};

};





/* FLCTL */

static struct mtd_partition nand_partition_info[] = {

	{

		.name	= "system",

		.offset	= 0,

		.size	= 128 * 1024 * 1024,

	},

	{

		.name	= "userdata",

		.offset	= MTDPART_OFS_APPEND,

		.size	= 256 * 1024 * 1024,

	},

	{

		.name	= "cache",

		.offset	= MTDPART_OFS_APPEND,

		.size	= 128 * 1024 * 1024,

	},

};



static struct resource nand_flash_resources[] = {

	[0] = {

		.start	= 0xe6a30000,

		.end	= 0xe6a3009b,

		.flags	= IORESOURCE_MEM,

	}

};



static struct sh_flctl_platform_data nand_flash_data = {

	.parts		= nand_partition_info,

	.nr_parts	= ARRAY_SIZE(nand_partition_info),

	.flcmncr_val	= CLK_16B_12L_4H | TYPESEL_SET

			| SHBUSSEL | SEL_16BIT | SNAND_E,

	.use_holden	= 1,

};



static struct platform_device nand_flash_device = {

	.name		= "sh_flctl",

	.resource	= nand_flash_resources,

	.num_resources	= ARRAY_SIZE(nand_flash_resources),

	.dev		= {

		.platform_data = &nand_flash_data,

	},

};



/*

/*

 * The card detect pin of the top SD/MMC slot (CN7) is active low and is

 * The card detect pin of the top SD/MMC slot (CN7) is active low and is

 * connected to GPIO A22 of SH7372 (GPIO_PORT41).

 * connected to GPIO A22 of SH7372 (GPIO_PORT41).
@@ -1259,6 +1304,7 @@ static struct platform_device *mackerel_devices[] __initdata = { 
	&fsi_device,

	&fsi_device,

	&fsi_ak4643_device,

	&fsi_ak4643_device,

	&fsi_hdmi_device,

	&fsi_hdmi_device,

	&nand_flash_device,

	&sdhi0_device,

	&sdhi0_device,

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

	&sdhi1_device,

	&sdhi1_device,
@@ -1488,6 +1534,30 @@ static void __init mackerel_init(void) 
	gpio_request(GPIO_FN_MMCCMD0, NULL);

	gpio_request(GPIO_FN_MMCCMD0, NULL);

	gpio_request(GPIO_FN_MMCCLK0, NULL);

	gpio_request(GPIO_FN_MMCCLK0, NULL);





	/* FLCTL */

	gpio_request(GPIO_FN_D0_NAF0, NULL);

	gpio_request(GPIO_FN_D1_NAF1, NULL);

	gpio_request(GPIO_FN_D2_NAF2, NULL);

	gpio_request(GPIO_FN_D3_NAF3, NULL);

	gpio_request(GPIO_FN_D4_NAF4, NULL);

	gpio_request(GPIO_FN_D5_NAF5, NULL);

	gpio_request(GPIO_FN_D6_NAF6, NULL);

	gpio_request(GPIO_FN_D7_NAF7, NULL);

	gpio_request(GPIO_FN_D8_NAF8, NULL);

	gpio_request(GPIO_FN_D9_NAF9, NULL);

	gpio_request(GPIO_FN_D10_NAF10, NULL);

	gpio_request(GPIO_FN_D11_NAF11, NULL);

	gpio_request(GPIO_FN_D12_NAF12, NULL);

	gpio_request(GPIO_FN_D13_NAF13, NULL);

	gpio_request(GPIO_FN_D14_NAF14, NULL);

	gpio_request(GPIO_FN_D15_NAF15, NULL);

	gpio_request(GPIO_FN_FCE0, NULL);

	gpio_request(GPIO_FN_WE0_FWE, NULL);

	gpio_request(GPIO_FN_FRB, NULL);

	gpio_request(GPIO_FN_A4_FOE, NULL);

	gpio_request(GPIO_FN_A5_FCDE, NULL);

	gpio_request(GPIO_FN_RD_FSC, NULL);



	/* enable GPS module (GT-720F) */

	/* enable GPS module (GT-720F) */

	gpio_request(GPIO_FN_SCIFA2_TXD1, NULL);

	gpio_request(GPIO_FN_SCIFA2_TXD1, NULL);

	gpio_request(GPIO_FN_SCIFA2_RXD1, NULL);

	gpio_request(GPIO_FN_SCIFA2_RXD1, NULL);
@@ -1532,6 +1602,7 @@ static void __init mackerel_init(void) 
	sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);

	sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs0_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs0_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs1_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs1_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &nand_flash_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &sh_mmcif_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &sh_mmcif_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi0_device);

	sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi0_device);

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE