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

Commit 4b9a5ad5 authored by Abhilash Kesavan's avatar Abhilash Kesavan Committed by Kukjin Kim
Browse files

ARM: S5PV210: Add support for Compact Flash driver on SMDKV210/C110 



Following is added for the CF-ATA driver:
	- Platform data strucure instantiation
	- Platform device enabling code
	- Platform-specific gpio setup code
	- Fixed IRQ naming to match across 64xx and v210

Signed-off-by: default avatarAbhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent ba149f3a

arch/arm/mach-s5pv210/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ config S5PV210_SETUP_I2C2 
	help

	  Common setup code for i2c bus 2.



config S5PV210_SETUP_IDE

	bool

	help

	  Common setup code for S5PV210 IDE GPIO configurations



config S5PV210_SETUP_FB_24BPP

	bool

	help
@@ -76,9 +81,11 @@ config MACH_SMDKV210 
	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_IDE

	select SAMSUNG_DEV_TS

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	select S5PV210_SETUP_IDE

	help

	  Machine support for Samsung SMDKV210
@@ -86,8 +93,10 @@ config MACH_SMDKC110 
	bool "SMDKC110"

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select SAMSUNG_DEV_IDE

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	select S5PV210_SETUP_IDE

	help

	  Machine support for Samsung SMDKC110

	  S5PC110(MCP) is one of package option of S5PV210

arch/arm/mach-s5pv210/Makefile

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

obj-$(CONFIG_S5PV210_SETUP_I2C2) 	+= setup-i2c2.o

obj-$(CONFIG_S5PV210_SETUP_IDE)		+= setup-ide.o

obj-$(CONFIG_S5PV210_SETUP_SDHCI)       += setup-sdhci.o

obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o

arch/arm/mach-s5pv210/cpu.c

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <plat/devs.h>

#include <plat/clock.h>

#include <plat/s5pv210.h>

#include <plat/ata-core.h>

#include <plat/iic-core.h>

#include <plat/sdhci.h>
@@ -79,7 +80,6 @@ void __init s5pv210_map_io(void) 
#ifdef CONFIG_S3C_DEV_ADC

	s3c_device_adc.name	= "s3c64xx-adc";

#endif



	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));



	/* initialise device information early */
@@ -87,6 +87,8 @@ void __init s5pv210_map_io(void) 
	s5pv210_default_sdhci1();

	s5pv210_default_sdhci2();



	s3c_cfcon_setname("s5pv210-pata");



	/* the i2c devices are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#define IRQ_IEMIEC		S5P_IRQ_VIC1(6)

#define IRQ_ONENAND		S5P_IRQ_VIC1(7)

#define IRQ_NFC			S5P_IRQ_VIC1(8)

#define IRQ_CFC			S5P_IRQ_VIC1(9)

#define IRQ_CFCON		S5P_IRQ_VIC1(9)

#define IRQ_UART0		S5P_IRQ_VIC1(10)

#define IRQ_UART1		S5P_IRQ_VIC1(11)

#define IRQ_UART2		S5P_IRQ_VIC1(12)

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

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 


#define S5PV210_PA_SROMC	(0xE8000000)



#define S5PV210_PA_CFCON	(0xE8200000)



#define S5PV210_PA_MDMA		0xFA200000

#define S5PV210_PA_PDMA0	0xE0900000

#define S5PV210_PA_PDMA1	0xE0A00000
@@ -104,5 +106,6 @@ 
#define S3C_PA_WDT		S5PV210_PA_WATCHDOG



#define SAMSUNG_PA_ADC		S5PV210_PA_ADC

#define SAMSUNG_PA_CFCON	S5PV210_PA_CFCON



#endif /* __ASM_ARCH_MAP_H */