diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-30 11:26:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-30 11:26:25 -0400 |
commit | 706d4b12f8d7edd28d7e879a77235472da393edb (patch) | |
tree | c9bc1ce06b1154a49da1d0d907cac544a818eb0e /arch/arm/plat-s3c24xx | |
parent | 3af54c9bd9e6f14f896aac1bb0e8405ae0bc7a44 (diff) | |
parent | 9bafc74163d8bccca9810159aab39be926fb877c (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (215 commits)
ARM: memblock: setup lowmem mappings using memblock
ARM: memblock: move meminfo into find_limits directly
ARM: memblock: convert free_highpages() to use memblock
ARM: move freeing of highmem pages out of mem_init()
ARM: memblock: convert memory detail printing to use memblock
ARM: memblock: use memblock to free memory into arm_bootmem_init()
ARM: memblock: use memblock when initializing memory allocators
ARM: ensure membank array is always sorted
ARM: 6466/1: implement flush_icache_all for the rest of the CPUs
ARM: 6464/2: fix spinlock recursion in adjust_pte()
ARM: fix memblock breakage
ARM: 6465/1: Fix data abort accessing proc_info from __lookup_processor_type
ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt
ARM: 6449/1: Fix for compiler warning of uninitialized variable.
ARM: 6445/1: fixup TCM memory types
ARM: imx: Add wake functionality to GPIO
ARM: mx5: Add gpio-keys to mx51 babbage board
ARM: imx: Add gpio-keys to plat-mxc
mx31_3ds: Fix spi registration
mx31_3ds: Fix the logic for detecting the debug board
...
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r-- | arch/arm/plat-s3c24xx/common-smdk.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/gpiolib.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index 7b44d0c592b5..bcc43f346272 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c | |||
@@ -147,7 +147,7 @@ static struct mtd_partition smdk_default_nand_part[] = { | |||
147 | [7] = { | 147 | [7] = { |
148 | .name = "S3C2410 flash partition 7", | 148 | .name = "S3C2410 flash partition 7", |
149 | .offset = SZ_1M * 48, | 149 | .offset = SZ_1M * 48, |
150 | .size = SZ_16M, | 150 | .size = MTDPART_SIZ_FULL, |
151 | } | 151 | } |
152 | }; | 152 | }; |
153 | 153 | ||
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index ae9d3c2403f0..24c6f5a30596 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c | |||
@@ -74,11 +74,6 @@ static int s3c24xx_gpiolib_bankf_toirq(struct gpio_chip *chip, unsigned offset) | |||
74 | return -EINVAL; | 74 | return -EINVAL; |
75 | } | 75 | } |
76 | 76 | ||
77 | static int s3c24xx_gpiolib_bankg_toirq(struct gpio_chip *chip, unsigned offset) | ||
78 | { | ||
79 | return IRQ_EINT8 + offset; | ||
80 | } | ||
81 | |||
82 | static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = { | 77 | static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = { |
83 | .set_config = s3c_gpio_setcfg_s3c24xx_a, | 78 | .set_config = s3c_gpio_setcfg_s3c24xx_a, |
84 | .get_config = s3c_gpio_getcfg_s3c24xx_a, | 79 | .get_config = s3c_gpio_getcfg_s3c24xx_a, |
@@ -159,12 +154,13 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { | |||
159 | [6] = { | 154 | [6] = { |
160 | .base = S3C2410_GPGCON, | 155 | .base = S3C2410_GPGCON, |
161 | .pm = __gpio_pm(&s3c_gpio_pm_2bit), | 156 | .pm = __gpio_pm(&s3c_gpio_pm_2bit), |
157 | .irq_base = IRQ_EINT8, | ||
162 | .chip = { | 158 | .chip = { |
163 | .base = S3C2410_GPG(0), | 159 | .base = S3C2410_GPG(0), |
164 | .owner = THIS_MODULE, | 160 | .owner = THIS_MODULE, |
165 | .label = "GPIOG", | 161 | .label = "GPIOG", |
166 | .ngpio = 16, | 162 | .ngpio = 16, |
167 | .to_irq = s3c24xx_gpiolib_bankg_toirq, | 163 | .to_irq = samsung_gpiolib_to_irq, |
168 | }, | 164 | }, |
169 | }, { | 165 | }, { |
170 | .base = S3C2410_GPHCON, | 166 | .base = S3C2410_GPHCON, |