[<prev] [next>] [day] [month] [year] [list]
Message-ID: <1327331725-10559-1-git-send-email-prakash.pm@ti.com>
Date: Mon, 23 Jan 2012 20:45:25 +0530
From: "Manjunathappa, Prakash" <prakash.pm@...com>
To: <linux-arm-kernel@...ts.infradead.org>,
<linux-mtd@...ts.infradead.org>, <linux-kernel@...r.kernel.org>
CC: Sekhar Nori <nsekhar@...com>,
<davinci-linux-open-source@...ux.davincidsp.com>,
Russell King <linux@....linux.org.uk>,
David Woodhouse <dwmw2@...radead.org>,
Samuel Ortiz <sameo@...ux.intel.com>,
"Manjunathappa, Prakash" <prakash.pm@...com>
Subject: [PATCH 3/3] arm: da830: move NAND and NOR devices as aemif MFD slaves
NAND and NOR device are made as aemif devices slave, hence device
registration achieved via aemif MFD driver.
Signed-off-by: Manjunathappa, Prakash <prakash.pm@...com>
---
arch/arm/mach-davinci/board-da830-evm.c | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 0b43554..0ad3662 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -396,14 +396,29 @@ static struct resource da830_evm_nand_resources[] = {
},
};
-static struct platform_device da830_evm_nand_device = {
- .name = "davinci_nand",
- .id = 1,
- .dev = {
- .platform_data = &da830_evm_nand_pdata,
+static struct platform_device da830_evm_devices[] __initdata = {
+ {
+ .name = "davinci_nand",
+ .id = 1,
+ .dev = {
+ .platform_data = &da830_evm_nand_pdata,
+ },
+ .num_resources = ARRAY_SIZE(da830_evm_nand_resources),
+ .resource = da830_evm_nand_resources,
+ },
+};
+
+static struct davinci_aemif_devices da830_emif_devices = {
+ .devices = da830_evm_devices,
+ .num_devices = ARRAY_SIZE(da830_evm_devices),
+};
+
+static struct platform_device davinci_emif_device = {
+ .name = "davinci_aemif",
+ .id = -1,
+ .dev = {
+ .platform_data = &da830_emif_devices,
},
- .num_resources = ARRAY_SIZE(da830_evm_nand_resources),
- .resource = da830_evm_nand_resources,
};
static inline void da830_evm_init_nand(int mux_mode)
@@ -422,7 +437,7 @@ static inline void da830_evm_init_nand(int mux_mode)
pr_warning("da830_evm_init: emif25 mux setup failed: %d\n",
ret);
- ret = platform_device_register(&da830_evm_nand_device);
+ ret = platform_device_register(&davinci_emif_device);
if (ret)
pr_warning("da830_evm_init: NAND device not registered.\n");
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists