Commit 79346507 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/mtd-2.6 

* git://git.infradead.org/mtd-2.6: (82 commits)
  mtd: fix build error in m25p80.c
  mtd: Remove redundant mutex from mtd_blkdevs.c
  MTD: Fix wrong check register_blkdev return value
  Revert "mtd: cleanup Kconfig dependencies"
  mtd: cfi_cmdset_0002: make sector erase command variable
  mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
  mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
  mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
  block2mtd: dubious assignment
  P4080/mtd: Fix the freescale lbc issue with 36bit mode
  P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
  mtd: phram: use KBUILD_MODNAME
  mtd: OneNAND: S5PC110: Fix double call suspend & resume function
  mtd: nand: fix MTD_MODE_RAW writes
  jffs2: use kmemdup
  mtd: sm_ftl: cosmetic, use bool when possible
  mtd: r852: remove useless pci powerup/down from suspend/resume routines
  mtd: blktrans: fix a race vs kthread_stop
  mtd: blktrans: kill BKL
  mtd: allow to unload the mtdtrans module if its block devices aren't open
  ...

Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c
parents 706d4b12 40847437

arch/arm/mach-u300/clock.c

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static DEFINE_SPINLOCK(syscon_resetreg_lock); 
 *  AMBA bus

 *  |

 *  +- CPU

 *  +- NANDIF NAND Flash interface

 *  +- FSMC NANDIF NAND Flash interface

 *  +- SEMI Shared Memory interface

 *  +- ISP Image Signal Processor (U335 only)

 *  +- CDS (U335 only)
@@ -726,7 +726,7 @@ static struct clk cpu_clk = { 
};



static struct clk nandif_clk = {

	.name       = "NANDIF",

	.name       = "FSMC",

	.parent	    = &amba_clk,

	.hw_ctrld   = false,

