diff options
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_io.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_io.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_io.c b/drivers/net/wireless/wl12xx/wl1271_io.c index 00f98bdc48f7..5cd94d5666c2 100644 --- a/drivers/net/wireless/wl12xx/wl1271_io.c +++ b/drivers/net/wireless/wl12xx/wl1271_io.c | |||
@@ -115,6 +115,16 @@ int wl1271_set_partition(struct wl1271 *wl, | |||
115 | return 0; | 115 | return 0; |
116 | } | 116 | } |
117 | 117 | ||
118 | void wl1271_io_reset(struct wl1271 *wl) | ||
119 | { | ||
120 | wl1271_spi_reset(wl); | ||
121 | } | ||
122 | |||
123 | void wl1271_io_init(struct wl1271 *wl) | ||
124 | { | ||
125 | wl1271_spi_init(wl); | ||
126 | } | ||
127 | |||
118 | void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf, | 128 | void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf, |
119 | size_t len, bool fixed) | 129 | size_t len, bool fixed) |
120 | { | 130 | { |
diff --git a/drivers/net/wireless/wl12xx/wl1271_io.h b/drivers/net/wireless/wl12xx/wl1271_io.h index 859d571dc413..fa9a0b35788f 100644 --- a/drivers/net/wireless/wl12xx/wl1271_io.h +++ b/drivers/net/wireless/wl12xx/wl1271_io.h | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | struct wl1271; | 28 | struct wl1271; |
29 | 29 | ||
30 | void wl1271_io_reset(struct wl1271 *wl); | ||
31 | void wl1271_io_init(struct wl1271 *wl); | ||
30 | 32 | ||
31 | /* Raw target IO, address is not translated */ | 33 | /* Raw target IO, address is not translated */ |
32 | void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf, | 34 | void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf, |
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 46968958aeff..66fb9a0a8efa 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -648,8 +648,8 @@ static int wl1271_chip_wakeup(struct wl1271 *wl) | |||
648 | msleep(WL1271_PRE_POWER_ON_SLEEP); | 648 | msleep(WL1271_PRE_POWER_ON_SLEEP); |
649 | wl1271_power_on(wl); | 649 | wl1271_power_on(wl); |
650 | msleep(WL1271_POWER_ON_SLEEP); | 650 | msleep(WL1271_POWER_ON_SLEEP); |
651 | wl1271_spi_reset(wl); | 651 | wl1271_io_reset(wl); |
652 | wl1271_spi_init(wl); | 652 | wl1271_io_init(wl); |
653 | 653 | ||
654 | /* We don't need a real memory partition here, because we only want | 654 | /* We don't need a real memory partition here, because we only want |
655 | * to use the registers at this point. */ | 655 | * to use the registers at this point. */ |