diff options
Diffstat (limited to 'arch/arm/mach-s3c2442')
-rw-r--r-- | arch/arm/mach-s3c2442/gta02-fiq.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 6 |
2 files changed, 8 insertions, 8 deletions
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, }, }; |