S5PC110: Move OneNAND platform device to plat-s5p

From: Kyungmin Park <[email protected]>

To share the same platform device for s5pc210

Signed-off-by Kyungmin Park <[email protected]>

---
 arch/arm/mach-s5pv210/Kconfig            |    5 ---
 arch/arm/mach-s5pv210/Makefile           |    1 -
 arch/arm/mach-s5pv210/dev-onenand.c      |   50

 arch/arm/mach-s5pv210/include/mach/map.h |    3 --
 arch/arm/plat-s5p/Kconfig                |    5 +++
 arch/arm/plat-s5p/Makefile               |    5 ++-
 arch/arm/plat-s5p/dev-onenand.c          |   53
++++++++++++++++++++++++++++++
 7 files changed, 62 insertions(+), 60 deletions(-)
 delete mode 100644 arch/arm/mach-s5pv210/dev-onenand.c
 create mode 100644 arch/arm/plat-s5p/dev-onenand.c

onenand.c
deleted file mode 100644
index 34997b7..0000000

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -46

@@ -1,50 +0,0 @@
-/*
- * linux/arch/arm/mach-s5pv210/dev-onenand.c
- *
- *  Copyright (c) 2008-2010 Samsung Electronics
- *  Kyungmin Park <[email protected]>
- *
- * 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>
-#include <mach/map.h>
-
-static struct resource s5pc110_onenand_resources[] = {
-	[0] = {
-		.start	= S5PC110_PA_ONENAND,
-		.end	= S5PC110_PA_ONENAND + SZ_128K - 1,
-		.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);

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -2

-	if (!pd)
-		printk(KERN_ERR "%s: no memory for platform data\n",

__func__);

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -2

-	s5pc110_device_onenand.dev.platform_data = pd;
-}

arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/map.h +0 -0

s5pv210/include/mach/map.h
index 34eb168..3a44e1e 100644

arch/arm/mach-s5pv210/include/mach/map.h +0 -3

@@ -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
 

arch/arm/plat-s5p/Kconfig +0 -0

index 907ac63..314f7d1 100644

arch/arm/plat-s5p/dev-onenand.c new file +6 -0

+ *
+ * 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.
+ */
+

arch/arm/plat-s5p/dev-onenand.c new file +21 -0

+		.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);

arch/arm/plat-s5p/dev-onenand.c new file +2 -0

+	if (!pd)
+		printk(KERN_ERR "%s: no memory for platform data\n",

__func__);

+}
--

Quoted 1 line · Kyungmin Park

Hi,

Cc'ed Ben Dooks.

Quoted 9 lines

From: Kyungmin Park <[email protected]>

To share the same platform device for s5pc210

Signed-off-by Kyungmin Park <[email protected]>

---

?arch/arm/mach-s5pv210/Kconfig ? ? ? ? ? ?| ? ?5 ---
?arch/arm/mach-s5pv210/Makefile ? ? ? ? ? | ? ?1 -
?arch/arm/mach-s5pv210/dev-onenand.c ? ? ?| ? 50

----------------------------

Quoted 8 lines

?arch/arm/mach-s5pv210/include/mach/map.h | ? ?3 --
?arch/arm/plat-s5p/Kconfig ? ? ? ? ? ? ? ?| ? ?5 +++
?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? | ? ?5 ++-
?arch/arm/plat-s5p/dev-onenand.c ? ? ? ? ?| ? 53

++++++++++++++++++++++++++++++
?7 files changed, 62 insertions(+), 60 deletions(-) ?delete mode 100644 arch/arm/mach-s5pv210/dev-onenand.c ?create mode 100644 arch/arm/plat-s5p/dev-onenand.c

In future, please check your git configuration so that can come out as follows.
It's just 'rename(move)' not 'delete and create'...It can help to us that it can see more easily whether something changed.

arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c | ? ?5 ++++- ?1 files changed, 4 insertions(+), 1 deletions(-) ?rename arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c (91%)

arch/arm/plat-s5p/dev-onenand.c renamed from arch/arm/mach-s5pv210/dev-onenand.c +0 -0

similarity index 91%
rename from arch/arm/mach-s5pv210/dev-onenand.c
rename to arch/arm/plat-s5p/dev-onenand.c
index 34997b7..08b3a3f 100644

Quoted 19 lines

arch/arm/mach-s5pv210/Kconfig +0 -0

index 0761eac..96f4d9b 100644
@@ -62,11 +62,6 @@ config MACH_GONI

? ? ? ? Machine support for Samsung GONI board ? ? ? ? S5PC110(MCP) is one of package option of S5PV210

arch/arm/mach-s5pv210/Kconfig +0 -5

-config S5PC110_DEV_ONENAND
- ? ? bool
- ? ? help
- ? ? ? Compile in platform device definition for OneNAND1 controller
-

?config MACH_SMDKV210
? ? ? bool "SMDKV210"
? ? ? select CPU_S5PV210

Review

Quoted 1 line

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/Makefile

Quoted 9 lines

index 30be9a6..6a6dea1 100644

arch/arm/mach-s5pv210/Makefile +0 -0

@@ -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

Review

Quoted 3 lines

?obj-$(CONFIG_S5PV210_SETUP_FB_24BPP) += setup-fb-24bpp.o ?obj-$(CONFIG_S5PV210_SETUP_I2C1) ? ? += setup-i2c1.o

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/dev-

Quoted 73 lines

onenand.c
deleted file mode 100644
index 34997b7..0000000

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -46

