diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-03 01:00:51 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-03 01:00:51 +0100 |
| commit | dbcf75951dec6cbb273f70bb282b101e493f7de3 (patch) | |
| tree | c8107e0915cf42600a61804793a4126392dfad57 | |
| parent | a8198a15c03ccdd8546f4b626320d08d9803e84b (diff) | |
| parent | 1c52a65040ed7007ed7dbe9bd1e2709996c61890 (diff) | |
Merge branch 'om-gta02-2.6.31' into om-2.6.31
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/gta02-fiq.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 6 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/gpiolib.c | 13 |
4 files changed, 22 insertions, 12 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h index 15f0b3e7ce6..0b53cad80fe 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h @@ -20,10 +20,11 @@ * devices that need GPIO. */ -#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA) +#define ARCH_NR_GPIOS (512 + CONFIG_S3C24XX_GPIO_EXTRA) #include <asm-generic/gpio.h> #include <mach/gpio-nrs.h> #include <mach/gpio-fns.h> +#include <mach/regs-gpioj.h> -#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32) +#define S3C_GPIO_END (S3C2440_GPIO_BANKJ + 32) diff --git a/arch/arm/mach-s3c2442/gta02-fiq.c b/arch/arm/mach-s3c2442/gta02-fiq.c index 2b46597c41e..600eb64cf9f 100644 --- a/arch/arm/mach-s3c2442/gta02-fiq.c +++ b/arch/arm/mach-s3c2442/gta02-fiq.c @@ -79,19 +79,19 @@ void gta02_fiq_kick(void) __raw_writel(__raw_readl(S3C2410_INTMSK) & ~(1 << (gta02_fiq_irq - S3C2410_CPUIRQ_OFFSET)), S3C2410_INTMSK); - tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T3START; + tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T2START; /* fake the timer to a count of 1 */ __raw_writel(1, S3C2410_TCNTB(gta02_fiq_timer_index)); - __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD, S3C2410_TCON); - __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD | S3C2410_TCON_T3START, + __raw_writel(tcon | S3C2410_TCON_T2MANUALUPD, S3C2410_TCON); + __raw_writel(tcon | S3C2410_TCON_T2MANUALUPD | S3C2410_TCON_T2START, S3C2410_TCON); - __raw_writel(tcon | S3C2410_TCON_T3START, S3C2410_TCON); + __raw_writel(tcon | S3C2410_TCON_T2START, S3C2410_TCON); local_irq_restore(flags); } int gta02_fiq_enable(void) { - int irq_index_fiq = IRQ_TIMER3; + int irq_index_fiq = IRQ_TIMER2; int rc = 0; local_fiq_disable(); diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index d367b6f7e5d..eed207a5956 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -799,15 +799,15 @@ static struct platform_device gta02_buttons_device = { /* LEDs */ static struct gpio_led gta02_gpio_leds[] = { { - .name = "gta02-power:orange", + .name = "gta02:orange:power", .gpio = GTA02_GPIO_PWR_LED1, }, { - .name = "gta02-power:blue", + .name = "gta02:blue:power", .gpio = GTA02_GPIO_PWR_LED2, }, { - .name = "gta02-aux:red", + .name = "gta02:red:aux", .gpio = GTA02_GPIO_AUX_LED, }, }; diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 6d7a961d326..c2dd900660b 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c @@ -26,6 +26,7 @@ #include <plat/pm.h> #include <mach/regs-gpio.h> +#include <mach/regs-gpioj.h> static int s3c24xx_gpiolib_banka_input(struct gpio_chip *chip, unsigned offset) { @@ -160,8 +161,16 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { .label = "GPIOH", .ngpio = 11, }, - }, -}; + }, { + .base = S3C2440_GPJCON, + .pm = __gpio_pm(&s3c_gpio_pm_2bit), + .chip = { + .base = S3C2440_GPJ0, + .owner = THIS_MODULE, + .label = "GPIOJ", + .ngpio = 11, + }, + },}; static __init int s3c24xx_gpiolib_init(void) { |