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

Commit 13904fba authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S5P: Move OneNAND device definitions in plat-s5p 



This patch moves OneNAND device definitions from mach-s5pv210 to plat-s5p
so that can support it commonly.

Note: S5PC110 and S5PC210 have same OneNAND driver.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
parent cd07202c

arch/arm/mach-s5pv210/Kconfig

+2 −7
Original line number Diff line number Diff line
@@ -53,11 +53,6 @@ config S5PV210_SETUP_SDHCI_GPIO 
	help

	  Common setup code for SDHCI gpio.



config S5PC110_DEV_ONENAND

	bool

	help

	  Compile in platform device definition for OneNAND1 controller



menu "S5PC110 Machines"



config MACH_AQUILA
@@ -71,7 +66,7 @@ config MACH_AQUILA 
	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S5PC110_DEV_ONENAND

	select S5P_DEV_ONENAND

	select S5PV210_SETUP_FB_24BPP

	select S5PV210_SETUP_SDHCI

	help
@@ -88,7 +83,7 @@ config MACH_GONI 
	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S5PC110_DEV_ONENAND

	select S5P_DEV_ONENAND

	select S5PV210_SETUP_FB_24BPP

	select S5PV210_SETUP_SDHCI

	help

arch/arm/mach-s5pv210/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

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

+3 −0
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ 
#include <plat/map-s5p.h>



#define S5PC110_PA_ONENAND	(0xB0000000)

#define S5P_PA_ONENAND		S5PC110_PA_ONENAND



#define S5PC110_PA_ONENAND_DMA	(0xB0600000)

#define S5P_PA_ONENAND_DMA	S5PC110_PA_ONENAND_DMA



#define S5PV210_PA_CHIPID	(0xE0000000)

#define S5P_PA_CHIPID		S5PV210_PA_CHIPID

arch/arm/mach-s5pv210/mach-aquila.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static struct platform_device *aquila_devices[] __initdata = { 
	&aquila_i2c_gpio_pmic,

	&aquila_device_gpiokeys,

	&s3c_device_fb,

	&s5pc110_device_onenand,

	&s5p_device_onenand,

	&s3c_device_hsmmc0,

	&s3c_device_hsmmc1,

	&s3c_device_hsmmc2,

arch/arm/mach-s5pv210/mach-goni.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static void goni_setup_sdhci(void) 


static struct platform_device *goni_devices[] __initdata = {

	&s3c_device_fb,

	&s5pc110_device_onenand,

	&s5p_device_onenand,

	&goni_i2c_gpio_pmic,

	&goni_device_gpiokeys,

	&s5p_device_fimc0,