Skip to content

L
linux-davinci-2.6.23
Commit ba528c45 authored by Daniel Drake's avatar Daniel Drake Committed by Jeff Garzik
Browse files
Options

[PATCH] zd1211rw: Add AL7230B RF support for ZD1211B 

This patch adds support for some new ZD1211B devices which ship with
the AL7230B RF.
Signed-off-by: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 72018b22
Show whitespace changes
Inline Side-by-side
Showing with 267 additions and 50 deletions
drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
View file @ ba528c45
......@@ -51,9 +51,52 @@ static const u32 std_rv[] = {
0xd8c010,
};
static int al7230b_init_hw(struct zd_rf *rf)
static const u32 rv_init1[] = {
0x3c9000,
0xbfffff,
0x700000,
0xf15d58,
};
static const u32 rv_init2[] = {
0xf15d59,
0xf15d5c,
0xf15d58,
};
static const struct zd_ioreq16 ioreqs_sw[] = {
{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
{ CR38, 0x38 }, { CR136, 0xdf },
};
static int zd1211b_al7230b_finalize(struct zd_chip *chip)
{
int i, r;
int r;
static const struct zd_ioreq16 ioreqs[] = {
{ CR80, 0x30 }, { CR81, 0x30 }, { CR79, 0x58 },
{ CR12, 0xf0 }, { CR77, 0x1b }, { CR78, 0x58 },
{ CR203, 0x04 },
{ },
{ CR240, 0x80 },
};
r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
if (r)
return r;
if (chip->new_phy_layout) {
/* antenna selection? */
r = zd_iowrite16_locked(chip, 0xe5, CR9);
if (r)
return r;
}
return zd_iowrite16_locked(chip, 0x04, CR203);
}
static int zd1211_al7230b_init_hw(struct zd_rf *rf)
{
int r;
struct zd_chip *chip = zd_rf_to_chip(rf);
/* All of these writes are identical to AL2230 unless otherwise
......@@ -117,8 +160,7 @@ static int al7230b_init_hw(struct zd_rf *rf)
};
static const struct zd_ioreq16 ioreqs_2[] = {
/* PLL_ON */
{ CR251, 0x3f },
{ CR251, 0x3f }, /* PLL_ON */
{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
{ CR38, 0x38 }, { CR136, 0xdf },
};
......@@ -127,29 +169,127 @@ static int al7230b_init_hw(struct zd_rf *rf)
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0x09ec04);
r = zd_rfwritev_cr_locked(chip, chan_rv[0], ARRAY_SIZE(chan_rv[0]));
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0x8cccc8);
r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
if (r)
return r;
for (i = 0; i < ARRAY_SIZE(std_rv); i++) {
r = zd_rfwrite_cr_locked(chip, std_rv[i]);
r = zd_rfwritev_cr_locked(chip, rv_init1, ARRAY_SIZE(rv_init1));
if (r)
return r;
}
r = zd_rfwrite_cr_locked(chip, 0x3c9000);
r = zd_iowrite16a_locked(chip, ioreqs_2, ARRAY_SIZE(ioreqs_2));
if (r)
return r;
r = zd_rfwritev_cr_locked(chip, rv_init2, ARRAY_SIZE(rv_init2));
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0xbfffff);
r = zd_iowrite16_locked(chip, 0x06, CR203);
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0x700000);
r = zd_iowrite16_locked(chip, 0x80, CR240);
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0xf15d58);
return 0;
}
static int zd1211b_al7230b_init_hw(struct zd_rf *rf)
{
int r;
struct zd_chip *chip = zd_rf_to_chip(rf);
static const struct zd_ioreq16 ioreqs_1[] = {
{ CR240, 0x57 }, { CR9, 0x9 },
{ },
{ CR10, 0x8b }, { CR15, 0x20 },
{ CR17, 0x2B }, /* for newest (3rd cut) AL2230 */
{ CR20, 0x10 }, /* 4N25->Stone Request */
{ CR23, 0x40 }, { CR24, 0x20 }, { CR26, 0x93 },
{ CR28, 0x3e }, { CR29, 0x00 },
{ CR33, 0x28 }, /* 5613 */
{ CR34, 0x30 },
{ CR35, 0x3e }, /* for newest (3rd cut) AL2230 */
{ CR41, 0x24 }, { CR44, 0x32 },
{ CR46, 0x99 }, /* for newest (3rd cut) AL2230 */
{ CR47, 0x1e },
/* ZD1215 5610 */
{ CR48, 0x00 }, { CR49, 0x00 }, { CR51, 0x01 },
{ CR52, 0x80 }, { CR53, 0x7e }, { CR65, 0x00 },
{ CR66, 0x00 }, { CR67, 0x00 }, { CR68, 0x00 },
{ CR69, 0x28 },
{ CR79, 0x58 }, { CR80, 0x30 }, { CR81, 0x30 },
{ CR87, 0x0A }, { CR89, 0x04 },
{ CR90, 0x58 }, /* 5112 */
{ CR91, 0x00 }, /* 5613 */
{ CR92, 0x0a },
{ CR98, 0x8d }, /* 4804, for 1212 new algorithm */
{ CR99, 0x00 }, { CR100, 0x02 }, { CR101, 0x13 },
{ CR102, 0x27 },
{ CR106, 0x20 }, /* change to 0x24 for AL7230B */
{ CR109, 0x13 }, /* 4804, for 1212 new algorithm */
{ CR112, 0x1f },
};
static const struct zd_ioreq16 ioreqs_new_phy[] = {
{ CR107, 0x28 },
{ CR110, 0x1f }, /* 5127, 0x13->0x1f */
{ CR111, 0x1f }, /* 0x13 to 0x1f for AL7230B */
{ CR116, 0x2a }, { CR118, 0xfa }, { CR119, 0x12 },
{ CR121, 0x6c }, /* 5613 */
};
static const struct zd_ioreq16 ioreqs_old_phy[] = {
{ CR107, 0x24 },
{ CR110, 0x13 }, /* 5127, 0x13->0x1f */
{ CR111, 0x13 }, /* 0x13 to 0x1f for AL7230B */
{ CR116, 0x24 }, { CR118, 0xfc }, { CR119, 0x11 },
{ CR121, 0x6a }, /* 5613 */
};
static const struct zd_ioreq16 ioreqs_2[] = {
{ CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x24 },
{ CR117, 0xfa }, { CR120, 0x4f },
{ CR122, 0xfc }, /* E0->FCh at 4901 */
{ CR123, 0x57 }, /* 5613 */
{ CR125, 0xad }, /* 4804, for 1212 new algorithm */
{ CR126, 0x6c }, /* 5613 */
{ CR127, 0x03 }, /* 4804, for 1212 new algorithm */
{ CR130, 0x10 },
{ CR131, 0x00 }, /* 5112 */
{ CR137, 0x50 }, /* 5613 */
{ CR138, 0xa8 }, /* 5112 */
{ CR144, 0xac }, /* 5613 */
{ CR148, 0x40 }, /* 5112 */
{ CR149, 0x40 }, /* 4O07, 50->40 */
{ CR150, 0x1a }, /* 5112, 0C->1A */
{ CR252, 0x34 }, { CR253, 0x34 },
{ CR251, 0x2f }, /* PLL_OFF */
};
static const struct zd_ioreq16 ioreqs_3[] = {
{ CR251, 0x7f }, /* PLL_ON */
{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
{ CR38, 0x38 }, { CR136, 0xdf },
};
r = zd_iowrite16a_locked(chip, ioreqs_1, ARRAY_SIZE(ioreqs_1));
if (r)
return r;
if (chip->new_phy_layout)
r = zd_iowrite16a_locked(chip, ioreqs_new_phy,
ARRAY_SIZE(ioreqs_new_phy));
else
r = zd_iowrite16a_locked(chip, ioreqs_old_phy,
ARRAY_SIZE(ioreqs_old_phy));
if (r)
return r;
......@@ -157,38 +297,36 @@ static int al7230b_init_hw(struct zd_rf *rf)
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0xf15d59);
r = zd_rfwritev_cr_locked(chip, chan_rv[0], ARRAY_SIZE(chan_rv[0]));
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0xf15d5c);
r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0xf15d58);
r = zd_rfwritev_cr_locked(chip, rv_init1, ARRAY_SIZE(rv_init1));
if (r)
return r;
r = zd_iowrite16_locked(chip, 0x06, CR203);
r = zd_iowrite16a_locked(chip, ioreqs_3, ARRAY_SIZE(ioreqs_3));
if (r)
return r;
r = zd_iowrite16_locked(chip, 0x80, CR240);
r = zd_rfwritev_cr_locked(chip, rv_init2, ARRAY_SIZE(rv_init2));
if (r)
return r;
return 0;
return zd1211b_al7230b_finalize(chip);
}
static int al7230b_set_channel(struct zd_rf *rf, u8 channel)
static int zd1211_al7230b_set_channel(struct zd_rf *rf, u8 channel)
{
int i, r;
int r;
const u32 *rv = chan_rv[channel-1];
struct zd_chip *chip = zd_rf_to_chip(rf);
static const struct zd_ioreq16 ioreqs_1[] = {
{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
{ CR38, 0x38 }, { CR136, 0xdf },
};
static const struct zd_ioreq16 ioreqs_2[] = {
static const struct zd_ioreq16 ioreqs[] = {
/* PLL_ON */
{ CR251, 0x3f },
{ CR203, 0x06 }, { CR240, 0x08 },
......@@ -203,11 +341,9 @@ static int al7230b_set_channel(struct zd_rf *rf, u8 channel)
if (r)
return r;
for (i = 0; i < ARRAY_SIZE(std_rv); i++) {
r = zd_rfwrite_cr_locked(chip, std_rv[i]);
r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
if (r)
return r;
}
r = zd_rfwrite_cr_locked(chip, 0x3c9000);
if (r)
......@@ -216,24 +352,69 @@ static int al7230b_set_channel(struct zd_rf *rf, u8 channel)
if (r)
return r;
r = zd_iowrite16a_locked(chip, ioreqs_1, ARRAY_SIZE(ioreqs_1));
r = zd_iowrite16a_locked(chip, ioreqs_sw, ARRAY_SIZE(ioreqs_sw));
if (r)
return r;
for (i = 0; i < 2; i++) {
r = zd_rfwrite_cr_locked(chip, rv[i]);
r = zd_rfwritev_cr_locked(chip, rv, 2);
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0x3c9000);
if (r)
return r;
return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
}
static int zd1211b_al7230b_set_channel(struct zd_rf *rf, u8 channel)
{
int r;
const u32 *rv = chan_rv[channel-1];
struct zd_chip *chip = zd_rf_to_chip(rf);
r = zd_iowrite16_locked(chip, 0x57, CR240);
if (r)
return r;
r = zd_iowrite16_locked(chip, 0xe4, CR9);
if (r)
return r;
/* PLL_OFF */
r = zd_iowrite16_locked(chip, 0x2f, CR251);
if (r)
return r;
r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0x3c9000);
if (r)
return r;
r = zd_rfwrite_cr_locked(chip, 0xf15d58);
if (r)
return r;
r = zd_iowrite16a_locked(chip, ioreqs_sw, ARRAY_SIZE(ioreqs_sw));
if (r)
return r;
r = zd_rfwritev_cr_locked(chip, rv, 2);
if (r)
return r;
}
r = zd_rfwrite_cr_locked(chip, 0x3c9000);
if (r)
return r;
return zd_iowrite16a_locked(chip, ioreqs_2, ARRAY_SIZE(ioreqs_2));
r = zd_iowrite16_locked(chip, 0x7f, CR251);
if (r)
return r;
return zd1211b_al7230b_finalize(chip);
}
static int al7230b_switch_radio_on(struct zd_rf *rf)
static int zd1211_al7230b_switch_radio_on(struct zd_rf *rf)
{
struct zd_chip *chip = zd_rf_to_chip(rf);
static const struct zd_ioreq16 ioreqs[] = {
......@@ -244,6 +425,17 @@ static int al7230b_switch_radio_on(struct zd_rf *rf)
return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
}
static int zd1211b_al7230b_switch_radio_on(struct zd_rf *rf)
{
struct zd_chip *chip = zd_rf_to_chip(rf);
static const struct zd_ioreq16 ioreqs[] = {
{ CR11, 0x00 },
{ CR251, 0x7f },
};
return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
}
static int al7230b_switch_radio_off(struct zd_rf *rf)
{
struct zd_chip *chip = zd_rf_to_chip(rf);
......@@ -255,20 +447,45 @@ static int al7230b_switch_radio_off(struct zd_rf *rf)
return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
}
/* ZD1211B+AL7230B 6m band edge patching differs slightly from other
* configurations */
static int zd1211b_al7230b_patch_6m(struct zd_rf *rf, u8 channel)
{
struct zd_chip *chip = zd_rf_to_chip(rf);
struct zd_ioreq16 ioreqs[] = {
{ CR128, 0x14 }, { CR129, 0x12 },
};
/* FIXME: Channel 11 is not the edge for all regulatory domains. */
if (channel == 1) {
ioreqs[0].value = 0x0e;
ioreqs[1].value = 0x10;
} else if (channel == 11) {
ioreqs[0].value = 0x10;
ioreqs[1].value = 0x10;
}
dev_dbg_f(zd_chip_dev(chip), "patching for channel %d\n", channel);
return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
}
int zd_rf_init_al7230b(struct zd_rf *rf)
{
struct zd_chip *chip = zd_rf_to_chip(rf);
if (chip->is_zd1211b) {
dev_err(zd_chip_dev(chip), "AL7230B is currently not "
"supported for ZD1211B devices\n");
return -ENODEV;
rf->init_hw = zd1211b_al7230b_init_hw;
rf->switch_radio_on = zd1211b_al7230b_switch_radio_on;
rf->set_channel = zd1211b_al7230b_set_channel;
rf->patch_6m_band_edge = zd1211b_al7230b_patch_6m;
} else {
rf->init_hw = zd1211_al7230b_init_hw;
rf->switch_radio_on = zd1211_al7230b_switch_radio_on;
rf->set_channel = zd1211_al7230b_set_channel;
rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
}
rf->init_hw = al7230b_init_hw;
rf->set_channel = al7230b_set_channel;
rf->switch_radio_on = al7230b_switch_radio_on;
rf->switch_radio_off = al7230b_switch_radio_off;
rf->patch_6m_band_edge = zd_rf_generic_patch_6m;
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment