diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-03 11:59:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-01 09:33:03 +0200 |
| commit | 63a7c6d7507ed6f4ea24a8ed008efa1bb22a2a97 (patch) | |
| tree | 4824f195ebc2856bc9613624c31e5d5fac6de595 /arch/arm/plat-mxc/include | |
| parent | 00b57bf9786ca701508333112c8917d1e0860129 (diff) | |
| download | op-kernel-dev-63a7c6d7507ed6f4ea24a8ed008efa1bb22a2a97.zip op-kernel-dev-63a7c6d7507ed6f4ea24a8ed008efa1bb22a2a97.tar.gz | |
ARM: mx5: dynamically register mxc-nand device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 7 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx51.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index 371336e..f87aa1a 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h @@ -71,8 +71,15 @@ struct platform_device *__init imx_add_imx_uart_1irq( #include <mach/mxc_nand.h> struct imx_mxc_nand_data { + /* + * id is traditionally 0, but -1 is more appropriate. We use -1 for new + * machines but don't change existing devices as the nand device usually + * appears in the kernel command line to pass its partitioning. + */ + int id; resource_size_t iobase; resource_size_t iosize; + resource_size_t axibase; resource_size_t irq; }; struct platform_device *__init imx_add_mxc_nand( diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h index b47d65b..c99eeab 100644 --- a/arch/arm/plat-mxc/include/mach/mx51.h +++ b/arch/arm/plat-mxc/include/mach/mx51.h @@ -287,7 +287,7 @@ #define MX51_MXC_INT_RESV5 5 #define MX51_MXC_INT_SDMA 6 #define MX51_MXC_INT_IOMUX 7 -#define MX51_MXC_INT_NFC 8 +#define MX51_INT_NFC 8 #define MX51_MXC_INT_VPU 9 #define MX51_MXC_INT_IPU_ERR 10 #define MX51_MXC_INT_IPU_SYN 11 |
