From: Gertjan van Wingerde <gwingerde@gmail.com>
To: <linux-wireless@vger.kernel.org>,
"John W. Linville" <linville@tuxdriver.com>
Cc: <users@rt2x00.serialmonkey.com>,
Ivo van Doorn <IvDoorn@gmail.com>,
Helmut Schaa <helmut.schaa@googlemail.com>,
Gertjan van Wingerde <gwingerde@gmail.com>
Subject: [PATCH v2 4/6] rt2x00: Align GPIO register definitions with the datasheets.
Date: Fri, 31 Aug 2012 19:22:12 +0200 [thread overview]
Message-ID: <1346433734-3337-5-git-send-email-gwingerde@gmail.com> (raw)
In-Reply-To: <1346433734-3337-4-git-send-email-gwingerde@gmail.com>
Ensure that all active GPIO pins are included in the GPIO register
definitions, nothing more and nothing less.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h
index 7564ae9..9d78a53 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.h
+++ b/drivers/net/wireless/rt2x00/rt2400pci.h
@@ -671,6 +671,13 @@
#define GPIOCSR_BIT6 FIELD32(0x00000040)
#define GPIOCSR_BIT7 FIELD32(0x00000080)
#define GPIOCSR_BIT8 FIELD32(0x00000100)
+#define GPIOCSR_BIT9 FIELD32(0x00000200)
+#define GPIOCSR_BIT10 FIELD32(0x00000400)
+#define GPIOCSR_BIT11 FIELD32(0x00000800)
+#define GPIOCSR_BIT12 FIELD32(0x00001000)
+#define GPIOCSR_BIT13 FIELD32(0x00002000)
+#define GPIOCSR_BIT14 FIELD32(0x00004000)
+#define GPIOCSR_BIT15 FIELD32(0x00008000)
/*
* BBPPCSR: BBP Pin control register.
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h
index 196bd51..9652300 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.h
+++ b/drivers/net/wireless/rt2x00/rt2500usb.h
@@ -198,6 +198,13 @@
#define MAC_CSR19_BIT6 FIELD16(0x0040)
#define MAC_CSR19_BIT7 FIELD16(0x0080)
#define MAC_CSR19_BIT8 FIELD16(0x0100)
+#define MAC_CSR19_BIT9 FIELD16(0x0200)
+#define MAC_CSR19_BIT10 FIELD16(0x0400)
+#define MAC_CSR19_BIT11 FIELD16(0x0800)
+#define MAC_CSR19_BIT12 FIELD16(0x1000)
+#define MAC_CSR19_BIT13 FIELD16(0x2000)
+#define MAC_CSR19_BIT14 FIELD16(0x4000)
+#define MAC_CSR19_BIT15 FIELD16(0x8000)
/*
* MAC_CSR20: LED control register.
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index e252e9b..a838e17 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -459,6 +459,12 @@
#define GPIO_CTRL_CFG_GPIOD_BIT5 FIELD32(0x00002000)
#define GPIO_CTRL_CFG_GPIOD_BIT6 FIELD32(0x00004000)
#define GPIO_CTRL_CFG_GPIOD_BIT7 FIELD32(0x00008000)
+#define GPIO_CTRL_CFG_BIT8 FIELD32(0x00010000)
+#define GPIO_CTRL_CFG_BIT9 FIELD32(0x00020000)
+#define GPIO_CTRL_CFG_BIT10 FIELD32(0x00040000)
+#define GPIO_CTRL_CFG_GPIOD_BIT8 FIELD32(0x01000000)
+#define GPIO_CTRL_CFG_GPIOD_BIT9 FIELD32(0x02000000)
+#define GPIO_CTRL_CFG_GPIOD_BIT10 FIELD32(0x04000000)
/*
* MCU_CMD_CFG
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h
index 8f3da5a..9ee0c33 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.h
+++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -365,8 +365,6 @@ struct hw_pairwise_ta_entry {
#define MAC_CSR13_BIT3 FIELD32(0x00000008)
#define MAC_CSR13_BIT4 FIELD32(0x00000010)
#define MAC_CSR13_BIT5 FIELD32(0x00000020)
-#define MAC_CSR13_BIT6 FIELD32(0x00000040)
-#define MAC_CSR13_BIT7 FIELD32(0x00000080)
#define MAC_CSR13_BIT8 FIELD32(0x00000100)
#define MAC_CSR13_BIT9 FIELD32(0x00000200)
#define MAC_CSR13_BIT10 FIELD32(0x00000400)
--
1.7.11.1
next prev parent reply other threads:[~2012-08-31 17:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-31 17:22 [PATCH v2 0/6] GPIO related fixes and clean ups Gertjan van Wingerde
2012-08-31 17:22 ` [PATCH v2 1/6] rt2x00: Identify ASUS USB-N53 device Gertjan van Wingerde
2012-08-31 17:22 ` [PATCH v2 2/6] rt2x00: Fix word size of rt2500usb MAC_CSR19 register Gertjan van Wingerde
2012-08-31 17:22 ` [PATCH v2 3/6] rt2x00: Fix rfkill polling prior to interface start Gertjan van Wingerde
2012-08-31 17:22 ` Gertjan van Wingerde [this message]
2012-08-31 17:22 ` [PATCH v2 5/6] rt2x00: Unify GPIO register field namings Gertjan van Wingerde
2012-08-31 17:22 ` [PATCH v2 6/6] rt2x00: rt2800 - Make probe_hw function common between PCI and USB Gertjan van Wingerde
2012-09-02 20:44 ` Ivo Van Doorn
2012-09-03 1:23 ` Gertjan van Wingerde
2012-09-02 20:40 ` [PATCH v2 5/6] rt2x00: Unify GPIO register field namings Ivo Van Doorn
2012-09-02 20:39 ` [PATCH v2 4/6] rt2x00: Align GPIO register definitions with the datasheets Ivo Van Doorn
2012-09-02 20:39 ` [PATCH v2 3/6] rt2x00: Fix rfkill polling prior to interface start Ivo Van Doorn
2012-09-02 20:37 ` [PATCH v2 2/6] rt2x00: Fix word size of rt2500usb MAC_CSR19 register Ivo Van Doorn
2012-09-02 20:37 ` [PATCH v2 1/6] rt2x00: Identify ASUS USB-N53 device Ivo Van Doorn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346433734-3337-5-git-send-email-gwingerde@gmail.com \
--to=gwingerde@gmail.com \
--cc=IvDoorn@gmail.com \
--cc=helmut.schaa@googlemail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=users@rt2x00.serialmonkey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).