@@ -1,50 +0,0 @@
-/*
- * linux/arch/arm/mach-s5pv210/dev-onenand.c
- *
- * ?Copyright (c) 2008-2010 Samsung Electronics
- * ?Kyungmin Park <[email protected]>
- *
- * 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>
-#include <mach/map.h>
-
-static struct resource s5pc110_onenand_resources[] = {
- ? ? [0] = {
- ? ? ? ? ? ? .start ?= S5PC110_PA_ONENAND,
- ? ? ? ? ? ? .end ? ?= S5PC110_PA_ONENAND + SZ_128K - 1,
- ? ? ? ? ? ? .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;

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -1

-}

arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/map.h +0 -0

s5pv210/include/mach/map.h
index 34eb168..3a44e1e 100644

arch/arm/mach-s5pv210/include/mach/map.h +0 -0

@@ -16,9 +16,6 @@

?#include <plat/map-base.h>
?#include <plat/map-s5p.h>

arch/arm/mach-s5pv210/include/mach/map.h +0 -3

-#define S5PC110_PA_ONENAND ? (0xB0000000)
-#define S5PC110_PA_ONENAND_DMA ? ? ? (0xB0600000)
-

?#define S5PV210_PA_CHIPID ? ?(0xE0000000) ?#define S5P_PA_CHIPID ? ? ? ? ? ? ? ?S5PV210_PA_CHIPID

arch/arm/plat-s5p/Kconfig

Quoted 10 lines

arch/arm/plat-s5p/Kconfig +0 -0

index 907ac63..314f7d1 100644
@@ -31,3 +31,8 @@ config S5P_EXT_INT

? ? ? help
? ? ? ? Use the external interrupts (other than GPIO interrupts.) ? ? ? ? Note: Do not choose this for S5P6440.

arch/arm/plat-s5p/Kconfig +2 -0

+
+config S5PC110_DEV_ONENAND

As I said, S5P_DEV_ONENAND is better in here.

Review

Quoted 23 lines

+ ? ? bool
+ ? ? help
+ ? ? ? Compile in platform device definition for OneNAND controller

arch/arm/plat-s5p/Makefile +0 -0

index 39c242b..c49617e 100644
@@ -12,9 +12,12 @@ obj- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? :=
 

?# Core files

-obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= dev-uart.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= cpu.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= clock.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o ?obj-$(CONFIG_S5P_EXT_INT) ? ?+= irq-eint.o

arch/arm/plat-s5p/Makefile +4 -0

+# Device files
+
+obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= dev-uart.o
+obj-$(CONFIG_S5PC110_DEV_ONENAND) ? ?+= dev-onenand.o

(quoted diff) +0 -0

b/arch/arm/plat-s5p/dev-onenand.c

arch/arm/plat-s5p/dev-onenand.c line 7

Quoted 12 lines

new file mode 100644
index 0000000..08b3a3f

arch/arm/plat-s5p/dev-onenand.c new file +7 -0

@@ -0,0 +1,53 @@
+/*
+ * linux/arch/arm/plat-s5p/dev-onenand.c
+ *
+ * ?Copyright (c) 2008-2010 Samsung Electronics
+ * ?Kyungmin Park <[email protected]>
+ *
+ * S5PC110 series device definition for OneNAND devices

I thinks...this is for S5P SoCs such as S5PC210 and S5PC110 ...even though S5P6440 does not have OneNAND device...

Quoted 10 lines

arch/arm/plat-s5p/dev-onenand.c new file +10 -0

+ *
+ * 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>

arch/arm/plat-s5p/dev-onenand.c line 23

Quoted 6 lines

arch/arm/plat-s5p/dev-onenand.c new file +6 -0

+
+#include <mach/irqs.h>
+#include <mach/map.h>
+
+#define S5PC110_PA_ONENAND ? ? ? ? ? (0xB0000000)
+#define S5PC110_PA_ONENAND_DMA ? ? ? ? ? ? ? (0xB0600000)

Please move to mach/map.h for compatibilities with other SoCs.

#define S5PC110_PA_ONENAND ? ? ? ? ? ? ?(0xB0000000)
...
#define S5P_PA_ONENAD ? ? ? ? ? S5PC110_PA_ONENAND
...

arch/arm/plat-s5p/dev-onenand.c line 25

Quoted 2 lines

arch/arm/plat-s5p/dev-onenand.c new file +2 -0

+
+static struct resource s5pc110_onenand_resources[] = {

s5p_onenand_resources...

arch/arm/plat-s5p/dev-onenand.c line 28

Quoted 3 lines

arch/arm/plat-s5p/dev-onenand.c new file +3 -0

+ ? ? [0] = {
+ ? ? ? ? ? ? .start ?= S5PC110_PA_ONENAND,
+ ? ? ? ? ? ? .end ? ?= S5PC110_PA_ONENAND + SZ_128K - 1,

Here, S5P_PA_xxx is better...

Quoted 21 lines

arch/arm/plat-s5p/dev-onenand.c new file +21 -0

+ ? ? ? ? ? ? .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),

Quoted 5 lines

GFP_KERNEL);
+ ? ? if (!pd)
+ ? ? ? ? ? ? printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+ ? ? s5pc110_device_onenand.dev.platform_data = pd;

s3c_set_platdata(pdata, sizeof(struct onenand_platform_data), &s5p_device_onenand);

Quoted 3 lines

+}
--

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 25 lines · Kukjin Kim

Quoted 1 line · Kyungmin Park

Hi,

Cc'ed Ben Dooks.

Quoted 9 lines

From: Kyungmin Park <[email protected]>

To share the same platform device for s5pc210

Signed-off-by Kyungmin Park <[email protected]>

---

?arch/arm/mach-s5pv210/Kconfig ? ? ? ? ? ?| ? ?5 ---
?arch/arm/mach-s5pv210/Makefile ? ? ? ? ? | ? ?1 -
?arch/arm/mach-s5pv210/dev-onenand.c ? ? ?| ? 50

----------------------------

Quoted 8 lines

?arch/arm/mach-s5pv210/include/mach/map.h | ? ?3 --
?arch/arm/plat-s5p/Kconfig ? ? ? ? ? ? ? ?| ? ?5 +++
?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? | ? ?5 ++-
?arch/arm/plat-s5p/dev-onenand.c ? ? ? ? ?| ? 53

++++++++++++++++++++++++++++++
?7 files changed, 62 insertions(+), 60 deletions(-) ?delete mode 100644 arch/arm/mach-s5pv210/dev-onenand.c ?create mode 100644 arch/arm/plat-s5p/dev-onenand.c

Quoted 3 lines

In future, please check your git configuration so that can come out as follows.
It's just 'rename(move)' not 'delete and create'...It can help to us

Quoted 1 line

can see more easily whether something changed.

It used the lower version of git. I will update it.

Quoted 16 lines

arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c | ? ?5 ++++- ?1 files changed, 4 insertions(+), 1 deletions(-) ?rename arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c (91%)

arch/arm/plat-s5p/dev-onenand.c renamed from arch/arm/mach-s5pv210/dev-onenand.c +0 -0

similarity index 91%
rename from arch/arm/mach-s5pv210/dev-onenand.c
rename to arch/arm/plat-s5p/dev-onenand.c
index 34997b7..08b3a3f 100644

Quoted 3 lines

Quoted 1 line

Review

Quoted 1 line

(quoted diff) +0 -0

Quoted 30 lines

Quoted 15 lines

index 0761eac..96f4d9b 100644

arch/arm/mach-s5pv210/Kconfig +0 -0

@@ -62,11 +62,6 @@ config MACH_GONI

? ? ? ? Machine support for Samsung GONI board ? ? ? ? S5PC110(MCP) is one of package option of S5PV210

arch/arm/mach-s5pv210/Kconfig +0 -5

-config S5PC110_DEV_ONENAND
- ? ? bool
- ? ? help
- ? ? ? Compile in platform device definition for OneNAND1 controller
-

?config MACH_SMDKV210
? ? ? bool "SMDKV210"
? ? ? select CPU_S5PV210

Review

Quoted 1 line

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/Makefile

Quoted 9 lines

index 30be9a6..6a6dea1 100644

arch/arm/mach-s5pv210/Makefile +0 -0

@@ -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

Review

Quoted 3 lines

?obj-$(CONFIG_S5PV210_SETUP_FB_24BPP) += setup-fb-24bpp.o ?obj-$(CONFIG_S5PV210_SETUP_I2C1) ? ? += setup-i2c1.o

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/dev-

Quoted 7 lines

Quoted 7 lines

onenand.c
deleted file mode 100644
index 34997b7..0000000

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -1

@@ -1,50 +0,0 @@
-/*

Quoted 8 lines

arch/arm/mach-s5pv210/dev-onenand.c line 9

Quoted 8 lines

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -8

- * linux/arch/arm/mach-s5pv210/dev-onenand.c
- *
- * ?Copyright (c) 2008-2010 Samsung Electronics
- * ?Kyungmin Park <[email protected]>
- *
- * S5PC110 series device definition for OneNAND devices
- *
- * This program is free software; you can redistribute it and/or

Quoted 58 lines

Quoted 58 lines

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -37

- * 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>
-#include <mach/map.h>
-
-static struct resource s5pc110_onenand_resources[] = {
- ? ? [0] = {
- ? ? ? ? ? ? .start ?= S5PC110_PA_ONENAND,
- ? ? ? ? ? ? .end ? ?= S5PC110_PA_ONENAND + SZ_128K - 1,
- ? ? ? ? ? ? .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;

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -1

-}

arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/map.h +0 -0

s5pv210/include/mach/map.h
index 34eb168..3a44e1e 100644

arch/arm/mach-s5pv210/include/mach/map.h +0 -0

@@ -16,9 +16,6 @@

?#include <plat/map-base.h>
?#include <plat/map-s5p.h>

arch/arm/mach-s5pv210/include/mach/map.h +0 -3

-#define S5PC110_PA_ONENAND ? (0xB0000000)
-#define S5PC110_PA_ONENAND_DMA ? ? ? (0xB0600000)
-

?#define S5PV210_PA_CHIPID ? ?(0xE0000000) ?#define S5P_PA_CHIPID ? ? ? ? ? ? ? ?S5PV210_PA_CHIPID

Quoted 12 lines

arch/arm/plat-s5p/Kconfig

Quoted 10 lines

arch/arm/plat-s5p/Kconfig +0 -0

index 907ac63..314f7d1 100644
@@ -31,3 +31,8 @@ config S5P_EXT_INT

? ? ? help
? ? ? ? Use the external interrupts (other than GPIO interrupts.) ? ? ? ? Note: Do not choose this for S5P6440.

arch/arm/plat-s5p/Kconfig +2 -0

+
+config S5PC110_DEV_ONENAND

As I said, S5P_DEV_ONENAND is better in here.

No, I don't want to break the current board use the S5PC110_DEV_ONENAND.

Before request the S5P_* prefix. first make rules. In your

explanation. it can move to the plat-samsung.

What's the definition of s5p. just two s5p series have the same IP. then can be used the plat-s5p?

So I suggest that (the number means the priority and naming rules.)
1. use the first SoC chip name.
2. two s5p series or more have the same IP. then use the plat-s5p
3. If driver support s3c and s5p series then use the plat-samsung. e.g.,

So it's reasonable to use S5PC110_DEV_ONENAND name.

Quoted 42 lines

Review

Quoted 23 lines

+ ? ? bool
+ ? ? help
+ ? ? ? Compile in platform device definition for OneNAND controller

arch/arm/plat-s5p/Makefile +0 -0

index 39c242b..c49617e 100644
@@ -12,9 +12,12 @@ obj- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? :=
 

?# Core files

-obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= dev-uart.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= cpu.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= clock.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o ?obj-$(CONFIG_S5P_EXT_INT) ? ?+= irq-eint.o

arch/arm/plat-s5p/Makefile +4 -0

+# Device files
+
+obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= dev-uart.o
+obj-$(CONFIG_S5PC110_DEV_ONENAND) ? ?+= dev-onenand.o

(quoted diff) +0 -0

b/arch/arm/plat-s5p/dev-onenand.c

arch/arm/plat-s5p/dev-onenand.c line 7

Quoted 12 lines

new file mode 100644
index 0000000..08b3a3f

arch/arm/plat-s5p/dev-onenand.c new file +7 -0

@@ -0,0 +1,53 @@
+/*
+ * linux/arch/arm/plat-s5p/dev-onenand.c
+ *
+ * ?Copyright (c) 2008-2010 Samsung Electronics
+ * ?Kyungmin Park <[email protected]>
+ *
+ * S5PC110 series device definition for OneNAND devices

I thinks...this is for S5P SoCs such as S5PC210 and S5PC110 ...even though S5P6440 does not have OneNAND device...

Quoted 2 lines

arch/arm/plat-s5p/dev-onenand.c new file +2 -0

+ *
+ * This program is free software; you can redistribute it and/or

Quoted 8 lines

Quoted 8 lines

arch/arm/plat-s5p/dev-onenand.c new file +8 -0

+ * 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>

Quoted 8 lines

arch/arm/plat-s5p/dev-onenand.c line 23

Quoted 6 lines

arch/arm/plat-s5p/dev-onenand.c new file +6 -0

+
+#include <mach/irqs.h>
+#include <mach/map.h>
+
+#define S5PC110_PA_ONENAND ? ? ? ? ? (0xB0000000)
+#define S5PC110_PA_ONENAND_DMA ? ? ? ? ? ? ? (0xB0600000)

Please move to mach/map.h for compatibilities with other SoCs.

Can you explain the why use the hard-coded value in clock framework?

it's only used that at there. it's same rule. it's only used here.

Do you want to hard-coded the value at resource directly?

As I suggested, make rules first and discuss it.

Quoted 38 lines

#define S5PC110_PA_ONENAND ? ? ? ? ? ? ?(0xB0000000)
...
#define S5P_PA_ONENAD ? ? ? ? ? S5PC110_PA_ONENAND
...

arch/arm/plat-s5p/dev-onenand.c line 25

Quoted 2 lines

arch/arm/plat-s5p/dev-onenand.c new file +2 -0

+
+static struct resource s5pc110_onenand_resources[] = {

s5p_onenand_resources...

arch/arm/plat-s5p/dev-onenand.c line 28

Quoted 3 lines

arch/arm/plat-s5p/dev-onenand.c new file +3 -0

+ ? ? [0] = {
+ ? ? ? ? ? ? .start ?= S5PC110_PA_ONENAND,
+ ? ? ? ? ? ? .end ? ?= S5PC110_PA_ONENAND + SZ_128K - 1,

Here, S5P_PA_xxx is better...

Quoted 21 lines

arch/arm/plat-s5p/dev-onenand.c new file +21 -0

+ ? ? ? ? ? ? .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),

Quoted 8 lines

Quoted 5 lines

GFP_KERNEL);
+ ? ? if (!pd)
+ ? ? ? ? ? ? printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+ ? ? s5pc110_device_onenand.dev.platform_data = pd;

s3c_set_platdata(pdata, sizeof(struct onenand_platform_data), &s5p_device_onenand);

I just remove it. there's no user. and no need to setup for platform.

Thank you,
Kyungmin Park

Quoted 1 line

Quoted 27 lines · Kyungmin Park

Quoted 25 lines · Kukjin Kim

Quoted 1 line · Kyungmin Park

Hi,

Cc'ed Ben Dooks.

Quoted 9 lines

From: Kyungmin Park <[email protected]>

To share the same platform device for s5pc210

Signed-off-by Kyungmin Park <[email protected]>

---

?arch/arm/mach-s5pv210/Kconfig ? ? ? ? ? ?| ? ?5 ---
?arch/arm/mach-s5pv210/Makefile ? ? ? ? ? | ? ?1 -
?arch/arm/mach-s5pv210/dev-onenand.c ? ? ?| ? 50

----------------------------

Quoted 8 lines

?arch/arm/mach-s5pv210/include/mach/map.h | ? ?3 --
?arch/arm/plat-s5p/Kconfig ? ? ? ? ? ? ? ?| ? ?5 +++
?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? | ? ?5 ++-
?arch/arm/plat-s5p/dev-onenand.c ? ? ? ? ?| ? 53

++++++++++++++++++++++++++++++
?7 files changed, 62 insertions(+), 60 deletions(-) ?delete mode 100644 arch/arm/mach-s5pv210/dev-onenand.c ?create mode 100644 arch/arm/plat-s5p/dev-onenand.c

Quoted 3 lines

Quoted 3 lines

In future, please check your git configuration so that can come out as follows.
It's just 'rename(move)' not 'delete and create'...It can help to us

that it

Quoted 19 lines

Quoted 1 line

can see more easily whether something changed.

It used the lower version of git. I will update it.

Quoted 16 lines

arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c | ? ?5 ++++- ?1 files changed, 4 insertions(+), 1 deletions(-) ?rename arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c (91%)

arch/arm/plat-s5p/dev-onenand.c renamed from arch/arm/mach-s5pv210/dev-onenand.c +0 -0

similarity index 91%
rename from arch/arm/mach-s5pv210/dev-onenand.c
rename to arch/arm/plat-s5p/dev-onenand.c
index 34997b7..08b3a3f 100644

Quoted 3 lines

Quoted 1 line

Quoted 1 line

Review

Quoted 1 line

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/Kconfig

Quoted 30 lines

Quoted 30 lines

Quoted 15 lines

index 0761eac..96f4d9b 100644

arch/arm/mach-s5pv210/Kconfig +0 -0

@@ -62,11 +62,6 @@ config MACH_GONI

? ? ? ? Machine support for Samsung GONI board ? ? ? ? S5PC110(MCP) is one of package option of S5PV210

arch/arm/mach-s5pv210/Kconfig +0 -5

-config S5PC110_DEV_ONENAND
- ? ? bool
- ? ? help
- ? ? ? Compile in platform device definition for OneNAND1 controller
-

?config MACH_SMDKV210
? ? ? bool "SMDKV210"
? ? ? select CPU_S5PV210

Review

Quoted 1 line

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/Makefile

Quoted 9 lines

index 30be9a6..6a6dea1 100644

arch/arm/mach-s5pv210/Makefile +0 -0

@@ -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

Review

Quoted 3 lines

?obj-$(CONFIG_S5PV210_SETUP_FB_24BPP) += setup-fb-24bpp.o ?obj-$(CONFIG_S5PV210_SETUP_I2C1) ? ? += setup-i2c1.o

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/dev-

Quoted 15 lines

Quoted 7 lines

Quoted 7 lines

onenand.c
deleted file mode 100644
index 34997b7..0000000

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -1

@@ -1,50 +0,0 @@
-/*

Quoted 8 lines

arch/arm/mach-s5pv210/dev-onenand.c line 9

Quoted 8 lines

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -8

- * linux/arch/arm/mach-s5pv210/dev-onenand.c
- *
- * ?Copyright (c) 2008-2010 Samsung Electronics
- * ?Kyungmin Park <[email protected]>
- *
- * S5PC110 series device definition for OneNAND devices
- *
- * This program is free software; you can redistribute it and/or

modify

Quoted 70 lines

Quoted 58 lines

Quoted 58 lines

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -37

- * 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>
-#include <mach/map.h>
-
-static struct resource s5pc110_onenand_resources[] = {
- ? ? [0] = {
- ? ? ? ? ? ? .start ?= S5PC110_PA_ONENAND,
- ? ? ? ? ? ? .end ? ?= S5PC110_PA_ONENAND + SZ_128K - 1,
- ? ? ? ? ? ? .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;

arch/arm/mach-s5pv210/dev-onenand.c deleted +0 -1

-}

arch/arm/mach- renamed from arch/arm/mach-s5pv210/include/mach/map.h +0 -0

s5pv210/include/mach/map.h
index 34eb168..3a44e1e 100644

arch/arm/mach-s5pv210/include/mach/map.h +0 -0

@@ -16,9 +16,6 @@

?#include <plat/map-base.h>
?#include <plat/map-s5p.h>

arch/arm/mach-s5pv210/include/mach/map.h +0 -3

-#define S5PC110_PA_ONENAND ? (0xB0000000)
-#define S5PC110_PA_ONENAND_DMA ? ? ? (0xB0600000)
-

?#define S5PV210_PA_CHIPID ? ?(0xE0000000) ?#define S5P_PA_CHIPID ? ? ? ? ? ? ? ?S5PV210_PA_CHIPID

Quoted 12 lines

arch/arm/plat-s5p/Kconfig

Quoted 10 lines

arch/arm/plat-s5p/Kconfig +0 -0

index 907ac63..314f7d1 100644
@@ -31,3 +31,8 @@ config S5P_EXT_INT

? ? ? help
? ? ? ? Use the external interrupts (other than GPIO interrupts.) ? ? ? ? Note: Do not choose this for S5P6440.

arch/arm/plat-s5p/Kconfig +2 -0

+
+config S5PC110_DEV_ONENAND

As I said, S5P_DEV_ONENAND is better in here.

Quoted 1 line

No, I don't want to break the current board use the S5PC110_DEV_ONENAND.

Hmm...you can use S5PC110_xxx even though change the prefix in there.

Quoted 2 lines

Before request the S5P_* prefix. first make rules. In your

Please use s5p_xxx for easily reading and avoiding confusing in plat-s5p.

Quoted 1 line

explanation. it can move to the plat-samsung.

No.

Quoted 2 lines

What's the definition of s5p. just two s5p series have the same IP. then can be used the plat-s5p?

Yes, it's simple...it can help to avoid duplicate code.

Quoted 5 lines

So I suggest that (the number means the priority and naming rules.)
1. use the first SoC chip name.
2. two s5p series or more have the same IP. then use the plat-s5p
3. If driver support s3c and s5p series then use the plat-samsung. e.g.,

RTC.

In this case, I don't agree with you...

Quoted 45 lines

So it's reasonable to use S5PC110_DEV_ONENAND name.

Quoted 42 lines

Review

Quoted 23 lines

+ ? ? bool
+ ? ? help
+ ? ? ? Compile in platform device definition for OneNAND controller

arch/arm/plat-s5p/Makefile +0 -0

index 39c242b..c49617e 100644
@@ -12,9 +12,12 @@ obj- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? :=
 

?# Core files

-obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= dev-uart.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= cpu.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= clock.o ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o ?obj-$(CONFIG_S5P_EXT_INT) ? ?+= irq-eint.o

arch/arm/plat-s5p/Makefile +4 -0

+# Device files
+
+obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= dev-uart.o
+obj-$(CONFIG_S5PC110_DEV_ONENAND) ? ?+= dev-onenand.o

(quoted diff) +0 -0

b/arch/arm/plat-s5p/dev-onenand.c

arch/arm/plat-s5p/dev-onenand.c line 7

Quoted 12 lines

new file mode 100644
index 0000000..08b3a3f

arch/arm/plat-s5p/dev-onenand.c new file +7 -0

@@ -0,0 +1,53 @@
+/*
+ * linux/arch/arm/plat-s5p/dev-onenand.c
+ *
+ * ?Copyright (c) 2008-2010 Samsung Electronics
+ * ?Kyungmin Park <[email protected]>
+ *
+ * S5PC110 series device definition for OneNAND devices

I thinks...this is for S5P SoCs such as S5PC210 and S5PC110 ...even though S5P6440 does not have OneNAND device...

Quoted 2 lines

arch/arm/plat-s5p/dev-onenand.c new file +2 -0

+ *
+ * This program is free software; you can redistribute it and/or

modify

Quoted 17 lines

Quoted 8 lines

Quoted 8 lines

arch/arm/plat-s5p/dev-onenand.c new file +8 -0

+ * 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>

Quoted 8 lines

arch/arm/plat-s5p/dev-onenand.c line 23

Quoted 6 lines

arch/arm/plat-s5p/dev-onenand.c new file +6 -0

+
+#include <mach/irqs.h>
+#include <mach/map.h>
+
+#define S5PC110_PA_ONENAND ? ? ? ? ? (0xB0000000)
+#define S5PC110_PA_ONENAND_DMA ? ? ? ? ? ? ? (0xB0600000)

Please move to mach/map.h for compatibilities with other SoCs.

Quoted 1 line

Can you explain the why use the hard-coded value in clock framework?

It's different case...because the address can be changed in other APs.

Quoted 2 lines

it's only used that at there. it's same rule. it's only used here.

Hmm...you misunderstood :-(
I didn't say like that...please see below.

--- mach/map.h

#define S5PC110_PA_ONENAND ? ? ? ? ? ? ?(0xB0000000) #define S5PC110_PA_ONENAND_DMA ?(0xB0600000)

...

#define S5P_PA_ONENAND ? ? ? ? ?S5PC110_PA_ONENAND #define S5P_PA_ONENAND_DMA ? ? ? ? ? ? ?S5PC110_PA_ONENAND_DMA

---

Used above method on other cases.
And it can be used even if the address differs on each AP.

Quoted 3 lines

Do you want to hard-coded the value at resource directly?

No...
I wonder...if the address differs on each AP, how can you support it...maybe adding ifdef in there?

Quoted 3 lines

As I suggested, make rules first and discuss it.

Please use above method in there...of course if there is more reasonable reason, the rule can be changed.

Quoted 47 lines

Quoted 38 lines

#define S5PC110_PA_ONENAND ? ? ? ? ? ? ?(0xB0000000)
...
#define S5P_PA_ONENAD ? ? ? ? ? S5PC110_PA_ONENAND
...

arch/arm/plat-s5p/dev-onenand.c line 25

Quoted 2 lines

arch/arm/plat-s5p/dev-onenand.c new file +2 -0

+
+static struct resource s5pc110_onenand_resources[] = {

s5p_onenand_resources...

arch/arm/plat-s5p/dev-onenand.c line 28

Quoted 3 lines

arch/arm/plat-s5p/dev-onenand.c new file +3 -0

+ ? ? [0] = {
+ ? ? ? ? ? ? .start ?= S5PC110_PA_ONENAND,
+ ? ? ? ? ? ? .end ? ?= S5PC110_PA_ONENAND + SZ_128K - 1,

Here, S5P_PA_xxx is better...

Quoted 21 lines

arch/arm/plat-s5p/dev-onenand.c new file +21 -0

+ ? ? ? ? ? ? .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),

Quoted 8 lines

Quoted 5 lines

GFP_KERNEL);
+ ? ? if (!pd)
+ ? ? ? ? ? ? printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+ ? ? s5pc110_device_onenand.dev.platform_data = pd;

s3c_set_platdata(pdata, sizeof(struct onenand_platform_data), &s5p_device_onenand);

Quoted 5 lines

I just remove it. there's no user. and no need to setup for platform.

Thank you,
Kyungmin Park

Quoted 1 line

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.