Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts: drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/phy.c drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
author: John W. Linville <linville@tuxdriver.com> 2011-04-12 16:18:44 -0400
committer: John W. Linville <linville@tuxdriver.com> 2011-04-12 16:18:44 -0400
commit: 252f4bf400df1712408fe83ba199a66a1b57ab1d (patch)
tree: e07fa00abdd55b31e22567786c78635f32c6a66c /drivers/net/wireless/zd1211rw/zd_rf_al2230.c
parent: 6ba1037c3d871ab70e342631516dbf841c35b086 (diff)
parent: b37e3b6d64358604960b35e8ecbb7aed22e0926e (diff)
1 files changed, 100 insertions, 98 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
index 74a8f7a55591..12babcb633c3 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
@@ -61,31 +61,31 @@ static const u32 zd1211b_al2230_table[][3] = {
 };
 static const struct zd_ioreq16 zd1211b_ioreqs_shared_1[] = {
-        { CR240, 0x57 }, { CR9,   0xe0 },
+        { ZD_CR240, 0x57 }, { ZD_CR9,   0xe0 },
 };
 static const struct zd_ioreq16 ioreqs_init_al2230s[] = {
-        { CR47,   0x1e }, /* MARK_002 */
+        { ZD_CR47,   0x1e }, /* MARK_002 */
-        { CR106,  0x22 },
+        { ZD_CR106,  0x22 },
-        { CR107,  0x2a }, /* MARK_002 */
+        { ZD_CR107,  0x2a }, /* MARK_002 */
-        { CR109,  0x13 }, /* MARK_002 */
+        { ZD_CR109,  0x13 }, /* MARK_002 */
-        { CR118,  0xf8 }, /* MARK_002 */
+        { ZD_CR118,  0xf8 }, /* MARK_002 */
-        { CR119,  0x12 }, { CR122,  0xe0 },
+        { ZD_CR119,  0x12 }, { ZD_CR122,  0xe0 },
-        { CR128,  0x10 }, /* MARK_001 from 0xe->0x10 */
+        { ZD_CR128,  0x10 }, /* MARK_001 from 0xe->0x10 */
-        { CR129,  0x0e }, /* MARK_001 from 0xd->0x0e */
+        { ZD_CR129,  0x0e }, /* MARK_001 from 0xd->0x0e */
-        { CR130,  0x10 }, /* MARK_001 from 0xb->0x0d */
+        { ZD_CR130,  0x10 }, /* MARK_001 from 0xb->0x0d */
 };
 static int zd1211b_al2230_finalize_rf(struct zd_chip *chip)
 {
        int r;
        static const struct zd_ioreq16 ioreqs[] = {
-                { CR80,  0x30 }, { CR81,  0x30 }, { CR79,  0x58 },
+                { ZD_CR80,  0x30 }, { ZD_CR81,  0x30 }, { ZD_CR79,  0x58 },
-                { CR12,  0xf0 }, { CR77,  0x1b }, { CR78,  0x58 },
+                { ZD_CR12,  0xf0 }, { ZD_CR77,  0x1b }, { ZD_CR78,  0x58 },
-                { CR203, 0x06 },
+                { ZD_CR203, 0x06 },
                { },
-                { CR240, 0x80 },
+                { ZD_CR240, 0x80 },
        };
        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -94,12 +94,12 @@ static int zd1211b_al2230_finalize_rf(struct zd_chip *chip)
        /* related to antenna selection? */
        if (chip->new_phy_layout) {
-                r = zd_iowrite16_locked(chip, 0xe1, CR9);
+                r = zd_iowrite16_locked(chip, 0xe1, ZD_CR9);
                if (r)
                        return r;
        }
-        return zd_iowrite16_locked(chip, 0x06, CR203);
+        return zd_iowrite16_locked(chip, 0x06, ZD_CR203);
 }
 static int zd1211_al2230_init_hw(struct zd_rf *rf)
