1 files changed, 6 insertions, 24 deletions
diff --git a/include/linux/usb_isp116x.h b/include/linux/usb_isp116x.h
index 5f5a9d9bd6c2..436dd8a2b64a 100644
--- a/include/linux/usb_isp116x.h
+++ b/include/linux/usb_isp116x.h
@@ -7,36 +7,18 @@
 struct isp116x_platform_data {
        /* Enable internal resistors on downstream ports */
        unsigned sel15Kres:1;
-        /* Chip's internal clock won't be stopped in suspended state.
+        /* On-chip overcurrent detection */
-           Setting/unsetting this bit takes effect only if
-           'remote_wakeup_enable' below is not set. */
-        unsigned clknotstop:1;
-        /* On-chip overcurrent protection */
        unsigned oc_enable:1;
        /* INT output polarity */
        unsigned int_act_high:1;
        /* INT edge or level triggered */
        unsigned int_edge_triggered:1;
-        /* WAKEUP pin connected - NOT SUPPORTED  */
+        /* Enable wakeup by devices on usb bus (e.g. wakeup
-        /* unsigned remote_wakeup_connected:1; */
+           by attachment/detachment or by device activity
-        /* Wakeup by devices on usb bus enabled */
+           such as moving a mouse). When chosen, this option
+           prevents stopping internal clock, increasing
+           thereby power consumption in suspended state. */
        unsigned remote_wakeup_enable:1;
-        /* Switch or not to switch (keep always powered) */
-        unsigned no_power_switching:1;
-        /* Ganged port power switching (0) or individual port
-           power switching (1) */
-        unsigned power_switching_mode:1;
-        /* Given port_power, msec/2 after power on till power good */
-        u8 potpg;
-        /* Hardware reset set/clear. If implemented, this function must:
-           if set == 0,   deassert chip's HW reset pin
-           otherwise,     assert chip's HW reset pin       */
-        void (*reset) (struct device * dev, int set);
-        /* Hardware clock start/stop. If implemented, this function must:
-           if start == 0,    stop the external clock
-           otherwise,        start the external clock
-         */
-        void (*clock) (struct device * dev, int start);
        /* Inter-io delay (ns). The chip is picky about access timings; it
           expects at least:
           150ns delay between consecutive accesses to DATA_REG,

diff --git a/include/linux/usb_isp116x.h b/include/linux/usb_isp116x.h index 5f5a9d9bd6c2..436dd8a2b64a 100644 --- a/include/linux/usb_isp116x.h +++ b/include/linux/usb_isp116x.h
@@ -7,36 +7,18 @@
7	struct isp116x_platform_data {	7	struct isp116x_platform_data {
8	/* Enable internal resistors on downstream ports */	8	/* Enable internal resistors on downstream ports */
9	unsigned sel15Kres:1;	9	unsigned sel15Kres:1;
10	/* Chip's internal clock won't be stopped in suspended state.	10	/* On-chip overcurrent detection */
11	Setting/unsetting this bit takes effect only if
12	'remote_wakeup_enable' below is not set. */
13	unsigned clknotstop:1;
14	/* On-chip overcurrent protection */
15	unsigned oc_enable:1;	11	unsigned oc_enable:1;
16	/* INT output polarity */	12	/* INT output polarity */
17	unsigned int_act_high:1;	13	unsigned int_act_high:1;
18	/* INT edge or level triggered */	14	/* INT edge or level triggered */
19	unsigned int_edge_triggered:1;	15	unsigned int_edge_triggered:1;
20	/* WAKEUP pin connected - NOT SUPPORTED */	16	/* Enable wakeup by devices on usb bus (e.g. wakeup
21	/* unsigned remote_wakeup_connected:1; */	17	by attachment/detachment or by device activity
22	/* Wakeup by devices on usb bus enabled */	18	such as moving a mouse). When chosen, this option
		19	prevents stopping internal clock, increasing
		20	thereby power consumption in suspended state. */
23	unsigned remote_wakeup_enable:1;	21	unsigned remote_wakeup_enable:1;
24	/* Switch or not to switch (keep always powered) */
25	unsigned no_power_switching:1;
26	/* Ganged port power switching (0) or individual port
27	power switching (1) */
28	unsigned power_switching_mode:1;
29	/* Given port_power, msec/2 after power on till power good */
30	u8 potpg;
31	/* Hardware reset set/clear. If implemented, this function must:
32	if set == 0, deassert chip's HW reset pin
33	otherwise, assert chip's HW reset pin */
34	void (reset) (struct device dev, int set);
35	/* Hardware clock start/stop. If implemented, this function must:
36	if start == 0, stop the external clock
37	otherwise, start the external clock
38	*/
39	void (clock) (struct device dev, int start);
40	/* Inter-io delay (ns). The chip is picky about access timings; it	22	/* Inter-io delay (ns). The chip is picky about access timings; it
41	expects at least:	23	expects at least:
42	150ns delay between consecutive accesses to DATA_REG,	24	150ns delay between consecutive accesses to DATA_REG,