Skip to content

Commit

Permalink
wl18xx: change board type enum according to new FW
Browse files Browse the repository at this point in the history 
Add more board types and remove a now unneeded write to SCR_PAD2 setting
the board type.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Arik Nemtsov authored and Luciano Coelho committed Jun 5, 2012
1 parent 2f1d74e commit 05057c0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 36 deletions.
43 changes: 17 additions & 26 deletions drivers/net/wireless/ti/wl18xx/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@
static char *ht_mode_param;
static char *board_type_param;

static const u32 wl18xx_board_type_to_scrpad2[NUM_BOARD_TYPES] = {
[BOARD_TYPE_FPGA_18XX] = SCR_PAD2_BOARD_TYPE_FPGA,
[BOARD_TYPE_HDK_18XX] = SCR_PAD2_BOARD_TYPE_HDK,
[BOARD_TYPE_DVP_EVB_18XX] = SCR_PAD2_BOARD_TYPE_DVP_EVB,
};

static const u8 wl18xx_rate_to_idx_2ghz[] = {
/* MCS rates are used only with 11n */
15, /* WL18XX_CONF_HW_RXTX_RATE_MCS15 */
Expand Down Expand Up @@ -604,13 +598,8 @@ static int wl18xx_identify_chip(struct wl1271 *wl)

static void wl18xx_set_clk(struct wl1271 *wl)
{
struct wl18xx_priv *priv = wl->priv;
u32 clk_freq;

/* write the translated board type to SCR_PAD2 */
wl1271_write32(wl, WL18XX_SCR_PAD2,
wl18xx_board_type_to_scrpad2[priv->board_type]);

wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);

/* TODO: PG2: apparently we need to read the clk type */
Expand Down Expand Up @@ -1046,21 +1035,22 @@ int __devinit wl18xx_probe(struct platform_device *pdev)
sizeof(wl18xx_mimo_ht_cap));

if (!board_type_param) {
board_type_param = kstrdup("dvp_evb", GFP_KERNEL);
priv->board_type = BOARD_TYPE_DVP_EVB_18XX;
board_type_param = kstrdup("dvp", GFP_KERNEL);
priv->board_type = BOARD_TYPE_DVP_18XX;
} else if (!strcmp(board_type_param, "fpga")) {
priv->board_type = BOARD_TYPE_FPGA_18XX;
} else if (!strcmp(board_type_param, "hdk")) {
priv->board_type = BOARD_TYPE_HDK_18XX;
} else if (!strcmp(board_type_param, "dvp")) {
priv->board_type = BOARD_TYPE_DVP_18XX;
} else if (!strcmp(board_type_param, "evb")) {
priv->board_type = BOARD_TYPE_EVB_18XX;
} else if (!strcmp(board_type_param, "com8")) {
priv->board_type = BOARD_TYPE_COM8_18XX;
} else {
if (!strcmp(board_type_param, "fpga"))
priv->board_type = BOARD_TYPE_FPGA_18XX;
else if (!strcmp(board_type_param, "hdk"))
priv->board_type = BOARD_TYPE_HDK_18XX;
else if (!strcmp(board_type_param, "dvp_evb"))
priv->board_type = BOARD_TYPE_DVP_EVB_18XX;
else {
wl1271_error("invalid board type '%s'",
board_type_param);
wlcore_free_hw(wl);
return -EINVAL;
}
wl1271_error("invalid board type '%s'", board_type_param);
wlcore_free_hw(wl);
return -EINVAL;
}

wl18xx_conf_init(wl);
Expand Down Expand Up @@ -1100,7 +1090,8 @@ module_param_named(ht_mode, ht_mode_param, charp, S_IRUSR);
MODULE_PARM_DESC(ht_mode, "Force HT mode: wide or mimo");

module_param_named(board_type, board_type_param, charp, S_IRUSR);
MODULE_PARM_DESC(board_type, "Board type: fpga, hdk or dvp_evb (default)");
MODULE_PARM_DESC(board_type, "Board type: fpga, hdk, evb, com8 or "
"dvp (default)");

MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
Expand Down
15 changes: 5 additions & 10 deletions drivers/net/wireless/ti/wl18xx/reg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,20 +176,15 @@ enum {
};

enum {
BOARD_TYPE_FPGA_18XX = 0,
BOARD_TYPE_HDK_18XX = 1,
BOARD_TYPE_DVP_EVB_18XX = 2,
BOARD_TYPE_EVB_18XX = 0,
BOARD_TYPE_DVP_18XX = 1,
BOARD_TYPE_HDK_18XX = 2,
BOARD_TYPE_FPGA_18XX = 3,
BOARD_TYPE_COM8_18XX = 4,

NUM_BOARD_TYPES,
};

/* board type values used by the firmware in the SCR_PAD2 register */
enum {
SCR_PAD2_BOARD_TYPE_FPGA = 0xB1,
SCR_PAD2_BOARD_TYPE_HDK = 0xB2,
SCR_PAD2_BOARD_TYPE_DVP_EVB = 0xB3,
};

struct wl18xx_mac_and_phy_params {
u8 phy_standalone;
u8 rdl;
Expand Down

0 comments on commit 05057c0

Please sign in to comment.