* [PATCH 04/14] rt2x00: Align rt2500pci GPIOCSR definition with datasheet.
2012-08-30 19:34 ` [PATCH 03/14] rt2x00: Fix rt2400pci rfkill polling prior to interface start Gertjan van Wingerde
@ 2012-08-30 19:34 ` Gertjan van Wingerde
2012-08-30 21:06 ` Jonathan Nieder
0 siblings, 1 reply; 3+ messages in thread
From: Gertjan van Wingerde @ 2012-08-30 19:34 UTC (permalink / raw)
To: linux-wireless, John W. Linville
Cc: users, Ivo van Doorn, Helmut Schaa, Gertjan van Wingerde, stable
Rename GPIOCSR_BIT<x> to GPIOCSR_VAL<x> to represent the actual
meaning better.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Cc: <stable@vger.kernel.org>
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index d2cf8a4..959d565 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -205,7 +205,7 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
u32 reg;
rt2x00pci_register_read(rt2x00dev, GPIOCSR, ®);
- return rt2x00_get_field32(reg, GPIOCSR_BIT0);
+ return rt2x00_get_field32(reg, GPIOCSR_VAL0);
}
#ifdef CONFIG_RT2X00_LIB_LEDS
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/rt2x00/rt2500pci.h
index 2aad7ba..9c10068 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.h
+++ b/drivers/net/wireless/rt2x00/rt2500pci.h
@@ -789,16 +789,18 @@
/*
* GPIOCSR: GPIO control register.
+ * GPIOCSR_VALx: GPIO value
+ * GPIOCSR_DIRx: GPIO direction: 0 = output; 1 = input
*/
#define GPIOCSR 0x0120
-#define GPIOCSR_BIT0 FIELD32(0x00000001)
-#define GPIOCSR_BIT1 FIELD32(0x00000002)
-#define GPIOCSR_BIT2 FIELD32(0x00000004)
-#define GPIOCSR_BIT3 FIELD32(0x00000008)
-#define GPIOCSR_BIT4 FIELD32(0x00000010)
-#define GPIOCSR_BIT5 FIELD32(0x00000020)
-#define GPIOCSR_BIT6 FIELD32(0x00000040)
-#define GPIOCSR_BIT7 FIELD32(0x00000080)
+#define GPIOCSR_VAL0 FIELD32(0x00000001)
+#define GPIOCSR_VAL1 FIELD32(0x00000002)
+#define GPIOCSR_VAL2 FIELD32(0x00000004)
+#define GPIOCSR_VAL3 FIELD32(0x00000008)
+#define GPIOCSR_VAL4 FIELD32(0x00000010)
+#define GPIOCSR_VAL5 FIELD32(0x00000020)
+#define GPIOCSR_VAL6 FIELD32(0x00000040)
+#define GPIOCSR_VAL7 FIELD32(0x00000080)
#define GPIOCSR_DIR0 FIELD32(0x00000100)
#define GPIOCSR_DIR1 FIELD32(0x00000200)
#define GPIOCSR_DIR2 FIELD32(0x00000400)
--
1.7.11.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 04/14] rt2x00: Align rt2500pci GPIOCSR definition with datasheet.
2012-08-30 19:34 ` [PATCH 04/14] rt2x00: Align rt2500pci GPIOCSR definition with datasheet Gertjan van Wingerde
@ 2012-08-30 21:06 ` Jonathan Nieder
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Nieder @ 2012-08-30 21:06 UTC (permalink / raw)
To: Gertjan van Wingerde
Cc: linux-wireless, John W. Linville, users, Ivo van Doorn,
Helmut Schaa, stable
Gertjan van Wingerde wrote:
> Rename GPIOCSR_BIT<x> to GPIOCSR_VAL<x> to represent the actual
> meaning better.
>
> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Sounds good.
> Cc: <stable@vger.kernel.org>
Should not be needed.
Thanks,
Jonathan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 04/14] rt2x00: Align rt2500pci GPIOCSR definition with datasheet.
@ 2012-08-30 21:13 Gertjan van Wingerde
0 siblings, 0 replies; 3+ messages in thread
From: Gertjan van Wingerde @ 2012-08-30 21:13 UTC (permalink / raw)
To: Jonathan Nieder
Cc: linux-wireless, John W Linville, Ivo Van Doorn, Helmut Schaa,
users@rt2x00.serialmonkey.com
On 08/30/12 23:06, Jonathan Nieder wrote:
>> Rename GPIOCSR_BIT<x> to GPIOCSR_VAL<x> to represent the actual
>> meaning better.
>>
>> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
>
> Sounds good.
>
>> Cc: <stable@vger.kernel.org>
>
> Should not be needed.
>
This one is the same as the previous one you commented on. Technically
this patch is not needed in stable, but the next patch in the series is.
Unfortunately that patch depends on this one, so therefore this one is
targeted at stable as well.
---
Gertjan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-30 21:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-30 21:13 [PATCH 04/14] rt2x00: Align rt2500pci GPIOCSR definition with datasheet Gertjan van Wingerde
-- strict thread matches above, loose matches on Subject: below --
2012-08-30 19:33 [PATCH 00/14] rt2x00: Fixes and cleanups Gertjan van Wingerde
2012-08-30 19:34 ` [PATCH 01/14] rt2x00: Identify ASUS USB-N53 device Gertjan van Wingerde
2012-08-30 19:34 ` [PATCH 02/14] rt2x00: Align rt2400pci GPIOCSR definition with datasheet Gertjan van Wingerde
2012-08-30 19:34 ` [PATCH 03/14] rt2x00: Fix rt2400pci rfkill polling prior to interface start Gertjan van Wingerde
2012-08-30 19:34 ` [PATCH 04/14] rt2x00: Align rt2500pci GPIOCSR definition with datasheet Gertjan van Wingerde
2012-08-30 21:06 ` Jonathan Nieder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).