Skip to content

Commit

Permalink
wl1271: ref_clock cosmetic changes
Browse files Browse the repository at this point in the history
Cosmetic cleanup for ref_clock code while configured by board.

Signed-off-by: Gery Kahn <geryk@ti.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
  • Loading branch information
Gery Kahn authored and John W. Linville committed Nov 15, 2010
1 parent 34d59c0 commit c8aea56
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/net/wireless/wl12xx/wl1271_boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -471,20 +471,19 @@ int wl1271_boot(struct wl1271 *wl)
{
int ret = 0;
u32 tmp, clk, pause;
int ref_clock = wl->ref_clock;

wl1271_boot_hw_version(wl);

if (ref_clock == 0 || ref_clock == 2 || ref_clock == 4)
if (wl->ref_clock == 0 || wl->ref_clock == 2 || wl->ref_clock == 4)
/* ref clk: 19.2/38.4/38.4-XTAL */
clk = 0x3;
else if (ref_clock == 1 || ref_clock == 3)
else if (wl->ref_clock == 1 || wl->ref_clock == 3)
/* ref clk: 26/52 */
clk = 0x5;
else
return -EINVAL;

if (ref_clock != 0) {
if (wl->ref_clock != 0) {
u16 val;
/* Set clock type (open drain) */
val = wl1271_top_reg_read(wl, OCP_REG_CLK_TYPE);
Expand Down Expand Up @@ -529,8 +528,7 @@ int wl1271_boot(struct wl1271 *wl)

wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);

/* 2 */
clk |= (ref_clock << 1) << 4;
clk |= (wl->ref_clock << 1) << 4;
wl1271_write32(wl, DRPW_SCRATCH_START, clk);

wl1271_set_partition(wl, &part_table[PART_WORK]);
Expand Down
8 changes: 8 additions & 0 deletions include/linux/wl12xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
#ifndef _LINUX_WL12XX_H
#define _LINUX_WL12XX_H

/* The board reference clock values */
enum {
WL12XX_REFCLOCK_19 = 0, /* 19.2 MHz */
WL12XX_REFCLOCK_26 = 1, /* 26 MHz */
WL12XX_REFCLOCK_38 = 2, /* 38.4 MHz */
WL12XX_REFCLOCK_54 = 3, /* 54 MHz */
};

struct wl12xx_platform_data {
void (*set_power)(bool enable);
/* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
Expand Down

0 comments on commit c8aea56

Please sign in to comment.