aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ti_wilink_st.h
diff options
context:
space:
mode:
authorPavan Savoy <pavan_savoy@ti.com>2011-02-04 03:23:15 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-04 15:41:21 -0500
commit781a7395d239dbdb59738ca7fe08e71641bf583c (patch)
treefb57da5401614e1b727457b78c7582327be61265 /include/linux/ti_wilink_st.h
parent6d71ba2105a1d8c1712cdfcf46fc6040e4707cb9 (diff)
drivers:misc: ti-st: remove multiple gpio handling
TI shared transport driver previously intended to expose rfkill entries for each of the protocol gpio that the chip would have. However now in case such gpios exist, which requires to be enabled for a specific protocol, the responsibility lay on protocol driver. This patch removes the request/free of multiple gpios, rfkill struct references and also removes the chip_toggle function. Signed-off-by: Pavan Savoy <pavan_savoy@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/ti_wilink_st.h')
-rw-r--r--include/linux/ti_wilink_st.h19
1 files changed, 2 insertions, 17 deletions
diff --git a/include/linux/ti_wilink_st.h b/include/linux/ti_wilink_st.h
index 7885a779c588..7071ec5d0118 100644
--- a/include/linux/ti_wilink_st.h
+++ b/include/linux/ti_wilink_st.h
@@ -26,15 +26,6 @@
26#define TI_WILINK_ST_H 26#define TI_WILINK_ST_H
27 27
28/** 28/**
29 * enum kim_gpio_state - Few protocols such as FM have ACTIVE LOW
30 * gpio states for their chip/core enable gpios
31 */
32enum kim_gpio_state {
33 KIM_GPIO_INACTIVE,
34 KIM_GPIO_ACTIVE,
35};
36
37/**
38 * enum proto-type - The protocol on WiLink chips which share a 29 * enum proto-type - The protocol on WiLink chips which share a
39 * common physical interface like UART. 30 * common physical interface like UART.
40 */ 31 */
@@ -252,14 +243,11 @@ struct chip_version {
252 * the ldisc was properly installed. 243 * the ldisc was properly installed.
253 * @resp_buffer: data buffer for the .bts fw file name. 244 * @resp_buffer: data buffer for the .bts fw file name.
254 * @fw_entry: firmware class struct to request/release the fw. 245 * @fw_entry: firmware class struct to request/release the fw.
255 * @gpios: the list of core/chip enable gpios for BT, FM and GPS cores.
256 * @rx_state: the rx state for kim's receive func during fw download. 246 * @rx_state: the rx state for kim's receive func during fw download.
257 * @rx_count: the rx count for the kim's receive func during fw download. 247 * @rx_count: the rx count for the kim's receive func during fw download.
258 * @rx_skb: all of fw data might not come at once, and hence data storage for 248 * @rx_skb: all of fw data might not come at once, and hence data storage for
259 * whole of the fw response, only HCI_EVENTs and hence diff from ST's 249 * whole of the fw response, only HCI_EVENTs and hence diff from ST's
260 * response. 250 * response.
261 * @rfkill: rfkill data for each of the cores to be registered with rfkill.
262 * @rf_protos: proto types of the data registered with rfkill sub-system.
263 * @core_data: ST core's data, which mainly is the tty's disc_data 251 * @core_data: ST core's data, which mainly is the tty's disc_data
264 * @version: chip version available via a sysfs entry. 252 * @version: chip version available via a sysfs entry.
265 * 253 *
@@ -270,12 +258,10 @@ struct kim_data_s {
270 struct completion kim_rcvd, ldisc_installed; 258 struct completion kim_rcvd, ldisc_installed;
271 char resp_buffer[30]; 259 char resp_buffer[30];
272 const struct firmware *fw_entry; 260 const struct firmware *fw_entry;
273 long gpios[ST_MAX_CHANNELS]; 261 long nshutdown;
274 unsigned long rx_state; 262 unsigned long rx_state;
275 unsigned long rx_count; 263 unsigned long rx_count;
276 struct sk_buff *rx_skb; 264 struct sk_buff *rx_skb;
277 struct rfkill *rfkill[ST_MAX_CHANNELS];
278 enum proto_type rf_protos[ST_MAX_CHANNELS];
279 struct st_data_s *core_data; 265 struct st_data_s *core_data;
280 struct chip_version version; 266 struct chip_version version;
281 unsigned char ldisc_install; 267 unsigned char ldisc_install;
@@ -293,7 +279,6 @@ long st_kim_start(void *);
293long st_kim_stop(void *); 279long st_kim_stop(void *);
294 280
295void st_kim_recv(void *, const unsigned char *, long count); 281void st_kim_recv(void *, const unsigned char *, long count);
296void st_kim_chip_toggle(enum proto_type, enum kim_gpio_state);
297void st_kim_complete(void *); 282void st_kim_complete(void *);
298void kim_st_list_protocols(struct st_data_s *, void *); 283void kim_st_list_protocols(struct st_data_s *, void *);
299 284
@@ -426,7 +411,7 @@ struct gps_event_hdr {
426 411
427/* platform data */ 412/* platform data */
428struct ti_st_plat_data { 413struct ti_st_plat_data {
429 long gpios[ST_MAX_CHANNELS]; /* BT, FM and GPS */ 414 long nshutdown_gpio;
430 unsigned char dev_name[UART_DEV_NAME_LEN]; /* uart name */ 415 unsigned char dev_name[UART_DEV_NAME_LEN]; /* uart name */
431 unsigned char flow_cntrl; /* flow control flag */ 416 unsigned char flow_cntrl; /* flow control flag */
432 unsigned long baud_rate; 417 unsigned long baud_rate;