diff mbox

[v2,3/3] arm: da830: move NAND and NOR devices as aemif MFD slaves

Message ID 1327487156-10238-3-git-send-email-prakash.pm@ti.com
State Not Applicable
Headers show

Commit Message

Manjunathappa, Prakash Jan. 25, 2012, 10:25 a.m. UTC
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@ti.com>
---
Since v1:
Patch is generated using -M option.

 arch/arm/mach-davinci/board-da830-evm.c |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

Comments

Sergei Shtylyov Jan. 25, 2012, 2:51 p.m. UTC | #1
Hello.

On 01/25/2012 01:25 PM, Manjunathappa, Prakash wrote:

> 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@ti.com>
> ---
> Since v1:
> Patch is generated using -M option.

>   arch/arm/mach-davinci/board-da830-evm.c |   31 +++++++++++++++++++++++--------
>   1 files changed, 23 insertions(+), 8 deletions(-)

    Why only this file? Don't other board files have NAND/NOR devices?

WBR, Sergei
Manjunathappa, Prakash Jan. 30, 2012, 6:58 a.m. UTC | #2
Hi Sergei,

On Wed, Jan 25, 2012 at 20:21:32, Sergei Shtylyov wrote:
> Hello.
> 
> On 01/25/2012 01:25 PM, Manjunathappa, Prakash wrote:
> 
> > 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@ti.com>
> > ---
> > Since v1:
> > Patch is generated using -M option.
> 
> >   arch/arm/mach-davinci/board-da830-evm.c |   31 +++++++++++++++++++++++--------
> >   1 files changed, 23 insertions(+), 8 deletions(-)
> 
>     Why only this file? Don't other board files have NAND/NOR devices?

Yes I thought of sending board-da850 changes in separate patch. Should I have to send those changes also in this patch?

Thanks,
Prakash
> 
> WBR, Sergei
>
Sergei Shtylyov Jan. 30, 2012, 10:40 a.m. UTC | #3
Hello.

On 30-01-2012 10:58, Manjunathappa, Prakash wrote:

>>> 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@ti.com>
>>> ---
>>> Since v1:
>>> Patch is generated using -M option.

>>>    arch/arm/mach-davinci/board-da830-evm.c |   31 +++++++++++++++++++++++--------
>>>    1 files changed, 23 insertions(+), 8 deletions(-)

>>      Why only this file? Don't other board files have NAND/NOR devices?

> Yes I thought of sending board-da850 changes in separate patch. Should I have to send those changes also in this patch?

    There's also board-dm*.c files. I'd done them all in the same patch.

> Thanks,
> Prakash

WBR, Sergei
Manjunathappa, Prakash Jan. 31, 2012, 7:11 a.m. UTC | #4
Hi Sergei,

On Mon, Jan 30, 2012 at 16:10:31, Sergei Shtylyov wrote:
> Hello.
> 
> On 30-01-2012 10:58, Manjunathappa, Prakash wrote:
> 
> >>> 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@ti.com>
> >>> ---
> >>> Since v1:
> >>> Patch is generated using -M option.
> 
> >>>    arch/arm/mach-davinci/board-da830-evm.c |   31 +++++++++++++++++++++++--------
> >>>    1 files changed, 23 insertions(+), 8 deletions(-)
> 
> >>      Why only this file? Don't other board files have NAND/NOR devices?
> 
> > Yes I thought of sending board-da850 changes in separate patch. Should I have to send those changes also in this patch?
> 
>     There's also board-dm*.c files. I'd done them all in the same patch.

ok, I will consider all davinci board changes in next version of patch.

Thanks,
Prakash

> 
> WBR, Sergei
>
diff mbox

Patch

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");