 2dcf78c0ee
			
		
	
	
	2dcf78c0ee
	
	
	
		
			
			There are some more conflicts than detected by git, namely support for the newly added cpuimx machines needed to be converted to dynamic device registration. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Conflicts: arch/arm/mach-imx/Makefile arch/arm/mach-imx/devices.c arch/arm/mach-imx/devices.h arch/arm/mach-imx/eukrea_mbimx27-baseboard.c arch/arm/mach-mx2/Kconfig arch/arm/mach-mx25/Makefile arch/arm/mach-mx25/devices.c arch/arm/plat-mxc/include/mach/mx25.h arch/arm/plat-mxc/include/mach/mxc_nand.h
		
			
				
	
	
		
			32 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			32 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
 | |
|  * Copyright 2008 Sascha Hauer, kernel@pengutronix.de
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU General Public License
 | |
|  * as published by the Free Software Foundation; either version 2
 | |
|  * of the License, or (at your option) any later version.
 | |
|  * This program is distributed in the hope that it will be useful,
 | |
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
|  * GNU General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU General Public License
 | |
|  * along with this program; if not, write to the Free Software
 | |
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 | |
|  * MA 02110-1301, USA.
 | |
|  */
 | |
| 
 | |
| #ifndef __ASM_ARCH_NAND_H
 | |
| #define __ASM_ARCH_NAND_H
 | |
| 
 | |
| #include <linux/mtd/partitions.h>
 | |
| 
 | |
| struct mxc_nand_platform_data {
 | |
| 	unsigned int width;	/* data bus width in bytes */
 | |
| 	unsigned int hw_ecc:1;	/* 0 if supress hardware ECC */
 | |
| 	unsigned int flash_bbt:1; /* set to 1 to use a flash based bbt */
 | |
| 	struct mtd_partition *parts;	/* partition table */
 | |
| 	int nr_parts;			/* size of parts */
 | |
| };
 | |
| #endif /* __ASM_ARCH_NAND_H */
 |