[PATCH] S5PV210: Move OneNAND platform data to plat-s5p

[Kyungmin Park]

On Wed, Jul 28, 2010 at 3:23 PM, Kukjin Kim <kgene.kim at samsung.com> wrote:
> Kyungmin Park wrote:
>>
>> From: Kyungmin Park <kyungmin.park at samsung.com>
>>
>> S5PV310 has the same OneNAND controller and can use it commonly.
>>
>> Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
>> ---
>>  arch/arm/mach-s5pv210/Kconfig            |    5 ---
>>  arch/arm/mach-s5pv210/Makefile           |    1 -
>>  arch/arm/mach-s5pv210/include/mach/map.h |    3 --
>>  arch/arm/plat-s5p/Makefile               |    2 +-
>>  arch/arm/plat-s5p/dev-onenand.c          |   52
>> ++++++++++++++++++++++++++++++
>
> Is this just moving dev-onenand.c from mach-s5pv210 to plat-s5p to support
> further SoC?
> So...where is removing 'mach-s5pv210/dev-onenand.c'...I found just adding
> dev-onenand.c to plat-s5p.

Right, will fix it.
>
>>  5 files changed, 53 insertions(+), 10 deletions(-)
>>  create mode 100644 arch/arm/plat-s5p/dev-onenand.c
>>
>> diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
>> index 0761eac..96f4d9b 100644
>> --- a/arch/arm/mach-s5pv210/Kconfig
>> +++ b/arch/arm/mach-s5pv210/Kconfig
>> @@ -62,11 +62,6 @@ config MACH_GONI
>>         Machine support for Samsung GONI board
>>         S5PC110(MCP) is one of package option of S5PV210
>>
>> -config S5PC110_DEV_ONENAND
>> -     bool
>> -     help
>> -       Compile in platform device definition for OneNAND1 controller
>> -
>>  config MACH_SMDKV210
>>       bool "SMDKV210"
>>       select CPU_S5PV210
>> diff --git a/arch/arm/mach-s5pv210/Makefile
> b/arch/arm/mach-s5pv210/Makefile
>> index 30be9a6..6a6dea1 100644
>> --- a/arch/arm/mach-s5pv210/Makefile
>> +++ b/arch/arm/mach-s5pv210/Makefile
>> @@ -26,7 +26,6 @@ obj-$(CONFIG_MACH_GONI)             += mach-goni.o
>>
>>  obj-y                                += dev-audio.o
>>  obj-$(CONFIG_S3C64XX_DEV_SPI)        += dev-spi.o
>> -obj-$(CONFIG_S5PC110_DEV_ONENAND) += dev-onenand.o
>>
>>  obj-$(CONFIG_S5PV210_SETUP_FB_24BPP) += setup-fb-24bpp.o
>>  obj-$(CONFIG_S5PV210_SETUP_I2C1)     += setup-i2c1.o
>> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-
>> s5pv210/include/mach/map.h
>> index 34eb168..3a44e1e 100644
>> --- a/arch/arm/mach-s5pv210/include/mach/map.h
>> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
>> @@ -16,9 +16,6 @@
>>  #include <plat/map-base.h>
>>  #include <plat/map-s5p.h>
>>
>> -#define S5PC110_PA_ONENAND   (0xB0000000)
>> -#define S5PC110_PA_ONENAND_DMA       (0xB0600000)
>> -
>>  #define S5PV210_PA_CHIPID    (0xE0000000)
>>  #define S5P_PA_CHIPID                S5PV210_PA_CHIPID
>>
>> diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
>> index 39c242b..d9f6890 100644
>> --- a/arch/arm/plat-s5p/Makefile
>> +++ b/arch/arm/plat-s5p/Makefile
>> @@ -12,7 +12,7 @@ obj-                                :=
>>
>>  # Core files
>>
>> -obj-y                                += dev-uart.o
>> +obj-y                                += dev-uart.o dev-onenand.o
>
> Really, always need building dev-onenand for all S5P SoCs?

will be handled in dev-onenand.c file.

>
>>  obj-y                                += cpu.o
>>  obj-y                                += clock.o
>>  obj-y                                += irq.o
>> diff --git a/arch/arm/plat-s5p/dev-onenand.c
> b/arch/arm/plat-s5p/dev-onenand.c
>> new file mode 100644
>> index 0000000..00facbe
>> --- /dev/null
>> +++ b/arch/arm/plat-s5p/dev-onenand.c
>> @@ -0,0 +1,52 @@
>> +/*
>> + * linux/arch/arm/plat-s5p/dev-onenand.c
>> + *
>> + *  Copyright (c) 2008-2010 Samsung Electronics
>> + *  Kyungmin Park <kyungmin.park at samsung.com>
>> + *
>> + * S5PC110 series device definition for OneNAND devices
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +
>> +#include <linux/kernel.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/mtd/mtd.h>
>> +#include <linux/mtd/onenand.h>
>> +
>> +#include <mach/irqs.h>
>> +
>> +#define S5PC110_PA_ONENAND           (0xB0000000)
>> +#define S5PC110_PA_ONENAND_DMA               (0xB0600000)
>
> Should be in relevant map.h not here.
It's only used at dev-onenand.c so I think not big problem. I don't
want to define it at all SoCs.
I hope only one macro or defined used one place. just define it at one
file it's easy to read.
>
>> +
>> +static struct resource s5pc110_onenand_resources[] = {
>
> It would be nice if could use s5p_ prefix in here.
>
>> +     [0] = {
>> +             .start  = S5PC110_PA_ONENAND,
>> +             .end    = S5PC110_PA_ONENAND + SZ_128K - 1,
>
> Same.
>
>> +             .flags  = IORESOURCE_MEM,
>> +     },
>> +     [1] = {
>> +             .start  = S5PC110_PA_ONENAND_DMA,
>> +             .end    = S5PC110_PA_ONENAND_DMA + SZ_2K - 1,
>> +             .flags  = IORESOURCE_MEM,
>> +     },
>> +};
>> +
>> +struct platform_device s5pc110_device_onenand = {
>> +     .name           = "s5pc110-onenand",
>> +     .id             = -1,
>> +     .num_resources  = ARRAY_SIZE(s5pc110_onenand_resources),
>> +     .resource       = s5pc110_onenand_resources,
>> +};
>> +
>> +void s5pc110_onenand_set_platdata(struct onenand_platform_data *pdata)
>> +{
>> +     struct onenand_platform_data *pd;
>> +
>> +     pd = kmemdup(pdata, sizeof(struct onenand_platform_data),
>> GFP_KERNEL);
>> +     if (!pd)
>> +             printk(KERN_ERR "%s: no memory for platform data\n",
>> __func__);
>> +     s5pc110_device_onenand.dev.platform_data = pd;
>> +}
>> --
>
>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim at samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
>