]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ARM: Merge for-2635-4/s5pv210-boards
authorBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 09:55:32 +0000 (18:55 +0900)
committerBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 09:55:32 +0000 (18:55 +0900)
Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1

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

1  2 
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-s5pv210/include/mach/irqs.h
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/plat-samsung/Kconfig

index 5649733bf815dff511f3a652d14dbe21259ac6d9,9efc3b3c9ce4b54283ae7bffd82b30685743e270..88f81ce2f8884c5fb1a03101c7e60aac73131d32
@@@ -13,21 -13,58 +13,61 @@@ config CPU_S5PV21
        bool
        select PLAT_S5P
        select S3C_PL330_DMA
 +      select S5P_EXT_INT
        help
          Enable S5PV210 CPU support
  
- choice
-       prompt "Select machine type"
-       depends on ARCH_S5PV210
-       default MACH_SMDKV210
+ config S5PV210_SETUP_I2C1
+       bool
+       help
+         Common setup code for i2c bus 1.
+ config S5PV210_SETUP_I2C2
+       bool
+       help
+         Common setup code for i2c bus 2.
+ config S5PV210_SETUP_FB_24BPP
+       bool
+       help
+           Common setup code for S5PV210 with an 24bpp RGB display helper.
+ config S5PV210_SETUP_SDHCI
+         bool
+         select S5PV210_SETUP_SDHCI_GPIO
+         help
+           Internal helper functions for S5PV210 based SDHCI systems
+ config S5PV210_SETUP_SDHCI_GPIO
+       bool
+       help
+         Common setup code for SDHCI gpio.
+ # machine support
+ config MACH_AQUILA
+       bool "Samsung Aquila"
+       select CPU_S5PV210
+       select ARCH_SPARSEMEM_ENABLE
+       select S5PV210_SETUP_FB_24BPP
+       select S3C_DEV_FB
+       help
+         Machine support for the Samsung Aquila target based on S5PC110 SoC
+ config MACH_GONI
+       bool "GONI"
+       select CPU_S5PV210
+       select ARCH_SPARSEMEM_ENABLE
+       help
+         Machine support for Samsung GONI board
+         S5PC110(MCP) is one of package option of S5PV210
  
  config MACH_SMDKV210
        bool "SMDKV210"
        select CPU_S5PV210
        select ARCH_SPARSEMEM_ENABLE
 +      select SAMSUNG_DEV_ADC
 +      select SAMSUNG_DEV_TS
        help
          Machine support for Samsung SMDKV210
  
@@@ -39,6 -76,4 +79,4 @@@ config MACH_SMDKC11
          Machine support for Samsung SMDKC110
          S5PC110(MCP) is one of package option of S5PV210
  
- endchoice
  endif
index 359bdc8f3b664a1768f899e5c39c74ce37b79463,c5d53abc92f12b25aab0a11f8a0993a133f47a23..76084d85fd21b03753c1969f712cc9ceab9cd665
@@@ -32,6 -32,8 +32,8 @@@
  #include <plat/devs.h>
  #include <plat/clock.h>
  #include <plat/s5pv210.h>
+ #include <plat/iic-core.h>
+ #include <plat/sdhci.h>
  
  /* Initial IO mappings */
  
@@@ -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)
index 3a9e42e7734b67340a20a08c39d3d6db0b0b3927,ee6e07b5ae8a36c3b35897b3627d6ffb0e34da65..92fc6c7fc06400f8748f202cb82f6642a5e6ec21
  
  /* VIC0: System, DMA, Timer */
  
 -#define IRQ_EINT0             S5P_IRQ_VIC0(0)
 -#define IRQ_EINT1             S5P_IRQ_VIC0(1)
 -#define IRQ_EINT2             S5P_IRQ_VIC0(2)
 -#define IRQ_EINT3             S5P_IRQ_VIC0(3)
 -#define IRQ_EINT4             S5P_IRQ_VIC0(4)
 -#define IRQ_EINT5             S5P_IRQ_VIC0(5)
 -#define IRQ_EINT6             S5P_IRQ_VIC0(6)
 -#define IRQ_EINT7             S5P_IRQ_VIC0(7)
 -#define IRQ_EINT8             S5P_IRQ_VIC0(8)
 -#define IRQ_EINT9             S5P_IRQ_VIC0(9)
 -#define IRQ_EINT10            S5P_IRQ_VIC0(10)
 -#define IRQ_EINT11            S5P_IRQ_VIC0(11)
 -#define IRQ_EINT12            S5P_IRQ_VIC0(12)
 -#define IRQ_EINT13            S5P_IRQ_VIC0(13)
 -#define IRQ_EINT14            S5P_IRQ_VIC0(14)
 -#define IRQ_EINT15            S5P_IRQ_VIC0(15)
  #define IRQ_EINT16_31         S5P_IRQ_VIC0(16)
  #define IRQ_BATF              S5P_IRQ_VIC0(17)
  #define IRQ_MDMA              S5P_IRQ_VIC0(18)
  #define IRQ_MDNIE3            S5P_IRQ_VIC3(8)
  #define IRQ_VIC_END           S5P_IRQ_VIC3(31)
  
 -#define S5P_IRQ_EINT_BASE     (IRQ_VIC_END + 1)
 +#define S5P_EINT_16_31_BASE   (IRQ_VIC_END + 1)
  
 -#define S5P_EINT(x)           ((x) + S5P_IRQ_EINT_BASE)
 -#define IRQ_EINT(x)           S5P_EINT(x)
 +#define EINT_MODE             S3C_GPIO_SFN(0xf)
 +
 +#define IRQ_EINT(x)           ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \
 +                                      : ((x) + S5P_EINT_16_31_BASE))
  
  /* 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 */
index e8595708305558cad146f4c4bbd05139537c3acd,eeb1ca79a6f4ff02852f41ae7fd86aa1e6cf7304..fb5d05e91e4475f5c8cd38cc4b51cf0f14efbe6f
@@@ -26,6 -26,8 +26,8 @@@
  #define S5P_PA_GPIO           S5PV210_PA_GPIO
  
  #define S5PV210_PA_IIC0               (0xE1800000)
+ #define S5PV210_PA_IIC1               (0xFAB00000)
+ #define S5PV210_PA_IIC2               (0xE1A00000)
  
  #define S5PV210_PA_TIMER      (0xE2500000)
  #define S5P_PA_TIMER          S5PV210_PA_TIMER
  #define S5PV210_PA_PDMA0      0xE0900000
  #define S5PV210_PA_PDMA1      0xE0A00000
  
+ #define S5PV210_PA_FB         (0xF8000000)
+ #define S5PV210_PA_HSMMC(x)   (0xEB000000 + ((x) * 0x100000))
  #define S5PV210_PA_VIC0               (0xF2000000)
  #define S5P_PA_VIC0           S5PV210_PA_VIC0
  
  /* 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 */
index 1077ebebfb039bb273229bbc34d15fa7dd261c39,5b328e9e2bc777ac2e0e48b176ed344a46990364..b787d576d4b3a3d6f0d14f360cc3f241d32b0189
@@@ -6,7 -6,7 +6,7 @@@
  
  config PLAT_SAMSUNG
        bool
 -      depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX || ARCH_S5PC1XX
 +      depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX
        select NO_IOPORT
        default y
        help
@@@ -170,6 -170,11 +170,11 @@@ config S3C_DEV_I2C
        help
          Compile in platform device definitions for I2C channel 1
  
+ config S3C_DEV_I2C2
+       bool
+       help
+         Compile in platform device definitions for I2C channel 2
  config S3C_DEV_FB
        bool
        help