diff options
author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2012-08-05 16:39:13 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-22 10:38:58 -0400 |
commit | 2eecb477765840c175133117010a789e58824680 (patch) | |
tree | 78932129b5615871730851664a008e3ec8bf6c10 /arch/arm/mach-kirkwood | |
parent | 17ba0226b9e88cf6ee506986befadfab70ebc6c8 (diff) |
ARM: Kirkwood: Describe iconnect nand in DT.
Define the nand and its partitions in DT and remove them from cmdline
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/board-iconnect.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c index 51728db92dc5..d084b1e2943a 100644 --- a/arch/arm/mach-kirkwood/board-iconnect.c +++ b/arch/arm/mach-kirkwood/board-iconnect.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/of_fdt.h> | 16 | #include <linux/of_fdt.h> |
17 | #include <linux/of_irq.h> | 17 | #include <linux/of_irq.h> |
18 | #include <linux/of_platform.h> | 18 | #include <linux/of_platform.h> |
19 | #include <linux/mtd/partitions.h> | ||
20 | #include <linux/mv643xx_eth.h> | 19 | #include <linux/mv643xx_eth.h> |
21 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
22 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
@@ -42,18 +41,9 @@ static unsigned int iconnect_mpp_config[] __initdata = { | |||
42 | 0 | 41 | 0 |
43 | }; | 42 | }; |
44 | 43 | ||
45 | static struct mtd_partition iconnect_nand_parts[] = { | ||
46 | { | ||
47 | .name = "flash", | ||
48 | .offset = 0, | ||
49 | .size = MTDPART_SIZ_FULL, | ||
50 | }, | ||
51 | }; | ||
52 | |||
53 | void __init iconnect_init(void) | 44 | void __init iconnect_init(void) |
54 | { | 45 | { |
55 | kirkwood_mpp_conf(iconnect_mpp_config); | 46 | kirkwood_mpp_conf(iconnect_mpp_config); |
56 | kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25); | ||
57 | 47 | ||
58 | kirkwood_ehci_init(); | 48 | kirkwood_ehci_init(); |
59 | kirkwood_ge00_init(&iconnect_ge00_data); | 49 | kirkwood_ge00_init(&iconnect_ge00_data); |