Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0523ec3a authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C64XX: To merge devs.c files to one devs.c 



This patch moves regarding s3c64xx dev files to one devs.c
file in plat-samsung directory and this help to keep it more
easily.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 61c542bf

arch/arm/mach-s3c64xx/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -61,5 +61,3 @@ obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o 
obj-y				+= dev-uart.o

obj-y				+= dev-audio.o

obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
 
obj-$(CONFIG_S3C64XX_DEV_TS)	+= dev-ts.o

obj-$(CONFIG_S3C64XX_DEV_ONENAND1)	+= dev-onenand1.o

arch/arm/mach-s3c64xx/dev-onenand1.c

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-s3c64xx/dev-onenand1.c

 *

 *  Copyright (c) 2008-2010 Samsung Electronics

 *  Kyungmin Park <kyungmin.park@samsung.com>

 *

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



#include <plat/devs.h>



static struct resource s3c64xx_onenand1_resources[] = {

	[0] = {

		.start	= S3C64XX_PA_ONENAND1,

		.end	= S3C64XX_PA_ONENAND1 + 0x400 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= S3C64XX_PA_ONENAND1_BUF,

		.end	= S3C64XX_PA_ONENAND1_BUF + S3C64XX_SZ_ONENAND1_BUF - 1,

		.flags	= IORESOURCE_MEM,

	},

	[2] = {

		.start	= IRQ_ONENAND1,

		.end	= IRQ_ONENAND1,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device s3c64xx_device_onenand1 = {

	.name		= "samsung-onenand",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(s3c64xx_onenand1_resources),

	.resource	= s3c64xx_onenand1_resources,

};



void s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata)

{

	s3c_set_platdata(pdata, sizeof(struct onenand_platform_data),

			 &s3c64xx_device_onenand1);

}

arch/arm/plat-samsung/devs.c

+35 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/dma-mapping.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/onenand.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>
@@ -225,6 +227,39 @@ void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd) 
}

#endif /* CONFIG_PLAT_S3C24XX */



#ifdef CONFIG_S3C64XX_DEV_ONENAND1

static struct resource s3c64xx_onenand1_resources[] = {

	[0] = {

		.start	= S3C64XX_PA_ONENAND1,

		.end	= S3C64XX_PA_ONENAND1 + 0x400 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= S3C64XX_PA_ONENAND1_BUF,

		.end	= S3C64XX_PA_ONENAND1_BUF + S3C64XX_SZ_ONENAND1_BUF - 1,

		.flags	= IORESOURCE_MEM,

	},

	[2] = {

		.start	= IRQ_ONENAND1,

		.end	= IRQ_ONENAND1,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device s3c64xx_device_onenand1 = {

	.name		= "samsung-onenand",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(s3c64xx_onenand1_resources),

	.resource	= s3c64xx_onenand1_resources,

};



void s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata)

{

	s3c_set_platdata(pdata, sizeof(struct onenand_platform_data),

			 &s3c64xx_device_onenand1);

}

#endif /* CONFIG_S3C64XX_DEV_ONENAND1 */



/* RTC */



#ifdef CONFIG_PLAT_S3C24XX