From ab57513025ff206dde575ec3e356231b0e71a37c Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 31 Oct 2009 22:14:09 +0100 Subject: [gta02] Follow led naming specification. --- arch/arm/mach-s3c2442/mach-gta02.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index a31cad1952a..d9ee75f2afe 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -594,15 +594,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, }, }; -- cgit v1.2.3 From 93d68dbdae33adb601a68188adb67a5251bd89e5 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 2 Nov 2009 22:53:10 +0100 Subject: gta02: Use timer 2 for fiq so we have timer 3 for the vibrator and can do hw pwm. --- arch/arm/mach-s3c2442/gta02-fiq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 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(); -- cgit v1.2.3 From 6b402a65031af570d7696dc545aeb7960ae41b6b Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 3 Nov 2009 00:29:53 +0100 Subject: s3c: Register gpio bank J with gpiolib This is nonportable and wastes a lot of memory and thus should be replaced with a prober solution asap. --- arch/arm/mach-s3c2410/include/mach/gpio.h | 5 +++-- arch/arm/plat-s3c24xx/gpiolib.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 4 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 #include #include +#include -#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32) +#define S3C_GPIO_END (S3C2440_GPIO_BANKJ + 32) 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 #include +#include 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) { -- cgit v1.2.3