tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

wl1271: ref_clock cosmetic changes

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>

authored by

Gery Kahn and committed by
John W. Linville c8aea565 34d59c07

+12 -6
+4 -6
drivers/net/wireless/wl12xx/wl1271_boot.c
··· 471 471 { 472 472 int ret = 0; 473 473 u32 tmp, clk, pause; 474 - int ref_clock = wl->ref_clock; 475 474 476 475 wl1271_boot_hw_version(wl); 477 476 478 - if (ref_clock == 0 || ref_clock == 2 || ref_clock == 4) 477 + if (wl->ref_clock == 0 || wl->ref_clock == 2 || wl->ref_clock == 4) 479 478 /* ref clk: 19.2/38.4/38.4-XTAL */ 480 479 clk = 0x3; 481 - else if (ref_clock == 1 || ref_clock == 3) 480 + else if (wl->ref_clock == 1 || wl->ref_clock == 3) 482 481 /* ref clk: 26/52 */ 483 482 clk = 0x5; 484 483 else 485 484 return -EINVAL; 486 485 487 - if (ref_clock != 0) { 486 + if (wl->ref_clock != 0) { 488 487 u16 val; 489 488 /* Set clock type (open drain) */ 490 489 val = wl1271_top_reg_read(wl, OCP_REG_CLK_TYPE); ··· 528 529 529 530 wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk); 530 531 531 - /* 2 */ 532 - clk |= (ref_clock << 1) << 4; 532 + clk |= (wl->ref_clock << 1) << 4; 533 533 wl1271_write32(wl, DRPW_SCRATCH_START, clk); 534 534 535 535 wl1271_set_partition(wl, &part_table[PART_WORK]);
+8
include/linux/wl12xx.h
··· 24 24 #ifndef _LINUX_WL12XX_H 25 25 #define _LINUX_WL12XX_H 26 26 27 + /* The board reference clock values */ 28 + enum { 29 + WL12XX_REFCLOCK_19 = 0, /* 19.2 MHz */ 30 + WL12XX_REFCLOCK_26 = 1, /* 26 MHz */ 31 + WL12XX_REFCLOCK_38 = 2, /* 38.4 MHz */ 32 + WL12XX_REFCLOCK_54 = 3, /* 54 MHz */ 33 + }; 34 + 27 35 struct wl12xx_platform_data { 28 36 void (*set_power)(bool enable); 29 37 /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */