diff options
author | Olav Kongas <ok@artecdesign.ee> | 2005-08-04 09:54:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-08 19:22:48 -0400 |
commit | 9d233d9faedfd8a4ee22288c1fdc698a6f75db21 (patch) | |
tree | 9787e48aa6c0c10e44e306b9a0bd1e5b25bf5d03 | |
parent | 165c0f39390212d7a517b80c3bb61cb8f1782fef (diff) |
[PATCH] USB: isp116x-hcd: per-port overcurrent reporting
This patch sets the isp116x to report overcurrent always per-port.
Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 2 | ||||
-rw-r--r-- | include/linux/usb_isp116x.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index a3e881c60026..aeddef7a12af 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -1585,6 +1585,8 @@ static int isp116x_start(struct usb_hcd *hcd) | |||
1585 | be always set. Yet, instead, we request individual port | 1585 | be always set. Yet, instead, we request individual port |
1586 | power switching. */ | 1586 | power switching. */ |
1587 | val |= RH_A_PSM; | 1587 | val |= RH_A_PSM; |
1588 | /* Report overcurrent per port */ | ||
1589 | val |= RH_A_OCPM; | ||
1588 | isp116x_write_reg32(isp116x, HCRHDESCA, val); | 1590 | isp116x_write_reg32(isp116x, HCRHDESCA, val); |
1589 | isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA); | 1591 | isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA); |
1590 | 1592 | ||
diff --git a/include/linux/usb_isp116x.h b/include/linux/usb_isp116x.h index c028d724be94..8f0b3c226968 100644 --- a/include/linux/usb_isp116x.h +++ b/include/linux/usb_isp116x.h | |||
@@ -7,7 +7,7 @@ | |||
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 | /* On-chip overcurrent protection */ | 10 | /* On-chip overcurrent detection */ |
11 | unsigned oc_enable:1; | 11 | unsigned oc_enable:1; |
12 | /* INT output polarity */ | 12 | /* INT output polarity */ |
13 | unsigned int_act_high:1; | 13 | unsigned int_act_high:1; |