@@ -108,40 +108,40 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
        struct zd_chip *chip = zd_rf_to_chip(rf);
        static const struct zd_ioreq16 ioreqs_init[] = {
-                { CR15,   0x20 }, { CR23,   0x40 }, { CR24,  0x20 },
+                { ZD_CR15,   0x20 }, { ZD_CR23,   0x40 }, { ZD_CR24,  0x20 },
-                { CR26,   0x11 }, { CR28,   0x3e }, { CR29,  0x00 },
+                { ZD_CR26,   0x11 }, { ZD_CR28,   0x3e }, { ZD_CR29,  0x00 },
-                { CR44,   0x33 }, { CR106,  0x2a }, { CR107, 0x1a },
+                { ZD_CR44,   0x33 }, { ZD_CR106,  0x2a }, { ZD_CR107, 0x1a },
-                { CR109,  0x09 }, { CR110,  0x27 }, { CR111, 0x2b },
+                { ZD_CR109,  0x09 }, { ZD_CR110,  0x27 }, { ZD_CR111, 0x2b },
-                { CR112,  0x2b }, { CR119,  0x0a }, { CR10,  0x89 },
+                { ZD_CR112,  0x2b }, { ZD_CR119,  0x0a }, { ZD_CR10,  0x89 },
                /* for newest (3rd cut) AL2300 */
-                { CR17,   0x28 },
+                { ZD_CR17,   0x28 },
-                { CR26,   0x93 }, { CR34,   0x30 },
+                { ZD_CR26,   0x93 }, { ZD_CR34,   0x30 },
                /* for newest (3rd cut) AL2300 */
-                { CR35,   0x3e },
+                { ZD_CR35,   0x3e },
-                { CR41,   0x24 }, { CR44,   0x32 },
+                { ZD_CR41,   0x24 }, { ZD_CR44,   0x32 },
                /* for newest (3rd cut) AL2300 */
-                { CR46,   0x96 },
+                { ZD_CR46,   0x96 },
-                { CR47,   0x1e }, { CR79,   0x58 }, { CR80,  0x30 },
+                { ZD_CR47,   0x1e }, { ZD_CR79,   0x58 }, { ZD_CR80,  0x30 },
-                { CR81,   0x30 }, { CR87,   0x0a }, { CR89,  0x04 },
+                { ZD_CR81,   0x30 }, { ZD_CR87,   0x0a }, { ZD_CR89,  0x04 },
-                { CR92,   0x0a }, { CR99,   0x28 }, { CR100, 0x00 },
+                { ZD_CR92,   0x0a }, { ZD_CR99,   0x28 }, { ZD_CR100, 0x00 },
-                { CR101,  0x13 }, { CR102,  0x27 }, { CR106, 0x24 },
+                { ZD_CR101,  0x13 }, { ZD_CR102,  0x27 }, { ZD_CR106, 0x24 },
-                { CR107,  0x2a }, { CR109,  0x09 }, { CR110, 0x13 },
+                { ZD_CR107,  0x2a }, { ZD_CR109,  0x09 }, { ZD_CR110, 0x13 },
-                { CR111,  0x1f }, { CR112,  0x1f }, { CR113, 0x27 },
+                { ZD_CR111,  0x1f }, { ZD_CR112,  0x1f }, { ZD_CR113, 0x27 },
-                { CR114,  0x27 },
+                { ZD_CR114,  0x27 },
                /* for newest (3rd cut) AL2300 */
-                { CR115,  0x24 },
+                { ZD_CR115,  0x24 },
-                { CR116,  0x24 }, { CR117,  0xf4 }, { CR118, 0xfc },
+                { ZD_CR116,  0x24 }, { ZD_CR117,  0xf4 }, { ZD_CR118, 0xfc },
-                { CR119,  0x10 }, { CR120,  0x4f }, { CR121, 0x77 },
+                { ZD_CR119,  0x10 }, { ZD_CR120,  0x4f }, { ZD_CR121, 0x77 },
-                { CR122,  0xe0 }, { CR137,  0x88 }, { CR252, 0xff },
+                { ZD_CR122,  0xe0 }, { ZD_CR137,  0x88 }, { ZD_CR252, 0xff },
-                { CR253,  0xff },
+                { ZD_CR253,  0xff },
        };
        static const struct zd_ioreq16 ioreqs_pll[] = {
                /* shdnb(PLL_ON)=0 */
-                { CR251,  0x2f },
+                { ZD_CR251,  0x2f },
                /* shdnb(PLL_ON)=1 */
-                { CR251,  0x3f },
+                { ZD_CR251,  0x3f },
-                { CR138,  0x28 }, { CR203,  0x06 },
+                { ZD_CR138,  0x28 }, { ZD_CR203,  0x06 },
        };
        static const u32 rv1[] = {
@@ -161,7 +161,7 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
                0x0805b6,
                0x011687,
                0x000688,
-                0x0403b9, /* external control TX power (CR31) */
+                0x0403b9, /* external control TX power (ZD_CR31) */
                0x00dbba,
                0x00099b,
                0x0bdffc,
@@ -221,52 +221,54 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
        struct zd_chip *chip = zd_rf_to_chip(rf);
        static const struct zd_ioreq16 ioreqs1[] = {
-                { CR10,  0x89 }, { CR15,  0x20 },
+                { ZD_CR10,  0x89 }, { ZD_CR15,  0x20 },
-                { CR17,  0x2B }, /* for newest(3rd cut) AL2230 */
+                { ZD_CR17,  0x2B }, /* for newest(3rd cut) AL2230 */
-                { CR23,  0x40 }, { CR24,  0x20 }, { CR26,  0x93 },
+                { ZD_CR23,  0x40 }, { ZD_CR24,  0x20 }, { ZD_CR26,  0x93 },
-                { CR28,  0x3e }, { CR29,  0x00 },
+                { ZD_CR28,  0x3e }, { ZD_CR29,  0x00 },
-                { CR33,  0x28 }, /* 5621 */
+                { ZD_CR33,  0x28 }, /* 5621 */
-                { CR34,  0x30 },
+                { ZD_CR34,  0x30 },
-                { CR35,  0x3e }, /* for newest(3rd cut) AL2230 */
+                { ZD_CR35,  0x3e }, /* for newest(3rd cut) AL2230 */
-                { CR41,  0x24 }, { CR44,  0x32 },
+                { ZD_CR41,  0x24 }, { ZD_CR44,  0x32 },
-                { CR46,  0x99 }, /* for newest(3rd cut) AL2230 */
+                { ZD_CR46,  0x99 }, /* for newest(3rd cut) AL2230 */
-                { CR47,  0x1e },
+                { ZD_CR47,  0x1e },
                /* ZD1211B 05.06.10 */
-                { CR48,  0x06 }, { CR49,  0xf9 }, { CR51,  0x01 },
+                { ZD_CR48,  0x06 }, { ZD_CR49,  0xf9 }, { ZD_CR51,  0x01 },
-                { CR52,  0x80 }, { CR53,  0x7e }, { CR65,  0x00 },
+                { ZD_CR52,  0x80 }, { ZD_CR53,  0x7e }, { ZD_CR65,  0x00 },
-                { CR66,  0x00 }, { CR67,  0x00 }, { CR68,  0x00 },
+                { ZD_CR66,  0x00 }, { ZD_CR67,  0x00 }, { ZD_CR68,  0x00 },
-                { CR69,  0x28 },
+                { ZD_CR69,  0x28 },
-                { CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },
+                { ZD_CR79,  0x58 }, { ZD_CR80,  0x30 }, { ZD_CR81,  0x30 },
-                { CR87,  0x0a }, { CR89,  0x04 },
+                { ZD_CR87,  0x0a }, { ZD_CR89,  0x04 },
-                { CR91,  0x00 }, /* 5621 */
+                { ZD_CR91,  0x00 }, /* 5621 */
-                { CR92,  0x0a },
+                { ZD_CR92,  0x0a },
-                { CR98,  0x8d }, /* 4804,  for 1212 new algorithm */
+                { ZD_CR98,  0x8d }, /* 4804,  for 1212 new algorithm */
-                { CR99,  0x00 }, /* 5621 */
+                { ZD_CR99,  0x00 }, /* 5621 */
-                { CR101, 0x13 }, { CR102, 0x27 },
+                { ZD_CR101, 0x13 }, { ZD_CR102, 0x27 },
-                { CR106, 0x24 }, /* for newest(3rd cut) AL2230 */
+                { ZD_CR106, 0x24 }, /* for newest(3rd cut) AL2230 */
-                { CR107, 0x2a },
+                { ZD_CR107, 0x2a },
-                { CR109, 0x13 }, /* 4804, for 1212 new algorithm */
+                { ZD_CR109, 0x13 }, /* 4804, for 1212 new algorithm */
-                { CR110, 0x1f }, /* 4804, for 1212 new algorithm */
+                { ZD_CR110, 0x1f }, /* 4804, for 1212 new algorithm */
-                { CR111, 0x1f }, { CR112, 0x1f }, { CR113, 0x27 },
+                { ZD_CR111, 0x1f }, { ZD_CR112, 0x1f }, { ZD_CR113, 0x27 },
-                { CR114, 0x27 },
+                { ZD_CR114, 0x27 },
-                { CR115, 0x26 }, /* 24->26 at 4902 for newest(3rd cut) AL2230 */
+                { ZD_CR115, 0x26 }, /* 24->26 at 4902 for newest(3rd cut)
-                { CR116, 0x24 },
+                                     * AL2230
-                { CR117, 0xfa }, /* for 1211b */
+                                     */
-                { CR118, 0xfa }, /* for 1211b */
+                { ZD_CR116, 0x24 },
-                { CR119, 0x10 },
+                { ZD_CR117, 0xfa }, /* for 1211b */
-                { CR120, 0x4f },
+                { ZD_CR118, 0xfa }, /* for 1211b */
-                { CR121, 0x6c }, /* for 1211b */
+                { ZD_CR119, 0x10 },
-                { CR122, 0xfc }, /* E0->FC at 4902 */
+                { ZD_CR120, 0x4f },
-                { CR123, 0x57 }, /* 5623 */
+                { ZD_CR121, 0x6c }, /* for 1211b */
-                { CR125, 0xad }, /* 4804, for 1212 new algorithm */
+                { ZD_CR122, 0xfc }, /* E0->FC at 4902 */
-                { CR126, 0x6c }, /* 5614 */
+                { ZD_CR123, 0x57 }, /* 5623 */
-                { CR127, 0x03 }, /* 4804, for 1212 new algorithm */
+                { ZD_CR125, 0xad }, /* 4804, for 1212 new algorithm */
-                { CR137, 0x50 }, /* 5614 */
+                { ZD_CR126, 0x6c }, /* 5614 */
-                { CR138, 0xa8 },
+                { ZD_CR127, 0x03 }, /* 4804, for 1212 new algorithm */
-                { CR144, 0xac }, /* 5621 */
+                { ZD_CR137, 0x50 }, /* 5614 */
-                { CR150, 0x0d }, { CR252, 0x34 }, { CR253, 0x34 },
+                { ZD_CR138, 0xa8 },
+                { ZD_CR144, 0xac }, /* 5621 */
+                { ZD_CR150, 0x0d }, { ZD_CR252, 0x34 }, { ZD_CR253, 0x34 },
        };
        static const u32 rv1[] = {
@@ -284,7 +286,7 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
                0x6da010, /* Reg6 update for MP versio */
                0xe36280, /* Modified by jxiao for Bor-Chin on 2004/08/02 */
                0x116000,
-                0x9dc020, /* External control TX power (CR31) */
+                0x9dc020, /* External control TX power (ZD_CR31) */
                0x5ddb00, /* RegA update for MP version */
                0xd99000, /* RegB update for MP version */
                0x3ffbd0, /* RegC update for MP version */
@@ -295,8 +297,8 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
        };
        static const struct zd_ioreq16 ioreqs2[] = {
-                { CR251, 0x2f }, /* shdnb(PLL_ON)=0 */
+                { ZD_CR251, 0x2f }, /* shdnb(PLL_ON)=0 */
-                { CR251, 0x7f }, /* shdnb(PLL_ON)=1 */
+                { ZD_CR251, 0x7f }, /* shdnb(PLL_ON)=1 */
        };
        static const u32 rv3[] = {
@@ -308,7 +310,7 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
        static const struct zd_ioreq16 ioreqs3[] = {
                /* related to 6M band edge patching, happens unconditionally */
-                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
+                { ZD_CR128, 0x14 }, { ZD_CR129, 0x12 }, { ZD_CR130, 0x10 },
        };
        r = zd_iowrite16a_locked(chip, zd1211b_ioreqs_shared_1,
@@ -361,8 +363,8 @@ static int zd1211_al2230_set_channel(struct zd_rf *rf, u8 channel)
        const u32 *rv = zd1211_al2230_table[channel-1];
        struct zd_chip *chip = zd_rf_to_chip(rf);
        static const struct zd_ioreq16 ioreqs[] = {
-                { CR138, 0x28 },
+                { ZD_CR138, 0x28 },
-                { CR203, 0x06 },
+                { ZD_CR203, 0x06 },
        };
        r = zd_rfwritev_locked(chip, rv, 3, RF_RV_BITS);
@@ -393,8 +395,8 @@ static int zd1211_al2230_switch_radio_on(struct zd_rf *rf)
 {
        struct zd_chip *chip = zd_rf_to_chip(rf);
        static const struct zd_ioreq16 ioreqs[] = {
-                { CR11,  0x00 },
+                { ZD_CR11,  0x00 },
-                { CR251, 0x3f },
+                { ZD_CR251, 0x3f },
        };
        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -404,8 +406,8 @@ static int zd1211b_al2230_switch_radio_on(struct zd_rf *rf)
 {
        struct zd_chip *chip = zd_rf_to_chip(rf);
        static const struct zd_ioreq16 ioreqs[] = {
-                { CR11,  0x00 },
+                { ZD_CR11,  0x00 },
-                { CR251, 0x7f },
+                { ZD_CR251, 0x7f },
        };
        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -415,8 +417,8 @@ static int al2230_switch_radio_off(struct zd_rf *rf)
 {
        struct zd_chip *chip = zd_rf_to_chip(rf);
        static const struct zd_ioreq16 ioreqs[] = {
-                { CR11,  0x04 },
+                { ZD_CR11,  0x04 },
-                { CR251, 0x2f },
+                { ZD_CR251, 0x2f },
        };
        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
author	John W. Linville <linville@tuxdriver.com>	2011-04-12 16:18:44 -0400
committer	John W. Linville <linville@tuxdriver.com>	2011-04-12 16:18:44 -0400
commit	252f4bf400df1712408fe83ba199a66a1b57ab1d (patch)
tree	e07fa00abdd55b31e22567786c78635f32c6a66c /drivers/net/wireless/zd1211rw/zd_rf_al2230.c
parent	6ba1037c3d871ab70e342631516dbf841c35b086 (diff)
parent	b37e3b6d64358604960b35e8ecbb7aed22e0926e (diff)

diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c index 74a8f7a55591..12babcb633c3 100644 --- a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c +++ b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
@@ -61,31 +61,31 @@ static const u32 zd1211b_al2230_table[][3] = {
61	};	61	};
62		62
63	static const struct zd_ioreq16 zd1211b_ioreqs_shared_1[] = {	63	static const struct zd_ioreq16 zd1211b_ioreqs_shared_1[] = {
64	{ CR240, 0x57 }, { CR9, 0xe0 },	64	{ ZD_CR240, 0x57 }, { ZD_CR9, 0xe0 },
65	};	65	};
66		66
67	static const struct zd_ioreq16 ioreqs_init_al2230s[] = {	67	static const struct zd_ioreq16 ioreqs_init_al2230s[] = {
68	{ CR47, 0x1e }, /* MARK_002 */	68	{ ZD_CR47, 0x1e }, /* MARK_002 */
69	{ CR106, 0x22 },	69	{ ZD_CR106, 0x22 },
70	{ CR107, 0x2a }, /* MARK_002 */	70	{ ZD_CR107, 0x2a }, /* MARK_002 */
71	{ CR109, 0x13 }, /* MARK_002 */	71	{ ZD_CR109, 0x13 }, /* MARK_002 */
72	{ CR118, 0xf8 }, /* MARK_002 */	72	{ ZD_CR118, 0xf8 }, /* MARK_002 */
73	{ CR119, 0x12 }, { CR122, 0xe0 },	73	{ ZD_CR119, 0x12 }, { ZD_CR122, 0xe0 },
74	{ CR128, 0x10 }, /* MARK_001 from 0xe->0x10 */	74	{ ZD_CR128, 0x10 }, /* MARK_001 from 0xe->0x10 */
75	{ CR129, 0x0e }, /* MARK_001 from 0xd->0x0e */	75	{ ZD_CR129, 0x0e }, /* MARK_001 from 0xd->0x0e */
76	{ CR130, 0x10 }, /* MARK_001 from 0xb->0x0d */	76	{ ZD_CR130, 0x10 }, /* MARK_001 from 0xb->0x0d */
77	};	77	};
78		78
79	static int zd1211b_al2230_finalize_rf(struct zd_chip *chip)	79	static int zd1211b_al2230_finalize_rf(struct zd_chip *chip)
80	{	80	{
81	int r;	81	int r;
82	static const struct zd_ioreq16 ioreqs[] = {	82	static const struct zd_ioreq16 ioreqs[] = {
83	{ CR80, 0x30 }, { CR81, 0x30 }, { CR79, 0x58 },	83	{ ZD_CR80, 0x30 }, { ZD_CR81, 0x30 }, { ZD_CR79, 0x58 },
84	{ CR12, 0xf0 }, { CR77, 0x1b }, { CR78, 0x58 },	84	{ ZD_CR12, 0xf0 }, { ZD_CR77, 0x1b }, { ZD_CR78, 0x58 },
85	{ CR203, 0x06 },	85	{ ZD_CR203, 0x06 },
86	{ },	86	{ },
87		87
88	{ CR240, 0x80 },	88	{ ZD_CR240, 0x80 },
89	};	89	};
90		90
91	r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));	91	r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -94,12 +94,12 @@ static int zd1211b_al2230_finalize_rf(struct zd_chip *chip)
94		94
95	/* related to antenna selection? */	95	/* related to antenna selection? */
96	if (chip->new_phy_layout) {	96	if (chip->new_phy_layout) {
97	r = zd_iowrite16_locked(chip, 0xe1, CR9);	97	r = zd_iowrite16_locked(chip, 0xe1, ZD_CR9);
98	if (r)	98	if (r)
99	return r;	99	return r;
100	}	100	}
101		101
102	return zd_iowrite16_locked(chip, 0x06, CR203);	102	return zd_iowrite16_locked(chip, 0x06, ZD_CR203);
103	}	103	}
104		104
105	static int zd1211_al2230_init_hw(struct zd_rf *rf)	105	static int zd1211_al2230_init_hw(struct zd_rf *rf)
@@ -108,40 +108,40 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
108	struct zd_chip *chip = zd_rf_to_chip(rf);	108	struct zd_chip *chip = zd_rf_to_chip(rf);
109		109
110	static const struct zd_ioreq16 ioreqs_init[] = {	110	static const struct zd_ioreq16 ioreqs_init[] = {
111	{ CR15, 0x20 }, { CR23, 0x40 }, { CR24, 0x20 },	111	{ ZD_CR15, 0x20 }, { ZD_CR23, 0x40 }, { ZD_CR24, 0x20 },
112	{ CR26, 0x11 }, { CR28, 0x3e }, { CR29, 0x00 },	112	{ ZD_CR26, 0x11 }, { ZD_CR28, 0x3e }, { ZD_CR29, 0x00 },
113	{ CR44, 0x33 }, { CR106, 0x2a }, { CR107, 0x1a },	113	{ ZD_CR44, 0x33 }, { ZD_CR106, 0x2a }, { ZD_CR107, 0x1a },
114	{ CR109, 0x09 }, { CR110, 0x27 }, { CR111, 0x2b },	114	{ ZD_CR109, 0x09 }, { ZD_CR110, 0x27 }, { ZD_CR111, 0x2b },
115	{ CR112, 0x2b }, { CR119, 0x0a }, { CR10, 0x89 },	115	{ ZD_CR112, 0x2b }, { ZD_CR119, 0x0a }, { ZD_CR10, 0x89 },
116	/* for newest (3rd cut) AL2300 */	116	/* for newest (3rd cut) AL2300 */
117	{ CR17, 0x28 },	117	{ ZD_CR17, 0x28 },
118	{ CR26, 0x93 }, { CR34, 0x30 },	118	{ ZD_CR26, 0x93 }, { ZD_CR34, 0x30 },
119	/* for newest (3rd cut) AL2300 */	119	/* for newest (3rd cut) AL2300 */
120	{ CR35, 0x3e },	120	{ ZD_CR35, 0x3e },
121	{ CR41, 0x24 }, { CR44, 0x32 },	121	{ ZD_CR41, 0x24 }, { ZD_CR44, 0x32 },
122	/* for newest (3rd cut) AL2300 */	122	/* for newest (3rd cut) AL2300 */
123	{ CR46, 0x96 },	123	{ ZD_CR46, 0x96 },
124	{ CR47, 0x1e }, { CR79, 0x58 }, { CR80, 0x30 },	124	{ ZD_CR47, 0x1e }, { ZD_CR79, 0x58 }, { ZD_CR80, 0x30 },
125	{ CR81, 0x30 }, { CR87, 0x0a }, { CR89, 0x04 },	125	{ ZD_CR81, 0x30 }, { ZD_CR87, 0x0a }, { ZD_CR89, 0x04 },
126	{ CR92, 0x0a }, { CR99, 0x28 }, { CR100, 0x00 },	126	{ ZD_CR92, 0x0a }, { ZD_CR99, 0x28 }, { ZD_CR100, 0x00 },
127	{ CR101, 0x13 }, { CR102, 0x27 }, { CR106, 0x24 },	127	{ ZD_CR101, 0x13 }, { ZD_CR102, 0x27 }, { ZD_CR106, 0x24 },
128	{ CR107, 0x2a }, { CR109, 0x09 }, { CR110, 0x13 },	128	{ ZD_CR107, 0x2a }, { ZD_CR109, 0x09 }, { ZD_CR110, 0x13 },
129	{ CR111, 0x1f }, { CR112, 0x1f }, { CR113, 0x27 },	129	{ ZD_CR111, 0x1f }, { ZD_CR112, 0x1f }, { ZD_CR113, 0x27 },
130	{ CR114, 0x27 },	130	{ ZD_CR114, 0x27 },
131	/* for newest (3rd cut) AL2300 */	131	/* for newest (3rd cut) AL2300 */
132	{ CR115, 0x24 },	132	{ ZD_CR115, 0x24 },
133	{ CR116, 0x24 }, { CR117, 0xf4 }, { CR118, 0xfc },	133	{ ZD_CR116, 0x24 }, { ZD_CR117, 0xf4 }, { ZD_CR118, 0xfc },
134	{ CR119, 0x10 }, { CR120, 0x4f }, { CR121, 0x77 },	134	{ ZD_CR119, 0x10 }, { ZD_CR120, 0x4f }, { ZD_CR121, 0x77 },
135	{ CR122, 0xe0 }, { CR137, 0x88 }, { CR252, 0xff },	135	{ ZD_CR122, 0xe0 }, { ZD_CR137, 0x88 }, { ZD_CR252, 0xff },
136	{ CR253, 0xff },	136	{ ZD_CR253, 0xff },
137	};	137	};
138		138
139	static const struct zd_ioreq16 ioreqs_pll[] = {	139	static const struct zd_ioreq16 ioreqs_pll[] = {
140	/* shdnb(PLL_ON)=0 */	140	/* shdnb(PLL_ON)=0 */
141	{ CR251, 0x2f },	141	{ ZD_CR251, 0x2f },
142	/* shdnb(PLL_ON)=1 */	142	/* shdnb(PLL_ON)=1 */
143	{ CR251, 0x3f },	143	{ ZD_CR251, 0x3f },
144	{ CR138, 0x28 }, { CR203, 0x06 },	144	{ ZD_CR138, 0x28 }, { ZD_CR203, 0x06 },
145	};	145	};
146		146
147	static const u32 rv1[] = {	147	static const u32 rv1[] = {
@@ -161,7 +161,7 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
161	0x0805b6,	161	0x0805b6,
162	0x011687,	162	0x011687,
163	0x000688,	163	0x000688,
164	0x0403b9, /* external control TX power (CR31) */	164	0x0403b9, /* external control TX power (ZD_CR31) */
165	0x00dbba,	165	0x00dbba,
166	0x00099b,	166	0x00099b,
167	0x0bdffc,	167	0x0bdffc,
@@ -221,52 +221,54 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
221	struct zd_chip *chip = zd_rf_to_chip(rf);	221	struct zd_chip *chip = zd_rf_to_chip(rf);
222		222
223	static const struct zd_ioreq16 ioreqs1[] = {	223	static const struct zd_ioreq16 ioreqs1[] = {
224	{ CR10, 0x89 }, { CR15, 0x20 },	224	{ ZD_CR10, 0x89 }, { ZD_CR15, 0x20 },
225	{ CR17, 0x2B }, /* for newest(3rd cut) AL2230 */	225	{ ZD_CR17, 0x2B }, /* for newest(3rd cut) AL2230 */
226	{ CR23, 0x40 }, { CR24, 0x20 }, { CR26, 0x93 },	226	{ ZD_CR23, 0x40 }, { ZD_CR24, 0x20 }, { ZD_CR26, 0x93 },
227	{ CR28, 0x3e }, { CR29, 0x00 },	227	{ ZD_CR28, 0x3e }, { ZD_CR29, 0x00 },
228	{ CR33, 0x28 }, /* 5621 */	228	{ ZD_CR33, 0x28 }, /* 5621 */
229	{ CR34, 0x30 },	229	{ ZD_CR34, 0x30 },
230	{ CR35, 0x3e }, /* for newest(3rd cut) AL2230 */	230	{ ZD_CR35, 0x3e }, /* for newest(3rd cut) AL2230 */
231	{ CR41, 0x24 }, { CR44, 0x32 },	231	{ ZD_CR41, 0x24 }, { ZD_CR44, 0x32 },
232	{ CR46, 0x99 }, /* for newest(3rd cut) AL2230 */	232	{ ZD_CR46, 0x99 }, /* for newest(3rd cut) AL2230 */
233	{ CR47, 0x1e },	233	{ ZD_CR47, 0x1e },
234		234
235	/* ZD1211B 05.06.10 */	235	/* ZD1211B 05.06.10 */
236	{ CR48, 0x06 }, { CR49, 0xf9 }, { CR51, 0x01 },	236	{ ZD_CR48, 0x06 }, { ZD_CR49, 0xf9 }, { ZD_CR51, 0x01 },
237	{ CR52, 0x80 }, { CR53, 0x7e }, { CR65, 0x00 },	237	{ ZD_CR52, 0x80 }, { ZD_CR53, 0x7e }, { ZD_CR65, 0x00 },
238	{ CR66, 0x00 }, { CR67, 0x00 }, { CR68, 0x00 },	238	{ ZD_CR66, 0x00 }, { ZD_CR67, 0x00 }, { ZD_CR68, 0x00 },
239	{ CR69, 0x28 },	239	{ ZD_CR69, 0x28 },
240		240
241	{ CR79, 0x58 }, { CR80, 0x30 }, { CR81, 0x30 },	241	{ ZD_CR79, 0x58 }, { ZD_CR80, 0x30 }, { ZD_CR81, 0x30 },
242	{ CR87, 0x0a }, { CR89, 0x04 },	242	{ ZD_CR87, 0x0a }, { ZD_CR89, 0x04 },
243	{ CR91, 0x00 }, /* 5621 */	243	{ ZD_CR91, 0x00 }, /* 5621 */
244	{ CR92, 0x0a },	244	{ ZD_CR92, 0x0a },
245	{ CR98, 0x8d }, /* 4804, for 1212 new algorithm */	245	{ ZD_CR98, 0x8d }, /* 4804, for 1212 new algorithm */
246	{ CR99, 0x00 }, /* 5621 */	246	{ ZD_CR99, 0x00 }, /* 5621 */
247	{ CR101, 0x13 }, { CR102, 0x27 },	247	{ ZD_CR101, 0x13 }, { ZD_CR102, 0x27 },
248	{ CR106, 0x24 }, /* for newest(3rd cut) AL2230 */	248	{ ZD_CR106, 0x24 }, /* for newest(3rd cut) AL2230 */
249	{ CR107, 0x2a },	249	{ ZD_CR107, 0x2a },
250	{ CR109, 0x13 }, /* 4804, for 1212 new algorithm */	250	{ ZD_CR109, 0x13 }, /* 4804, for 1212 new algorithm */
251	{ CR110, 0x1f }, /* 4804, for 1212 new algorithm */	251	{ ZD_CR110, 0x1f }, /* 4804, for 1212 new algorithm */
252	{ CR111, 0x1f }, { CR112, 0x1f }, { CR113, 0x27 },	252	{ ZD_CR111, 0x1f }, { ZD_CR112, 0x1f }, { ZD_CR113, 0x27 },
253	{ CR114, 0x27 },	253	{ ZD_CR114, 0x27 },
254	{ CR115, 0x26 }, /* 24->26 at 4902 for newest(3rd cut) AL2230 */	254	{ ZD_CR115, 0x26 }, /* 24->26 at 4902 for newest(3rd cut)
255	{ CR116, 0x24 },	255	* AL2230
256	{ CR117, 0xfa }, /* for 1211b */	256	*/
257	{ CR118, 0xfa }, /* for 1211b */	257	{ ZD_CR116, 0x24 },
258	{ CR119, 0x10 },	258	{ ZD_CR117, 0xfa }, /* for 1211b */
259	{ CR120, 0x4f },	259	{ ZD_CR118, 0xfa }, /* for 1211b */
260	{ CR121, 0x6c }, /* for 1211b */	260	{ ZD_CR119, 0x10 },
261	{ CR122, 0xfc }, /* E0->FC at 4902 */	261	{ ZD_CR120, 0x4f },
262	{ CR123, 0x57 }, /* 5623 */	262	{ ZD_CR121, 0x6c }, /* for 1211b */
263	{ CR125, 0xad }, /* 4804, for 1212 new algorithm */	263	{ ZD_CR122, 0xfc }, /* E0->FC at 4902 */
264	{ CR126, 0x6c }, /* 5614 */	264	{ ZD_CR123, 0x57 }, /* 5623 */
265	{ CR127, 0x03 }, /* 4804, for 1212 new algorithm */	265	{ ZD_CR125, 0xad }, /* 4804, for 1212 new algorithm */
266	{ CR137, 0x50 }, /* 5614 */	266	{ ZD_CR126, 0x6c }, /* 5614 */
267	{ CR138, 0xa8 },	267	{ ZD_CR127, 0x03 }, /* 4804, for 1212 new algorithm */
268	{ CR144, 0xac }, /* 5621 */	268	{ ZD_CR137, 0x50 }, /* 5614 */
269	{ CR150, 0x0d }, { CR252, 0x34 }, { CR253, 0x34 },	269	{ ZD_CR138, 0xa8 },
		270	{ ZD_CR144, 0xac }, /* 5621 */
		271	{ ZD_CR150, 0x0d }, { ZD_CR252, 0x34 }, { ZD_CR253, 0x34 },
270	};	272	};
271		273
272	static const u32 rv1[] = {	274	static const u32 rv1[] = {
@@ -284,7 +286,7 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
284	0x6da010, /* Reg6 update for MP versio */	286	0x6da010, /* Reg6 update for MP versio */
285	0xe36280, /* Modified by jxiao for Bor-Chin on 2004/08/02 */	287	0xe36280, /* Modified by jxiao for Bor-Chin on 2004/08/02 */
286	0x116000,	288	0x116000,
287	0x9dc020, /* External control TX power (CR31) */	289	0x9dc020, /* External control TX power (ZD_CR31) */
288	0x5ddb00, /* RegA update for MP version */	290	0x5ddb00, /* RegA update for MP version */
289	0xd99000, /* RegB update for MP version */	291	0xd99000, /* RegB update for MP version */
290	0x3ffbd0, /* RegC update for MP version */	292	0x3ffbd0, /* RegC update for MP version */
@@ -295,8 +297,8 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
295	};	297	};
296		298
297	static const struct zd_ioreq16 ioreqs2[] = {	299	static const struct zd_ioreq16 ioreqs2[] = {
298	{ CR251, 0x2f }, /* shdnb(PLL_ON)=0 */	300	{ ZD_CR251, 0x2f }, /* shdnb(PLL_ON)=0 */
299	{ CR251, 0x7f }, /* shdnb(PLL_ON)=1 */	301	{ ZD_CR251, 0x7f }, /* shdnb(PLL_ON)=1 */
300	};	302	};
301		303
302	static const u32 rv3[] = {	304	static const u32 rv3[] = {
@@ -308,7 +310,7 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
308		310
309	static const struct zd_ioreq16 ioreqs3[] = {	311	static const struct zd_ioreq16 ioreqs3[] = {
310	/* related to 6M band edge patching, happens unconditionally */	312	/* related to 6M band edge patching, happens unconditionally */
311	{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },	313	{ ZD_CR128, 0x14 }, { ZD_CR129, 0x12 }, { ZD_CR130, 0x10 },
312	};	314	};
313		315
314	r = zd_iowrite16a_locked(chip, zd1211b_ioreqs_shared_1,	316	r = zd_iowrite16a_locked(chip, zd1211b_ioreqs_shared_1,
@@ -361,8 +363,8 @@ static int zd1211_al2230_set_channel(struct zd_rf *rf, u8 channel)
361	const u32 *rv = zd1211_al2230_table[channel-1];	363	const u32 *rv = zd1211_al2230_table[channel-1];
362	struct zd_chip *chip = zd_rf_to_chip(rf);	364	struct zd_chip *chip = zd_rf_to_chip(rf);
363	static const struct zd_ioreq16 ioreqs[] = {	365	static const struct zd_ioreq16 ioreqs[] = {
364	{ CR138, 0x28 },	366	{ ZD_CR138, 0x28 },
365	{ CR203, 0x06 },	367	{ ZD_CR203, 0x06 },
366	};	368	};
367		369
368	r = zd_rfwritev_locked(chip, rv, 3, RF_RV_BITS);	370	r = zd_rfwritev_locked(chip, rv, 3, RF_RV_BITS);
@@ -393,8 +395,8 @@ static int zd1211_al2230_switch_radio_on(struct zd_rf *rf)
393	{	395	{
394	struct zd_chip *chip = zd_rf_to_chip(rf);	396	struct zd_chip *chip = zd_rf_to_chip(rf);
395	static const struct zd_ioreq16 ioreqs[] = {	397	static const struct zd_ioreq16 ioreqs[] = {
396	{ CR11, 0x00 },	398	{ ZD_CR11, 0x00 },
397	{ CR251, 0x3f },	399	{ ZD_CR251, 0x3f },
398	};	400	};
399		401
400	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));	402	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -404,8 +406,8 @@ static int zd1211b_al2230_switch_radio_on(struct zd_rf *rf)
404	{	406	{
405	struct zd_chip *chip = zd_rf_to_chip(rf);	407	struct zd_chip *chip = zd_rf_to_chip(rf);
406	static const struct zd_ioreq16 ioreqs[] = {	408	static const struct zd_ioreq16 ioreqs[] = {
407	{ CR11, 0x00 },	409	{ ZD_CR11, 0x00 },
408	{ CR251, 0x7f },	410	{ ZD_CR251, 0x7f },
409	};	411	};
410		412
411	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));	413	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -415,8 +417,8 @@ static int al2230_switch_radio_off(struct zd_rf *rf)
415	{	417	{
416	struct zd_chip *chip = zd_rf_to_chip(rf);	418	struct zd_chip *chip = zd_rf_to_chip(rf);
417	static const struct zd_ioreq16 ioreqs[] = {	419	static const struct zd_ioreq16 ioreqs[] = {
418	{ CR11, 0x04 },	420	{ ZD_CR11, 0x04 },
419	{ CR251, 0x2f },	421	{ ZD_CR251, 0x2f },
420	};	422	};
421		423
422	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));	424	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));