[arch-commits] CVS update of arch/build/kernels/kernel26 (PKGBUILD zd1211.patch)
Tobias Powalowski
tpowa at archlinux.org
Mon Jun 11 21:25:14 UTC 2007
Date: Monday, June 11, 2007 @ 17:25:14
Author: tpowa
Path: /home/cvs-arch/arch/build/kernels/kernel26
Modified: PKGBUILD (1.234 -> 1.235) zd1211.patch (1.1 -> 1.2)
'upgpkg: fixed zd1211.patch to fit to new kernel'
--------------+
PKGBUILD | 4
zd1211.patch | 249 ---------------------------------------------------------
2 files changed, 2 insertions(+), 251 deletions(-)
Index: arch/build/kernels/kernel26/PKGBUILD
diff -u arch/build/kernels/kernel26/PKGBUILD:1.234 arch/build/kernels/kernel26/PKGBUILD:1.235
--- arch/build/kernels/kernel26/PKGBUILD:1.234 Mon Jun 11 17:17:07 2007
+++ arch/build/kernels/kernel26/PKGBUILD Mon Jun 11 17:25:14 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.234 2007/06/11 21:17:07 tpowa Exp $
+# $Id: PKGBUILD,v 1.235 2007/06/11 21:25:14 tpowa Exp $
# Maintainer: judd <jvinet at zeroflux.org>
pkgname=kernel26
_basekernel=2.6.21
@@ -61,7 +61,7 @@
'860f361dae65dd60f0bc8644372a4c27'
'7af4ec22ce65388555f02c43486d2337'
'7a62bfeedc9782abd90bc44d32801cab'
- 'bec19952e53d01fc5f4e6f48ce3fa856'
+ '0a4b2822b405999fbd7f0176fcbbb11a'
'bbc730a590d4e09b3d937b257e5a4bfe'
'b68adb3c52eeff2d441ca41c380382b7'
'bf360b92eba9e6d5610196ce2e02fcd1'
Index: arch/build/kernels/kernel26/zd1211.patch
diff -u arch/build/kernels/kernel26/zd1211.patch:1.1 arch/build/kernels/kernel26/zd1211.patch:1.2
--- arch/build/kernels/kernel26/zd1211.patch:1.1 Sat May 5 11:24:18 2007
+++ arch/build/kernels/kernel26/zd1211.patch Mon Jun 11 17:25:14 2007
@@ -181,255 +181,6 @@
spin_lock_irqsave(&mac->lock, flags);
From: Daniel Drake <dsd at gentoo.org>
-Date: Sun, 11 Mar 2007 19:54:28 +0000 (+0000)
-Subject: [PATCH] zd1211rw: Add AL2230S RF support
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f2a81a161d5089fe838ec6c4c7b6357f25aeacbe
-
-[PATCH] zd1211rw: Add AL2230S RF support
-
-ZD1211 appears to be back in production: a number of new devices have
-been appearing! Some of them are using new radios.
-
-This patch adds support for the next generation AL2230 RF chip which has
-been spotted in a few new devices.
-
-Signed-off-by: Daniel Drake <dsd at gentoo.org>
-Signed-off-by: John W. Linville <linville at tuxdriver.com>
----
-
-diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
-index 680a178..8acaa6b 100644
---- a/drivers/net/wireless/zd1211rw/zd_chip.c
-+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
-@@ -67,11 +67,12 @@ static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)
- i += scnprint_mac_oui(chip->e2p_mac, buffer+i, size-i);
- i += scnprintf(buffer+i, size-i, " ");
- i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);
-- i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c", chip->pa_type,
-+ i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c%c", chip->pa_type,
- chip->patch_cck_gain ? 'g' : '-',
- chip->patch_cr157 ? '7' : '-',
- chip->patch_6m_band_edge ? '6' : '-',
-- chip->new_phy_layout ? 'N' : '-');
-+ chip->new_phy_layout ? 'N' : '-',
-+ chip->al2230s_bit ? 'S' : '-');
- return i;
- }
-
-diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
-index f50cff3..e6d604b 100644
---- a/drivers/net/wireless/zd1211rw/zd_rf.c
-+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
-@@ -34,7 +34,7 @@ static const char *rfs[] = {
- [AL2210_RF] = "AL2210_RF",
- [MAXIM_NEW_RF] = "MAXIM_NEW_RF",
- [UW2453_RF] = "UW2453_RF",
-- [AL2230S_RF] = "AL2230S_RF",
-+ [UNKNOWN_A_RF] = "UNKNOWN_A_RF",
- [RALINK_RF] = "RALINK_RF",
- [INTERSIL_RF] = "INTERSIL_RF",
- [RF2959_RF] = "RF2959_RF",
-diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zd1211rw/zd_rf.h
-index a57732e..ee8ac3a 100644
---- a/drivers/net/wireless/zd1211rw/zd_rf.h
-+++ b/drivers/net/wireless/zd1211rw/zd_rf.h
-@@ -26,7 +26,7 @@
- #define AL2210_RF 0x7
- #define MAXIM_NEW_RF 0x8
- #define UW2453_RF 0x9
--#define AL2230S_RF 0xa
-+#define UNKNOWN_A_RF 0xa
- #define RALINK_RF 0xb
- #define INTERSIL_RF 0xc
- #define RF2959_RF 0xd
-diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
-index 5235a78..85a9ad2 100644
---- a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
-+++ b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
-@@ -59,6 +59,18 @@ static const struct zd_ioreq16 zd1211b_ioreqs_shared_1[] = {
- { CR240, 0x57 }, { CR9, 0xe0 },
- };
-
-+static const struct zd_ioreq16 ioreqs_init_al2230s[] = {
-+ { CR47, 0x1e }, /* MARK_002 */
-+ { CR106, 0x22 },
-+ { CR107, 0x2a }, /* MARK_002 */
-+ { CR109, 0x13 }, /* MARK_002 */
-+ { CR118, 0xf8 }, /* MARK_002 */
-+ { CR119, 0x12 }, { CR122, 0xe0 },
-+ { CR128, 0x10 }, /* MARK_001 from 0xe->0x10 */
-+ { CR129, 0x0e }, /* MARK_001 from 0xd->0x0e */
-+ { CR130, 0x10 }, /* MARK_001 from 0xb->0x0d */
-+};
-+
- static int zd1211b_al2230_finalize_rf(struct zd_chip *chip)
- {
- int r;
-@@ -90,7 +102,7 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
- int r;
- struct zd_chip *chip = zd_rf_to_chip(rf);
-
-- static const struct zd_ioreq16 ioreqs[] = {
-+ static const struct zd_ioreq16 ioreqs_init[] = {
- { CR15, 0x20 }, { CR23, 0x40 }, { CR24, 0x20 },
- { CR26, 0x11 }, { CR28, 0x3e }, { CR29, 0x00 },
- { CR44, 0x33 }, { CR106, 0x2a }, { CR107, 0x1a },
-@@ -117,10 +129,9 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
- { CR119, 0x10 }, { CR120, 0x4f }, { CR121, 0x77 },
- { CR122, 0xe0 }, { CR137, 0x88 }, { CR252, 0xff },
- { CR253, 0xff },
-+ };
-
-- /* These following happen separately in the vendor driver */
-- { },
--
-+ static const struct zd_ioreq16 ioreqs_pll[] = {
- /* shdnb(PLL_ON)=0 */
- { CR251, 0x2f },
- /* shdnb(PLL_ON)=1 */
-@@ -128,7 +139,7 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
- { CR138, 0x28 }, { CR203, 0x06 },
- };
-
-- static const u32 rv[] = {
-+ static const u32 rv1[] = {
- /* Channel 1 */
- 0x03f790,
- 0x033331,
-@@ -137,6 +148,9 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
- 0x0b3331,
- 0x03b812,
- 0x00fff3,
-+ };
-+
-+ static const u32 rv2[] = {
- 0x000da4,
- 0x0f4dc5, /* fix freq shift, 0x04edc5 */
- 0x0805b6,
-@@ -148,8 +162,9 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
- 0x0bdffc,
- 0x00000d,
- 0x00500f,
-+ };
-
-- /* These writes happen separately in the vendor driver */
-+ static const u32 rv3[] = {
- 0x00d00f,
- 0x004c0f,
- 0x00540f,
-@@ -157,11 +172,38 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
- 0x00500f,
- };
-
-- r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
-+ r = zd_iowrite16a_locked(chip, ioreqs_init, ARRAY_SIZE(ioreqs_init));
- if (r)
- return r;
-
-- r = zd_rfwritev_locked(chip, rv, ARRAY_SIZE(rv), RF_RV_BITS);
-+ if (chip->al2230s_bit) {
-+ r = zd_iowrite16a_locked(chip, ioreqs_init_al2230s,
-+ ARRAY_SIZE(ioreqs_init_al2230s));
-+ if (r)
-+ return r;
-+ }
-+
-+ r = zd_rfwritev_locked(chip, rv1, ARRAY_SIZE(rv1), RF_RV_BITS);
-+ if (r)
-+ return r;
-+
-+ /* improve band edge for AL2230S */
-+ if (chip->al2230s_bit)
-+ r = zd_rfwrite_locked(chip, 0x000824, RF_RV_BITS);
-+ else
-+ r = zd_rfwrite_locked(chip, 0x0005a4, RF_RV_BITS);
-+ if (r)
-+ return r;
-+
-+ r = zd_rfwritev_locked(chip, rv2, ARRAY_SIZE(rv2), RF_RV_BITS);
-+ if (r)
-+ return r;
-+
-+ r = zd_iowrite16a_locked(chip, ioreqs_pll, ARRAY_SIZE(ioreqs_pll));
-+ if (r)
-+ return r;
-+
-+ r = zd_rfwritev_locked(chip, rv3, ARRAY_SIZE(rv3), RF_RV_BITS);
- if (r)
- return r;
-
-@@ -227,7 +269,9 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
- 0x481dc0,
- 0xcfff00,
- 0x25a000,
-+ };
-
-+ static const u32 rv2[] = {
- /* To improve AL2230 yield, improve phase noise, 4713 */
- 0x25a000,
- 0xa3b2f0,
-@@ -250,7 +294,7 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
- { CR251, 0x7f }, /* shdnb(PLL_ON)=1 */
- };
-
-- static const u32 rv2[] = {
-+ static const u32 rv3[] = {
- /* To improve AL2230 yield, 4713 */
- 0xf01b00,
- 0xf01e00,
-@@ -269,18 +313,37 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
- r = zd_iowrite16a_locked(chip, ioreqs1, ARRAY_SIZE(ioreqs1));
- if (r)
- return r;
-+
-+ if (chip->al2230s_bit) {
-+ r = zd_iowrite16a_locked(chip, ioreqs_init_al2230s,
-+ ARRAY_SIZE(ioreqs_init_al2230s));
-+ if (r)
-+ return r;
-+ }
-+
- r = zd_rfwritev_cr_locked(chip, zd1211b_al2230_table[0], 3);
- if (r)
- return r;
- r = zd_rfwritev_cr_locked(chip, rv1, ARRAY_SIZE(rv1));
- if (r)
- return r;
-- r = zd_iowrite16a_locked(chip, ioreqs2, ARRAY_SIZE(ioreqs2));
-+
-+ if (chip->al2230s_bit)
-+ r = zd_rfwrite_locked(chip, 0x241000, RF_RV_BITS);
-+ else
-+ r = zd_rfwrite_locked(chip, 0x25a000, RF_RV_BITS);
- if (r)
- return r;
-+
- r = zd_rfwritev_cr_locked(chip, rv2, ARRAY_SIZE(rv2));
- if (r)
- return r;
-+ r = zd_iowrite16a_locked(chip, ioreqs2, ARRAY_SIZE(ioreqs2));
-+ if (r)
-+ return r;
-+ r = zd_rfwritev_cr_locked(chip, rv3, ARRAY_SIZE(rv3));
-+ if (r)
-+ return r;
- r = zd_iowrite16a_locked(chip, ioreqs3, ARRAY_SIZE(ioreqs3));
- if (r)
- return r;
-@@ -358,12 +421,6 @@ int zd_rf_init_al2230(struct zd_rf *rf)
- {
- struct zd_chip *chip = zd_rf_to_chip(rf);
-
-- if (chip->al2230s_bit) {
-- dev_err(zd_chip_dev(chip), "AL2230S devices are not yet "
-- "supported by this driver.\n");
-- return -ENODEV;
-- }
--
- rf->switch_radio_off = al2230_switch_radio_off;
- if (chip->is_zd1211b) {
- rf->init_hw = zd1211b_al2230_init_hw;
-From: Daniel Drake <dsd at gentoo.org>
Date: Sun, 11 Mar 2007 19:54:39 +0000 (+0000)
Subject: [PATCH] zd1211rw: More device IDs
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=aec91028db71cae7efa1101cf2e38c407096f023
More information about the arch-commits
mailing list