	.reset	    = true,
@@ -1259,7 +1259,7 @@ static struct clk_lookup lookups[] = { 
	/* Connected directly to the AMBA bus */

	DEF_LOOKUP("amba",      &amba_clk),

	DEF_LOOKUP("cpu",       &cpu_clk),

	DEF_LOOKUP("fsmc",      &nandif_clk),

	DEF_LOOKUP("fsmc-nand", &nandif_clk),

	DEF_LOOKUP("semi",      &semi_clk),

#ifdef CONFIG_MACH_U300_BS335

	DEF_LOOKUP("isp",       &isp_clk),

arch/arm/mach-u300/core.c

+42 −5
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
#include <linux/gpio.h>

#include <linux/clk.h>

#include <linux/err.h>

#include <mach/coh901318.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/fsmc.h>



#include <asm/types.h>

#include <asm/setup.h>
@@ -30,6 +31,7 @@ 
#include <asm/mach/map.h>

#include <asm/mach/irq.h>



#include <mach/coh901318.h>

#include <mach/hardware.h>

#include <mach/syscon.h>

#include <mach/dma_channels.h>
@@ -285,6 +287,13 @@ static struct resource rtc_resources[] = { 
 */

static struct resource fsmc_resources[] = {

	{

		.name  = "nand_data",

		.start = U300_NAND_CS0_PHYS_BASE,

		.end   = U300_NAND_CS0_PHYS_BASE + SZ_16K - 1,

		.flags = IORESOURCE_MEM,

	},

	{

		.name  = "fsmc_regs",

		.start = U300_NAND_IF_PHYS_BASE,

		.end   = U300_NAND_IF_PHYS_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,
@@ -1429,11 +1438,39 @@ static struct platform_device rtc_device = { 
	.resource = rtc_resources,

};



static struct platform_device fsmc_device = {

	.name = "nandif",

static struct mtd_partition u300_partitions[] = {

	{

		.name = "bootrecords",

		.offset = 0,

		.size = SZ_128K,

	},

	{

		.name = "free",

		.offset = SZ_128K,

		.size = 8064 * SZ_1K,

	},

	{

		.name = "platform",

		.offset = 8192 * SZ_1K,

		.size = 253952 * SZ_1K,

	},

};



static struct fsmc_nand_platform_data nand_platform_data = {

	.partitions = u300_partitions,

	.nr_partitions = ARRAY_SIZE(u300_partitions),

	.options = NAND_SKIP_BBTSCAN,

	.width = FSMC_NAND_BW8,

};



static struct platform_device nand_device = {

	.name = "fsmc-nand",

	.id = -1,

	.num_resources = ARRAY_SIZE(fsmc_resources),

	.resource = fsmc_resources,

	.num_resources = ARRAY_SIZE(fsmc_resources),

	.dev = {

		.platform_data = &nand_platform_data,

	},

};



static struct platform_device ave_device = {
@@ -1465,7 +1502,7 @@ static struct platform_device *platform_devs[] __initdata = { 
	&keypad_device,

	&rtc_device,

	&gpio_device,

	&fsmc_device,

	&nand_device,

	&wdog_device,

	&ave_device

};

arch/arm/mach-u300/include/mach/u300-regs.h

+0 −2
Original line number Diff line number Diff line
@@ -20,11 +20,9 @@ 


/* NAND Flash CS0 */

#define U300_NAND_CS0_PHYS_BASE		0x80000000

#define U300_NAND_CS0_VIRT_BASE		0xff040000



/* NFIF */

#define U300_NAND_IF_PHYS_BASE		0x9f800000

#define U300_NAND_IF_VIRT_BASE		0xff030000



/* AHB Peripherals */

#define U300_AHB_PER_PHYS_BASE		0xa0000000

arch/arm/plat-pxa/include/plat/pxa3xx_nand.h

+9 −9
Original line number Diff line number Diff line
@@ -30,15 +30,15 @@ struct pxa3xx_nand_cmdset { 
};



struct pxa3xx_nand_flash {

	const struct pxa3xx_nand_timing *timing; /* NAND Flash timing */

	const struct pxa3xx_nand_cmdset *cmdset;



	uint32_t page_per_block;/* Pages per block (PG_PER_BLK) */

	uint32_t page_size;	/* Page size in bytes (PAGE_SZ) */

	uint32_t flash_width;	/* Width of Flash memory (DWIDTH_M) */

	uint32_t dfc_width;	/* Width of flash controller(DWIDTH_C) */

	uint32_t num_blocks;	/* Number of physical blocks in Flash */

	uint32_t	chip_id;

	unsigned int	page_per_block; /* Pages per block (PG_PER_BLK) */

	unsigned int	page_size;	/* Page size in bytes (PAGE_SZ) */

	unsigned int	flash_width;	/* Width of Flash memory (DWIDTH_M) */

	unsigned int	dfc_width;	/* Width of flash controller(DWIDTH_C) */

	unsigned int	num_blocks;	/* Number of physical blocks in Flash */



	struct pxa3xx_nand_cmdset *cmdset;	/* NAND command set */

	struct pxa3xx_nand_timing *timing;	/* NAND Flash timing */

};



struct pxa3xx_nand_platform_data {

arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h

0 → 100644
+97 −0
Original line number Diff line number Diff line 
#ifndef __BCM963XX_TAG_H

#define __BCM963XX_TAG_H



#define TAGVER_LEN		4	/* Length of Tag Version */

#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */

#define SIG1_LEN		20	/* Company Signature 1 Length */

#define SIG2_LEN		14	/* Company Signature 2 Lenght */

#define BOARDID_LEN		16	/* Length of BoardId */

#define ENDIANFLAG_LEN		2	/* Endian Flag Length */

#define CHIPID_LEN		6	/* Chip Id Length */

#define IMAGE_LEN		10	/* Length of Length Field */

#define ADDRESS_LEN		12	/* Length of Address field */

#define DUALFLAG_LEN		2	/* Dual Image flag Length */

#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */

#define RSASIG_LEN		20	/* Length of RSA Signature in tag */

#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */

#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */

#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */

#define CRC_LEN			4	/* Length of CRC in bytes */

#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */



#define NUM_PIRELLI		2

#define IMAGETAG_CRC_START	0xFFFFFFFF



#define PIRELLI_BOARDS { \

	"AGPF-S0", \

	"DWV-S0", \

}



/*

 * The broadcom firmware assumes the rootfs starts the image,

 * therefore uses the rootfs start (flash_image_address)

 * to determine where to flash the image.  Since we have the kernel first

 * we have to give it the kernel address, but the crc uses the length

 * associated with this address (root_length), which is added to the kernel

 * length (kernel_length) to determine the length of image to flash and thus

 * needs to be rootfs + deadcode (jffs2 EOF marker)

*/



struct bcm_tag {

	/* 0-3: Version of the image tag */

	char tag_version[TAGVER_LEN];

	/* 4-23: Company Line 1 */

	char sig_1[SIG1_LEN];

	/*  24-37: Company Line 2 */

	char sig_2[SIG2_LEN];

	/* 38-43: Chip this image is for */

	char chip_id[CHIPID_LEN];

	/* 44-59: Board name */

	char board_id[BOARDID_LEN];

	/* 60-61: Map endianness -- 1 BE 0 LE */

	char big_endian[ENDIANFLAG_LEN];

	/* 62-71: Total length of image */

	char total_length[IMAGE_LEN];

	/* 72-83: Address in memory of CFE */

	char cfe__address[ADDRESS_LEN];

	/* 84-93: Size of CFE */

	char cfe_length[IMAGE_LEN];

	/* 94-105: Address in memory of image start

	 * (kernel for OpenWRT, rootfs for stock firmware)

	 */

	char flash_image_start[ADDRESS_LEN];

	/* 106-115: Size of rootfs */

	char root_length[IMAGE_LEN];

	/* 116-127: Address in memory of kernel */

	char kernel_address[ADDRESS_LEN];

	/* 128-137: Size of kernel */

	char kernel_length[IMAGE_LEN];

	/* 138-139: Unused at the moment */

	char dual_image[DUALFLAG_LEN];

	/* 140-141: Unused at the moment */

	char inactive_flag[INACTIVEFLAG_LEN];

	/* 142-161: RSA Signature (not used; some vendors may use this) */

	char rsa_signature[RSASIG_LEN];

	/* 162-191: Compilation and related information (not used in OpenWrt) */

	char information1[TAGINFO1_LEN];

	/* 192-195: Version flash layout */

	char flash_layout_ver[FLASHLAYOUTVER_LEN];

	/* 196-199: kernel+rootfs CRC32 */

	char fskernel_crc[CRC_LEN];

	/* 200-215: Unused except on Alice Gate where is is information */

	char information2[TAGINFO2_LEN];

	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */

	char image_crc[CRC_LEN];

	/* 220-223: CRC32 of rootfs partition */

	char rootfs_crc[CRC_LEN];

	/* 224-227: CRC32 of kernel partition */

	char kernel_crc[CRC_LEN];

	/* 228-235: Unused at present */

	char reserved1[8];

	/* 236-239: CRC32 of header excluding tagVersion */

	char header_crc[CRC_LEN];

	/* 240-255: Unused at present */

	char reserved2[16];

};



#endif /* __BCM63XX_TAG_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE