ARM: pxa/cm-x300: properly set bt_reset pin

PATCH In review Axel Lin 3 participants 6 messages Sep 17, 2011 – Oct 25, 2011

Subsystems (3)

Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support

lore

Share & tools

lore

Axel Lin

author

2011-09-17 14:15 UTC #0 lore raw

PATCH 1/1 ARM: pxa/cm-x300: properly set bt_reset pin

Fix below build warning and properly set bt_reset pin.

CC arch/arm/mach-pxa/cm-x300.o
arch/arm/mach-pxa/cm-x300.c: In function 'cm_x300_init_wi2wi':
arch/arm/mach-pxa/cm-x300.c:779: warning: unused variable 'wlan_en' arch/arm/mach-pxa/cm-x300.c:795: warning: 'bt_reset' may be used uninitialized in this function

Signed-off-by Axel Lin <[email protected]>

---
 arch/arm/mach-pxa/cm-x300.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

arch/arm/mach-pxa/cm-x300.c +3 -5

index 0f00e01..0e18eb9 100644
@@ -776,7 +776,6 @@ static struct gpio cm_x300_wi2wi_gpios[] __initdata = {
 
 static void __init cm_x300_init_wi2wi(void)
 {
-	int bt_reset, wlan_en;
 	int err;
 
 	if (system_rev < 130) {

@@ -792,12 +791,11 @@ static void __init cm_x300_init_wi2wi(void)
 	}
 
 	udelay(10);
-	gpio_set_value(bt_reset, 0);
+	gpio_set_value(cm_x300_wi2wi_gpios[1].gpio, 0);
 	udelay(10);
-	gpio_set_value(bt_reset, 1);
+	gpio_set_value(cm_x300_wi2wi_gpios[1].gpio, 1);
 
-	gpio_free(wlan_en);
-	gpio_free(bt_reset);
+	gpio_free_array(ARRAY_AND_SIZE(cm_x300_wi2wi_gpios));
 }
 
 /* MFP */

Signature · 1 line

1.7.4.1

Igor Grinberg

Acked-by on v1 1/1

2011-09-22 10:30 UTC #1 lore raw

Hi Axel,

Quoted 6 lines · Axel Lin

Fix below build warning and properly set bt_reset pin.
CC arch/arm/mach-pxa/cm-x300.o
arch/arm/mach-pxa/cm-x300.c: In function 'cm_x300_init_wi2wi':
arch/arm/mach-pxa/cm-x300.c:779: warning: unused variable 'wlan_en' arch/arm/mach-pxa/cm-x300.c:795: warning: 'bt_reset' may be used uninitialized in this function

What a shame...
My patch 5a009df1f200efa49658b0e9c7ad056d59fbefe4 (ARM: pxa/cm-x300: GPIO cleanup) was f*cked up, sorry... I should have not send it in a rush and I admit, I had no possibility to test it. Sorry again...

Quoted 2 lines

Signed-off-by Axel Lin <[email protected]>

Thanks for spotting this.

Acked-by Igor Grinberg <[email protected]>

Also, this patch fixes a real regression since 5a009df1f200efa49658b0e9c7ad056d59fbefe4 (ARM: pxa/cm-x300: GPIO cleanup)
- Wifi and Bluetooth do not work without it, so please:

Cc <[email protected]> [3.0.x]

Quoted 32 lines

---
 arch/arm/mach-pxa/cm-x300.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

arch/arm/mach-pxa/cm-x300.c +3 -5

index 0f00e01..0e18eb9 100644
@@ -776,7 +776,6 @@ static struct gpio cm_x300_wi2wi_gpios[] __initdata = {
 
 static void __init cm_x300_init_wi2wi(void)
 {
-	int bt_reset, wlan_en;
 	int err;
 
 	if (system_rev < 130) {

@@ -792,12 +791,11 @@ static void __init cm_x300_init_wi2wi(void)
 	}
 
 	udelay(10);
-	gpio_set_value(bt_reset, 0);
+	gpio_set_value(cm_x300_wi2wi_gpios[1].gpio, 0);
 	udelay(10);
-	gpio_set_value(bt_reset, 1);
+	gpio_set_value(cm_x300_wi2wi_gpios[1].gpio, 1);
 
-	gpio_free(wlan_en);
-	gpio_free(bt_reset);
+	gpio_free_array(ARRAY_AND_SIZE(cm_x300_wi2wi_gpios));
 }
 
 /* MFP */

Signature · 2 lines

Regards,
Igor.

Axel Lin

author

2011-09-29 07:57 UTC #2 lore raw

2011/9/22 Igor Grinberg <[email protected]>:

Quoted 10 lines

Hi Axel,
Quoted 6 lines · Axel Lin
Fix below build warning and properly set bt_reset pin.
? CC ? ? ?arch/arm/mach-pxa/cm-x300.o
arch/arm/mach-pxa/cm-x300.c: In function 'cm_x300_init_wi2wi':
arch/arm/mach-pxa/cm-x300.c:779: warning: unused variable 'wlan_en' arch/arm/mach-pxa/cm-x300.c:795: warning: 'bt_reset' may be used uninitialized in this function

Quoted 8 lines

Acked-by Igor Grinberg <[email protected]>
Also, this patch fixes a real regression since 5a009df1f200efa49658b0e9c7ad056d59fbefe4 (ARM: pxa/cm-x300: GPIO cleanup)
- Wifi and Bluetooth do not work without it, so please:
Cc <[email protected]> [3.0.x]

Hi, Eric,
Just to pin the status of this patch. I think it should go for 3.1. Thanks,
Axel

Igor Grinberg

2011-10-17 15:45 UTC #3 lore raw

ping

Quoted 24 lines · Axel Lin

2011/9/22 Igor Grinberg <[email protected]>:
Quoted 10 lines
Hi Axel,
Quoted 6 lines · Axel Lin
Fix below build warning and properly set bt_reset pin.
CC arch/arm/mach-pxa/cm-x300.o
arch/arm/mach-pxa/cm-x300.c: In function 'cm_x300_init_wi2wi':
arch/arm/mach-pxa/cm-x300.c:779: warning: unused variable 'wlan_en' arch/arm/mach-pxa/cm-x300.c:795: warning: 'bt_reset' may be used uninitialized in this function
Quoted 8 lines
Acked-by Igor Grinberg <[email protected]>
Also, this patch fixes a real regression since 5a009df1f200efa49658b0e9c7ad056d59fbefe4 (ARM: pxa/cm-x300: GPIO cleanup)
- Wifi and Bluetooth do not work without it, so please:
Cc <[email protected]> [3.0.x]
Hi, Eric,
Just to pin the status of this patch. I think it should go for 3.1. Thanks,
Axel

Signature · 2 lines

Regards,
Igor.

Igor Grinberg

2011-10-25 14:30 UTC #4 lore raw

ping x2

Quoted 26 lines · Igor Grinberg

ping
Quoted 23 lines · Axel Lin
2011/9/22 Igor Grinberg <[email protected]>:
Quoted 9 lines
Hi Axel,
Quoted 6 lines · Axel Lin
Fix below build warning and properly set bt_reset pin.
CC arch/arm/mach-pxa/cm-x300.o
arch/arm/mach-pxa/cm-x300.c: In function 'cm_x300_init_wi2wi':
arch/arm/mach-pxa/cm-x300.c:779: warning: unused variable 'wlan_en' arch/arm/mach-pxa/cm-x300.c:795: warning: 'bt_reset' may be used uninitialized in this function
Quoted 8 lines
Acked-by Igor Grinberg <[email protected]>
Also, this patch fixes a real regression since 5a009df1f200efa49658b0e9c7ad056d59fbefe4 (ARM: pxa/cm-x300: GPIO cleanup)
- Wifi and Bluetooth do not work without it, so please:
Cc <[email protected]> [3.0.x]
Hi, Eric,
Just to pin the status of this patch. I think it should go for 3.1. Thanks,
Axel

Eric Miao

2011-10-25 14:37 UTC #5 lore raw

sorry x 3

Missed this, queued now.

Quoted 31 lines · Igor Grinberg

ping x2
Quoted 26 lines · Igor Grinberg
ping
Quoted 23 lines · Axel Lin
2011/9/22 Igor Grinberg <[email protected]>:
Quoted 9 lines
Hi Axel,
Quoted 6 lines · Axel Lin
Fix below build warning and properly set bt_reset pin.
? CC ? ? ?arch/arm/mach-pxa/cm-x300.o
arch/arm/mach-pxa/cm-x300.c: In function 'cm_x300_init_wi2wi':
arch/arm/mach-pxa/cm-x300.c:779: warning: unused variable 'wlan_en' arch/arm/mach-pxa/cm-x300.c:795: warning: 'bt_reset' may be used uninitialized in this function
Quoted 8 lines
Acked-by Igor Grinberg <[email protected]>
Also, this patch fixes a real regression since 5a009df1f200efa49658b0e9c7ad056d59fbefe4 (ARM: pxa/cm-x300: GPIO cleanup)
- Wifi and Bluetooth do not work without it, so please:
Cc <[email protected]> [3.0.x]
Hi, Eric,
Just to pin the status of this patch. I think it should go for 3.1. Thanks,
Axel