android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wl1271: ref_clock cosmetic changes

Browse Source 
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>
This commit is contained in:
Gery Kahn 2010-10-05 16:09:05 +02:00 committed by John W. Linville
parent 34d59c07e9
commit c8aea565e8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/wl12xx/wl1271_boot.c
View File

@ -471,20 +471,19 @@ int wl1271_boot(struct wl1271 *wl)
{ {
int ret = 0; int ret = 0;
u32 tmp, clk, pause; u32 tmp, clk, pause;
int ref_clock = wl->ref_clock;
wl1271_boot_hw_version(wl); 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 */ /* ref clk: 19.2/38.4/38.4-XTAL */
clk = 0x3; clk = 0x3;
else if (ref_clock == 1 || ref_clock == 3) else if (wl->ref_clock == 1 || wl->ref_clock == 3)
/* ref clk: 26/52 */ /* ref clk: 26/52 */
clk = 0x5; clk = 0x5;
else else
return -EINVAL; return -EINVAL;
if (ref_clock != 0) { if (wl->ref_clock != 0) {
u16 val; u16 val;
/* Set clock type (open drain) */ /* Set clock type (open drain) */
val = wl1271_top_reg_read(wl, OCP_REG_CLK_TYPE); val = wl1271_top_reg_read(wl, OCP_REG_CLK_TYPE);
@ -529,8 +528,7 @@ int wl1271_boot(struct wl1271 *wl)
wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk); wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);
/* 2 */ clk |= (wl->ref_clock << 1) << 4;
clk |= (ref_clock << 1) << 4;
wl1271_write32(wl, DRPW_SCRATCH_START, clk); wl1271_write32(wl, DRPW_SCRATCH_START, clk);
wl1271_set_partition(wl, &part_table[PART_WORK]); wl1271_set_partition(wl, &part_table[PART_WORK]);

8
include/linux/wl12xx.h
View File

@ -24,6 +24,14 @@
#ifndef _LINUX_WL12XX_H #ifndef _LINUX_WL12XX_H
#define _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 { struct wl12xx_platform_data {
void (*set_power)(bool enable); void (*set_power)(bool enable);
/* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */ /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */