ARM: S3C2410: H1940: Adapt h1940-bluetooth to gpiolib changes
Subsystems (4)
PATCH 1/2 ARM: S3C2410: H1940: Adapt h1940-bluetooth to gpiolib changes
Replace in s3c_gpio_cfgpull with s3c_gpio_setpull.
--- arch/arm/mach-s3c2410/h1940-bluetooth.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-s3c2410/h1940-bluetooth.c +4 -4
@@ -77,13 +77,13 @@ static int __devinit h1940bt_probe(struct platform_device *pdev)/* Configures BT serial port GPIOs */ s3c_gpio_cfgpin (S3C2410_GPH (0 ), S3C2410_GPH0_nCTS0); -s3c_gpio_cfgpull (S3C2410_GPH (0 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPH (0 ),S3C_GPIO_PULL_NONE );s3c_gpio_cfgpin (S3C2410_GPH (1 ),S3C2410_GPIO_OUTPUT ); -s3c_gpio_cfgpull (S3C2410_GPH (1 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPH (1 ),S3C_GPIO_PULL_NONE );s3c_gpio_cfgpin (S3C2410_GPH (2 ),S3C2410_GPH2_TXD0 ); -s3c_gpio_cfgpull (S3C2410_GPH (2 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPH (2 ),S3C_GPIO_PULL_NONE );s3c_gpio_cfgpin (S3C2410_GPH (3 ),S3C2410_GPH3_RXD0 ); -s3c_gpio_cfgpull (S3C2410_GPH (3 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPH (3 ),S3C_GPIO_PULL_NONE ); rfk = rfkill_alloc(DRV_NAME, &pdev->dev, RFKILL_TYPE_BLUETOOTH,
Signature · 1 line
1.7.3.2
PATCH 2/2 h1940-leds: Fix compile issue introduced by latch-related changes
Latch API was converted to gpiolib API as result we got this compile error:
drivers/leds/leds-h1940.c: In function 'h1940_greenled_set':drivers/leds/leds-h1940.c:33: error: implicit declaration of function 'h1940_latch_control
Adapt h1940-leds driver to new changes and fix compile issue.
--- drivers/leds/leds-h1940.c | 67 ++++++++++++++++++++++++++++++++------------- 1 files changed, 48 insertions(+), 19 deletions(-)
drivers/leds/leds-h1940.c +48 -19
@@ -30,18 +30,18 @@ static void h1940_greenled_set(struct led_classdev *led_dev, {switch (value) {case LED_HALF : -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (7 ),1 );break ;case LED_FULL : -h1940_latch_control (0 ,H1940_LATCH_LED_GREEN ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,1 ); +gpio_set_value (H1940_LATCH_LED_GREEN ,1 ); +gpio_set_value (S3C2410_GPA (7 ),1 );break ;default :case LED_OFF : -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -h1940_latch_control (H1940_LATCH_LED_GREEN ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (H1940_LATCH_LED_GREEN ,0 ); +gpio_set_value (S3C2410_GPA (7 ),0 );break ; } }
@@ -60,18 +60,18 @@ static void h1940_redled_set(struct led_classdev *led_dev, {switch (value) {case LED_HALF : -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (1 ),1 );break ;case LED_FULL : -h1940_latch_control (0 ,H1940_LATCH_LED_RED ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,1 ); +gpio_set_value (H1940_LATCH_LED_RED ,1 ); +gpio_set_value (S3C2410_GPA (1 ),1 );break ;default :case LED_OFF : -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -h1940_latch_control (H1940_LATCH_LED_RED ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (H1940_LATCH_LED_RED ,0 ); +gpio_set_value (S3C2410_GPA (1 ),0 );break ; } }
@@ -91,11 +91,11 @@ static void h1940_blueled_set(struct led_classdev *led_dev, {if (value) {/* flashing Blue */ -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA3 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (3 ),1 ); }else { -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA3 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (S3C2410_GPA (3 ),0 ); } }
@@ -108,7 +108,24 @@ static struct led_classdev h1940_blueled = {static int __devinit h1940leds_probe (struct platform_device *pdev) { -int ret; +int ret, gpioidx =0 ; +int led_gpios[] = { +H1940_LATCH_LED_GREEN , +H1940_LATCH_LED_RED , +H1940_LATCH_LED_FLASH , +S3C2410_GPA (1 ), +S3C2410_GPA (3 ), +S3C2410_GPA (7 ), + }; + +for (gpioidx =0 ; gpioidx <ARRAY_SIZE (led_gpios); gpioidx++) { + ret =gpio_request (led_gpios[gpioidx],"h1940 leds" ); +if (ret <0 ) + goto err_gpio; + ret =gpio_direction_output (led_gpios[gpioidx],0 ); +if (ret <0 ) + goto err_gpio; + } ret =led_classdev_register (&pdev->dev, &h1940_greenled);if (ret)
@@ -129,6 +146,10 @@ err_blue: err_red:led_classdev_unregister (&h1940_greenled); err_green: +err_gpio: +while (--gpioidx >=0 ) +gpio_free (led_gpios[gpioidx]); +return ret; }
@@ -137,6 +158,14 @@ static int h1940leds_remove(struct platform_device *pdev)led_classdev_unregister (&h1940_greenled);led_classdev_unregister (&h1940_redled);led_classdev_unregister (&h1940_blueled); + +gpio_free (H1940_LATCH_LED_GREEN ); +gpio_free (H1940_LATCH_LED_RED ); +gpio_free (H1940_LATCH_LED_FLASH ); +gpio_free (S3C2410_GPA (1 )); +gpio_free (S3C2410_GPA (3 )); +gpio_free (S3C2410_GPA (7 )); +return 0 ; }
Signature · 1 line
1.7.3.2
RE: [PATCH 2/2] h1940-leds: Fix compile issue introduced by latch-related changes
Hi Richard,
Quoted 2 lines · On Monday 08 November 2010 09:15:55 Kukjin Kim wrote:
Now, happens following build error due to commit
14477095abc661a9f195ca4733bb739c54794b32'ARM: h1940: Use gpiolib for
latch
Quoted 8 lines
access' with
s3c2410_defconfig.
drivers/leds/leds-h1940.c: In function 'h1940_greenled_set':drivers/leds/leds-h1940.c:33: error: implicit declaration of function 'h1940_latch_control'The
h1940_greenled_set(),h1940_redled_set(), andh1940_blueled_set()indrivers/leds/leds-h1940.ccallh1940_latch_control()...
Please check below Vasily's patch about above error.
And as a note, latest Linus' tree has following error with s3c2410_defconfig.
drivers/built-in.o: In function `led_trigger_set':drivers/leds/led-triggers.c:116: undefined reference to `led_brightness_set'
make: *** [.tmp_vmlinux1] Error 1
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 8 lines · Vasily Khoruzhick
Latch API was converted to gpiolib API as result we got this compile error:
drivers/leds/leds-h1940.c: In function 'h1940_greenled_set':drivers/leds/leds-h1940.c:33: error: implicit declaration of function 'h1940_latch_control
Quoted 5 lines
Adapt h1940-leds driver to new changes and fix compile issue.
Signed-off-by Vasily Khoruzhick <[email protected]>--- drivers/leds/leds-h1940.c | 67
++++++++++++++++++++++++++++++++-----------
drivers/leds/leds-h1940.c static void h1940_redled_set(struct led_classdev
Quoted 35 lines
--
1 files changed, 48 insertions(+), 19 deletions(-)drivers/leds/leds-h1940.c +7
-7@@ -30,18 +30,18 @@ static void h1940_greenled_set(struct led_classdev *led_dev, {switch (value) {case LED_HALF : -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (7 ),1 );break ;case LED_FULL : -h1940_latch_control (0 ,H1940_LATCH_LED_GREEN ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,1 ); +gpio_set_value (H1940_LATCH_LED_GREEN ,1 ); +gpio_set_value (S3C2410_GPA (7 ),1 );break ;default :case LED_OFF : -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -h1940_latch_control (H1940_LATCH_LED_GREEN ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (H1940_LATCH_LED_GREEN ,0 ); +gpio_set_value (S3C2410_GPA (7 ),0 );break ; }}
drivers/leds/leds-h1940.c +0
-0@@ -60,18 +60,18 @@ static void h1940_redled_set(struct led_classdev
*led_dev,
drivers/leds/leds-h1940.c static int h1940leds_remove(struct platform_device
Quoted 80 lines
drivers/leds/leds-h1940.c +11
-11{switch (value) {case LED_HALF : -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (1 ),1 );break ;case LED_FULL : -h1940_latch_control (0 ,H1940_LATCH_LED_RED ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,1 ); +gpio_set_value (H1940_LATCH_LED_RED ,1 ); +gpio_set_value (S3C2410_GPA (1 ),1 );break ;default :case LED_OFF : -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -h1940_latch_control (H1940_LATCH_LED_RED ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (H1940_LATCH_LED_RED ,0 ); +gpio_set_value (S3C2410_GPA (1 ),0 );break ; } }@@ -91,11 +91,11 @@ static void h1940_blueled_set(struct led_classdev *led_dev, {if (value) {/* flashing Blue */ -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA3 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (3 ),1 ); }else { -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA3 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (S3C2410_GPA (3 ),0 ); }}
drivers/leds/leds-h1940.c +22
-1@@ -108,7 +108,24 @@ static struct led_classdev h1940_blueled = {static int __devinit h1940leds_probe (struct platform_device *pdev) { -int ret; +int ret, gpioidx =0 ; +int led_gpios[] = { +H1940_LATCH_LED_GREEN , +H1940_LATCH_LED_RED , +H1940_LATCH_LED_FLASH , +S3C2410_GPA (1 ), +S3C2410_GPA (3 ), +S3C2410_GPA (7 ), + }; + +for (gpioidx =0 ; gpioidx <ARRAY_SIZE (led_gpios); gpioidx++) { + ret =gpio_request (led_gpios[gpioidx],"h1940 leds" ); +if (ret <0 ) + goto err_gpio; + ret =gpio_direction_output (led_gpios[gpioidx],0 ); +if (ret <0 ) + goto err_gpio; + } ret =led_classdev_register (&pdev->dev, &h1940_greenled);if (ret)@@ -129,6 +146,10 @@ err_blue: err_red:led_classdev_unregister (&h1940_greenled); err_green: +err_gpio: +while (--gpioidx >=0 ) +gpio_free (led_gpios[gpioidx]); +return ret; }@@ -137,6 +158,14 @@ static int h1940leds_remove(struct platform_device
*pdev)
Quoted 16 lines
drivers/leds/leds-h1940.c +8
-1led_classdev_unregister (&h1940_greenled);led_classdev_unregister (&h1940_redled);led_classdev_unregister (&h1940_blueled); + +gpio_free (H1940_LATCH_LED_GREEN ); +gpio_free (H1940_LATCH_LED_RED ); +gpio_free (H1940_LATCH_LED_FLASH ); +gpio_free (S3C2410_GPA (1 )); +gpio_free (S3C2410_GPA (3 )); +gpio_free (S3C2410_GPA (7 )); +return 0 ; } --1.7.3.2
PATCH 2/2 h1940-leds: Fix compile issue introduced by latch-related changes
In reply to Vasily KhoruzhickQuoted 9 lines · Vasily Khoruzhick
Latch API was converted to gpiolib API as result we got this compile error:
drivers/leds/leds-h1940.c: In function 'h1940_greenled_set':drivers/leds/leds-h1940.c:33: error: implicit declaration of function 'h1940_latch_controlAdapt h1940-leds driver to new changes and fix compile issue.
it's a pitty we can't remove the driver totally and use the gpio leds.
PATCH 2/2 h1940-leds: Fix compile issue introduced by latch-related changes
Quoted 2 lines · On Wednesday 17 November 2010 01:12:58 Ben Dooks wrote:
it's a pitty we can't remove the driver totally and use the gpio leds.
Why? It's possible to use leds-gpio driver. Additional gpios (blink, etc) can be handled via platform_gpio_blink_set callback.
Regards
Vasily
PATCH 2/2 h1940-leds: Fix compile issue introduced by latch-related changes
In reply to Vasily KhoruzhickQuoted 128 lines · On Monday 08 November 2010 22:31:48 Vasily Khoruzhick wrote:
Latch API was converted to gpiolib API as result we got this compile error:
drivers/leds/leds-h1940.c: In function 'h1940_greenled_set':drivers/leds/leds-h1940.c:33: error: implicit declaration of function 'h1940_latch_controlAdapt h1940-leds driver to new changes and fix compile issue.
Signed-off-by Vasily Khoruzhick <[email protected]>--- drivers/leds/leds-h1940.c | 67++++++++++++++++++++++++++++++++------------- 1 files changed, 48 insertions(+), 19 deletions(-)
drivers/leds/leds-h1940.c +40
-19@@ -30,18 +30,18 @@ static void h1940_greenled_set(struct led_classdev *led_dev, {switch (value) {case LED_HALF : -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (7 ),1 );break ;case LED_FULL : -h1940_latch_control (0 ,H1940_LATCH_LED_GREEN ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,1 ); +gpio_set_value (H1940_LATCH_LED_GREEN ,1 ); +gpio_set_value (S3C2410_GPA (7 ),1 );break ;default :case LED_OFF : -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -h1940_latch_control (H1940_LATCH_LED_GREEN ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA7 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (H1940_LATCH_LED_GREEN ,0 ); +gpio_set_value (S3C2410_GPA (7 ),0 );break ; } }@@ -60,18 +60,18 @@ static void h1940_redled_set(struct led_classdev *led_dev, {switch (value) {case LED_HALF : -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (1 ),1 );break ;case LED_FULL : -h1940_latch_control (0 ,H1940_LATCH_LED_RED ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,1 ); +gpio_set_value (H1940_LATCH_LED_RED ,1 ); +gpio_set_value (S3C2410_GPA (1 ),1 );break ;default :case LED_OFF : -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -h1940_latch_control (H1940_LATCH_LED_RED ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA1 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (H1940_LATCH_LED_RED ,0 ); +gpio_set_value (S3C2410_GPA (1 ),0 );break ; } }@@ -91,11 +91,11 @@ static void h1940_blueled_set(struct led_classdev *led_dev, {if (value) {/* flashing Blue */ -h1940_latch_control (0 ,H1940_LATCH_LED_FLASH ); -s3c2410_gpio_setpin (S3C2410_GPA3 ,1 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,1 ); +gpio_set_value (S3C2410_GPA (3 ),1 ); }else { -h1940_latch_control (H1940_LATCH_LED_FLASH ,0 ); -s3c2410_gpio_setpin (S3C2410_GPA3 ,0 ); +gpio_set_value (H1940_LATCH_LED_FLASH ,0 ); +gpio_set_value (S3C2410_GPA (3 ),0 ); } }@@ -108,7 +108,24 @@ static struct led_classdev h1940_blueled = {static int __devinit h1940leds_probe (struct platform_device *pdev) { -int ret; +int ret, gpioidx =0 ; +int led_gpios[] = { +H1940_LATCH_LED_GREEN , +H1940_LATCH_LED_RED , +H1940_LATCH_LED_FLASH , +S3C2410_GPA (1 ), +S3C2410_GPA (3 ), +S3C2410_GPA (7 ), + }; + +for (gpioidx =0 ; gpioidx <ARRAY_SIZE (led_gpios); gpioidx++) { + ret =gpio_request (led_gpios[gpioidx],"h1940 leds" ); +if (ret <0 ) + goto err_gpio; + ret =gpio_direction_output (led_gpios[gpioidx],0 ); +if (ret <0 ) + goto err_gpio; + } ret =led_classdev_register (&pdev->dev, &h1940_greenled);if (ret)@@ -129,6 +146,10 @@ err_blue: err_red:led_classdev_unregister (&h1940_greenled); err_green: +err_gpio: +while (--gpioidx >=0 ) +gpio_free (led_gpios[gpioidx]); +return ret; }@@ -137,6 +158,14 @@ static int h1940leds_remove(struct platform_device *pdev) led_classdev_unregister(&h1940_greenled);led_classdev_unregister (&h1940_redled);led_classdev_unregister (&h1940_blueled);
drivers/leds/leds-h1940.c static int h1940leds_remove(struct platform_device · line 170
Quoted 10 lines
drivers/leds/leds-h1940.c +8
-0+ +gpio_free (H1940_LATCH_LED_GREEN ); +gpio_free (H1940_LATCH_LED_RED ); +gpio_free (H1940_LATCH_LED_FLASH ); +gpio_free (S3C2410_GPA (1 )); +gpio_free (S3C2410_GPA (3 )); +gpio_free (S3C2410_GPA (7 )); +return 0 ; }
Added Richard Purdie to CC (it seems he changed email address).
Richard, could you review/merge this patch?
Regards
Vasily
PATCH 1/2 ARM: S3C2410: H1940: Adapt h1940-bluetooth to gpiolib changes
In reply to Vasily Khoruzhickarch/arm/mach-s3c2410/h1940-bluetooth.c static int __devinit h1940bt_probe(struct
Quoted 14 lines · Vasily Khoruzhick
Replace in
s3c_gpio_cfgpullwiths3c_gpio_setpull.Signed-off-by Vasily Khoruzhick <[email protected]>--- arch/arm/mach-s3c2410/h1940-bluetooth.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)arch/arm/mach- renamed from arch/arm/mach-s3c2410/h1940-bluetooth.c +0
-0
s3c2410/h1940-bluetooth.c
index 8aa2f19..6b86a72 100644arch/arm/mach-s3c2410/h1940-bluetooth.c +0
-0@@ -77,13 +77,13 @@ static int __devinit h1940bt_probe(struct
platform_device
Quoted 17 lines
arch/arm/mach-s3c2410/h1940-bluetooth.c +4
-4*pdev)/* Configures BT serial port GPIOs */ s3c_gpio_cfgpin (S3C2410_GPH (0 ), S3C2410_GPH0_nCTS0); -s3c_gpio_cfgpull (S3C2410_GPH (0 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPH (0 ),S3C_GPIO_PULL_NONE );s3c_gpio_cfgpin (S3C2410_GPH (1 ),S3C2410_GPIO_OUTPUT ); -s3c_gpio_cfgpull (S3C2410_GPH (1 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPH (1 ),S3C_GPIO_PULL_NONE );s3c_gpio_cfgpin (S3C2410_GPH (2 ),S3C2410_GPH2_TXD0 ); -s3c_gpio_cfgpull (S3C2410_GPH (2 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPH (2 ),S3C_GPIO_PULL_NONE );s3c_gpio_cfgpin (S3C2410_GPH (3 ),S3C2410_GPH3_RXD0 ); -s3c_gpio_cfgpull (S3C2410_GPH (3 ),S3C_GPIO_PULL_NONE ); +s3c_gpio_setpull (S3C2410_GPH (3 ),S3C_GPIO_PULL_NONE );
Quoted 2 lines
rfk = rfkill_alloc(DRV_NAME,
&pdev->dev,RFKILL_TYPE_BLUETOOTH,
--
You're right..will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.