From d6694fb05efb76fcc931bd1588facd28073fcaf0 Mon Sep 17 00:00:00 2001 From: lars Date: Thu, 30 Jul 2009 15:08:05 +0000 Subject: [s3c24xx] Get rid of gpio shadowing. I fail really to see why this would be necessary here. So get rid of it and see if anything breaks... git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17052 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c | 6 +++--- target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'target/linux/s3c24xx/files-2.6.30/drivers') diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c b/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c index 653a9fb28..e560ab76c 100644 --- a/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c +++ b/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02-vibrator.c @@ -52,14 +52,14 @@ int gta02_vibrator_fiq_handler(void) return 0; if ((u8)gta02_vib_priv.fiq_count == gta02_vib_priv.vib_pwm_latched) - gta02_gpb_setpin(gta02_vib_priv.vib_gpio_pin, 0); + s3c2410_gpio_setpin(gta02_vib_priv.vib_gpio_pin, 0); if ((u8)gta02_vib_priv.fiq_count) return 1; gta02_vib_priv.vib_pwm_latched = gta02_vib_priv.vib_pwm; if (gta02_vib_priv.vib_pwm_latched) - gta02_gpb_setpin(gta02_vib_priv.vib_gpio_pin, 1); + s3c2410_gpio_setpin(gta02_vib_priv.vib_gpio_pin, 1); return 1; } @@ -139,7 +139,7 @@ static int __init gta02_vib_probe(struct platform_device *pdev) gta02_vib_priv.pdata = pdev->dev.platform_data; platform_set_drvdata(pdev, >a02_vib_led); - gta02_gpb_setpin(gta02_vib_led.gpio, 0); /* off */ + s3c2410_gpio_setpin(gta02_vib_led.gpio, 0); /* off */ s3c2410_gpio_cfgpin(gta02_vib_led.gpio, S3C2410_GPIO_OUTPUT); /* safe, kmalloc'd copy needed for FIQ ISR */ gta02_vib_priv.vib_gpio_pin = gta02_vib_led.gpio; diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02.c b/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02.c index 1d65eeaf3..48559b113 100644 --- a/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02.c +++ b/target/linux/s3c24xx/files-2.6.30/drivers/leds/leds-gta02.c @@ -19,7 +19,6 @@ #include #include #include -#include #define MAX_LEDS 3 #define COUNTER 256 @@ -54,7 +53,7 @@ static void gta02led_set(struct led_classdev *led_cdev, struct gta02_led_priv *lp = to_priv(led_cdev); spin_lock_irqsave(&lp->lock, flags); - gta02_gpb_setpin(lp->gpio, value ? 1 : 0); + s3c2410_gpio_setpin(lp->gpio, value ? 1 : 0); spin_unlock_irqrestore(&lp->lock, flags); } @@ -117,7 +116,6 @@ static int __init gta02led_probe(struct platform_device *pdev) case S3C2410_GPB1: case S3C2410_GPB2: s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPIO_OUTPUT); - gta02_gpb_add_shadow_gpio(lp->gpio); break; default: break; -- cgit v1.2.3