From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 20 May 2010 09:55:32 +0000 (+0900)
Subject: ARM: Merge for-2635-4/s5pv210-boards
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ea5a4e209ddca984bbb5803b30d5e013e631f9ac;p=deliverable%2Flinux.git

ARM: Merge for-2635-4/s5pv210-boards

Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1

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

ea5a4e209ddca984bbb5803b30d5e013e631f9ac
diff --cc arch/arm/mach-s5pv210/cpu.c
index 359bdc8f3b66,c5d53abc92f1..76084d85fd21
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@@ -74,9 -76,17 +76,19 @@@ static void s5pv210_idle(void
  
  void __init s5pv210_map_io(void)
  {
 +	s3c_device_adc.name	= "s3c64xx-adc";
 +
  	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
+ 
+ 	/* initialise device information early */
+ 	s5pv210_default_sdhci0();
+ 	s5pv210_default_sdhci1();
+ 	s5pv210_default_sdhci2();
+ 
+ 	/* the i2c devices are directly compatible with s3c2440 */
+ 	s3c_i2c0_setname("s3c2440-i2c");
+ 	s3c_i2c1_setname("s3c2440-i2c");
+ 	s3c_i2c2_setname("s3c2440-i2c");
  }
  
  void __init s5pv210_init_clocks(int xtal)
diff --cc arch/arm/mach-s5pv210/include/mach/irqs.h
index 3a9e42e7734b,ee6e07b5ae8a..92fc6c7fc064
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv210/include/mach/irqs.h
@@@ -127,11 -141,11 +127,16 @@@
  
  /* Set the default NR_IRQS */
  
 -#define NR_IRQS 		(IRQ_EINT(31) + 1)
 +#define NR_IRQS			(IRQ_EINT(31) + 1)
 +
 +#define EINT_GPIO_0(x)		S5PV210_GPH0(x)
 +#define EINT_GPIO_1(x)		S5PV210_GPH1(x)
 +#define EINT_GPIO_2(x)		S5PV210_GPH2(x)
 +#define EINT_GPIO_3(x)		S5PV210_GPH3(x)
  
+ /* Compatibility */
+ #define IRQ_LCD_FIFO		IRQ_LCD0
+ #define IRQ_LCD_VSYNC		IRQ_LCD1
+ #define IRQ_LCD_SYSTEM		IRQ_LCD2
+ 
  #endif /* ASM_ARCH_IRQS_H */
diff --cc arch/arm/mach-s5pv210/include/mach/map.h
index e85957083055,eeb1ca79a6f4..fb5d05e91e44
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@@ -75,11 -81,14 +81,18 @@@
  /* AC97 */
  #define S5PV210_PA_AC97		0xE2200000
  
 +#define S5PV210_PA_ADC		(0xE1700000)
 +
  /* compatibiltiy defines. */
  #define S3C_PA_UART		S5PV210_PA_UART
+ #define S3C_PA_HSMMC0		S5PV210_PA_HSMMC(0)
+ #define S3C_PA_HSMMC1		S5PV210_PA_HSMMC(1)
+ #define S3C_PA_HSMMC2		S5PV210_PA_HSMMC(2)
  #define S3C_PA_IIC		S5PV210_PA_IIC0
+ #define S3C_PA_IIC1		S5PV210_PA_IIC1
+ #define S3C_PA_IIC2		S5PV210_PA_IIC2
+ #define S3C_PA_FB		S5PV210_PA_FB
+ 
 +#define SAMSUNG_PA_ADC		S5PV210_PA_ADC
 +
  #endif /* __ASM_ARCH_MAP_H */