diff options
-rw-r--r-- | arch/arm/mach-mx3/devices.c | 19 | ||||
-rw-r--r-- | arch/arm/mach-mx3/devices.h | 1 | ||||
-rw-r--r-- | drivers/mtd/nand/Kconfig | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 12b3e3c00460..3e61ff4646fe 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c | |||
@@ -160,3 +160,22 @@ struct platform_device mxc_w1_master_device = { | |||
160 | .num_resources = ARRAY_SIZE(mxc_w1_master_resources), | 160 | .num_resources = ARRAY_SIZE(mxc_w1_master_resources), |
161 | .resource = mxc_w1_master_resources, | 161 | .resource = mxc_w1_master_resources, |
162 | }; | 162 | }; |
163 | |||
164 | static struct resource mxc_nand_resources[] = { | ||
165 | { | ||
166 | .start = NFC_BASE_ADDR, | ||
167 | .end = NFC_BASE_ADDR + 0xfff, | ||
168 | .flags = IORESOURCE_MEM | ||
169 | }, { | ||
170 | .start = MXC_INT_NANDFC, | ||
171 | .end = MXC_INT_NANDFC, | ||
172 | .flags = IORESOURCE_IRQ | ||
173 | }, | ||
174 | }; | ||
175 | |||
176 | struct platform_device mxc_nand_device = { | ||
177 | .name = "mxc_nand", | ||
178 | .id = 0, | ||
179 | .num_resources = ARRAY_SIZE(mxc_nand_resources), | ||
180 | .resource = mxc_nand_resources, | ||
181 | }; | ||
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h index cb1459c7c960..9949ef4e0694 100644 --- a/arch/arm/mach-mx3/devices.h +++ b/arch/arm/mach-mx3/devices.h | |||
@@ -5,3 +5,4 @@ extern struct platform_device mxc_uart_device2; | |||
5 | extern struct platform_device mxc_uart_device3; | 5 | extern struct platform_device mxc_uart_device3; |
6 | extern struct platform_device mxc_uart_device4; | 6 | extern struct platform_device mxc_uart_device4; |
7 | extern struct platform_device mxc_w1_master_device; | 7 | extern struct platform_device mxc_w1_master_device; |
8 | extern struct platform_device mxc_nand_device; | ||
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 1c2e9450d663..f8ae0400c49c 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
@@ -408,7 +408,7 @@ config MTD_NAND_FSL_UPM | |||
408 | 408 | ||
409 | config MTD_NAND_MXC | 409 | config MTD_NAND_MXC |
410 | tristate "MXC NAND support" | 410 | tristate "MXC NAND support" |
411 | depends on ARCH_MX2 | 411 | depends on ARCH_MX2 || ARCH_MX3 |
412 | help | 412 | help |
413 | This enables the driver for the NAND flash controller on the | 413 | This enables the driver for the NAND flash controller on the |
414 | MXC processors. | 414 | MXC processors. |