Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] USB: isp116x-hcd: remove clock() and reset()

Browse source 
This patch removes support for user-provided platform-specific hardware reset
and clock starting/stopping functions. Hardware reset was needed earlier as
getting the software reset working was tricky due to the lack of documentation.
Recently, a number of people using isp116x have said the software reset is
working for them.

I haven't heard of anybody using the clock starting/stopping.

Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Olav Kongas 2005-08-04 17:02:54 +03:00 committed by Greg Kroah-Hartman
parent 9d233d9fae
commit f8d23d3098
2 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/usb/host/isp116x-hcd.c
View file

@ -1463,10 +1463,6 @@ static int isp116x_sw_reset(struct isp116x *isp116x)
return ret; return ret;
} }
/*
Reset. Tries to perform platform-specific hardware
reset first; falls back to software reset.
*/
static int isp116x_reset(struct usb_hcd *hcd) static int isp116x_reset(struct usb_hcd *hcd)
{ {
struct isp116x *isp116x = hcd_to_isp116x(hcd); struct isp116x *isp116x = hcd_to_isp116x(hcd);
@ -1474,17 +1470,7 @@ static int isp116x_reset(struct usb_hcd *hcd)
u16 clkrdy = 0; u16 clkrdy = 0;
int ret = 0, timeout = 15 /* ms */ ; int ret = 0, timeout = 15 /* ms */ ;
if (isp116x->board && isp116x->board->reset) { ret = isp116x_sw_reset(isp116x);
/* Hardware reset */
isp116x->board->reset(hcd->self.controller, 1);
msleep(10);
if (isp116x->board->clock)
isp116x->board->clock(hcd->self.controller, 1);
msleep(1);
isp116x->board->reset(hcd->self.controller, 0);
} else
ret = isp116x_sw_reset(isp116x);
if (ret) if (ret)
return ret; return ret;
@ -1501,10 +1487,7 @@ static int isp116x_reset(struct usb_hcd *hcd)
ERR("Clock not ready after 20ms\n"); ERR("Clock not ready after 20ms\n");
/* After sw_reset the clock won't report to be ready, if /* After sw_reset the clock won't report to be ready, if
H_WAKEUP pin is high. */ H_WAKEUP pin is high. */
if (!isp116x->board || !isp116x->board->reset) ERR("Please make sure that the H_WAKEUP pin is pulled low!\n");
ERR("The driver does not support hardware wakeup.\n");
ERR("Please make sure that the H_WAKEUP pin "
"is pulled low!\n");
ret = -ENODEV; ret = -ENODEV;
} }
return ret; return ret;
@ -1527,15 +1510,7 @@ static void isp116x_stop(struct usb_hcd *hcd)
isp116x_write_reg32(isp116x, HCRHSTATUS, RH_HS_LPS); isp116x_write_reg32(isp116x, HCRHSTATUS, RH_HS_LPS);
spin_unlock_irqrestore(&isp116x->lock, flags); spin_unlock_irqrestore(&isp116x->lock, flags);
/* Put the chip into reset state */ isp116x_sw_reset(isp116x);
if (isp116x->board && isp116x->board->reset)
isp116x->board->reset(hcd->self.controller, 0);
else
isp116x_sw_reset(isp116x);
/* Stop the clock */
if (isp116x->board && isp116x->board->clock)
isp116x->board->clock(hcd->self.controller, 0);
} }
/* /*

9
include/linux/usb_isp116x.h
View file

@ -19,15 +19,6 @@ struct isp116x_platform_data {
prevents stopping internal clock, increasing prevents stopping internal clock, increasing
thereby power consumption in suspended state. */ thereby power consumption in suspended state. */
unsigned remote_wakeup_enable:1; unsigned remote_wakeup_enable:1;
/* 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 /* Inter-io delay (ns). The chip is picky about access timings; it
expects at least: expects at least:
150ns delay between consecutive accesses to DATA_REG, 150ns delay between consecutive accesses to DATA_REG,