wl1271: make ref_clock configurable by board
The wl1271 device is using a reference clock that may change between board to board. Make the ref_clock parameter configurable by board settings instead of having a hard coded value in the sources. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
09cecc340b
commit
15cea99306
|
@ -330,6 +330,7 @@ struct wl1271 {
|
|||
|
||||
void (*set_power)(bool enable);
|
||||
int irq;
|
||||
int ref_clock;
|
||||
|
||||
spinlock_t wl_lock;
|
||||
|
||||
|
|
|
@ -457,17 +457,20 @@ 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 (ref_clock == 0 || ref_clock == 2 || ref_clock == 4)
|
||||
/* ref clk: 19.2/38.4/38.4-XTAL */
|
||||
clk = 0x3;
|
||||
else if (REF_CLOCK == 1 || REF_CLOCK == 3)
|
||||
else if (ref_clock == 1 || ref_clock == 3)
|
||||
/* ref clk: 26/52 */
|
||||
clk = 0x5;
|
||||
else
|
||||
return -EINVAL;
|
||||
|
||||
if (REF_CLOCK != 0) {
|
||||
if (ref_clock != 0) {
|
||||
u16 val;
|
||||
/* Set clock type (open drain) */
|
||||
val = wl1271_top_reg_read(wl, OCP_REG_CLK_TYPE);
|
||||
|
@ -516,7 +519,7 @@ int wl1271_boot(struct wl1271 *wl)
|
|||
wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);
|
||||
|
||||
/* 2 */
|
||||
clk |= (REF_CLOCK << 1) << 4;
|
||||
clk |= (ref_clock << 1) << 4;
|
||||
wl1271_write32(wl, DRPW_SCRATCH_START, clk);
|
||||
|
||||
wl1271_set_partition(wl, &part_table[PART_WORK]);
|
||||
|
|
|
@ -46,7 +46,6 @@ struct wl1271_static_data {
|
|||
/* delay between retries */
|
||||
#define INIT_LOOP_DELAY 50
|
||||
|
||||
#define REF_CLOCK 2
|
||||
#define WU_COUNTER_PAUSE_VAL 0x3FF
|
||||
#define WELP_ARM_COMMAND_VAL 0x4
|
||||
|
||||
|
|
|
@ -234,6 +234,7 @@ static int __devinit wl1271_probe(struct sdio_func *func,
|
|||
}
|
||||
|
||||
wl->irq = wlan_data->irq;
|
||||
wl->ref_clock = wlan_data->board_ref_clock;
|
||||
|
||||
ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl);
|
||||
if (ret < 0) {
|
||||
|
|
|
@ -372,6 +372,8 @@ static int __devinit wl1271_probe(struct spi_device *spi)
|
|||
goto out_free;
|
||||
}
|
||||
|
||||
wl->ref_clock = pdata->board_ref_clock;
|
||||
|
||||
wl->irq = spi->irq;
|
||||
if (wl->irq < 0) {
|
||||
wl1271_error("irq missing in platform data");
|
||||
|
|
|
@ -29,6 +29,7 @@ struct wl12xx_platform_data {
|
|||
/* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
|
||||
int irq;
|
||||
bool use_eeprom;
|
||||
int board_ref_clock;
|
||||
};
|
||||
|
||||
int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
|
||||
|
|
Loading…
Reference in New Issue