Selaa lähdekoodia

[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>
Olav Kongas 20 vuotta sitten
vanhempi
commit
9d233d9fae
2 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 2 0
      drivers/usb/host/isp116x-hcd.c
  2. 1 1
      include/linux/usb_isp116x.h

+ 2 - 0
drivers/usb/host/isp116x-hcd.c

@@ -1585,6 +1585,8 @@ static int isp116x_start(struct usb_hcd *hcd)
 	   be always set. Yet, instead, we request individual port
 	   be always set. Yet, instead, we request individual port
 	   power switching. */
 	   power switching. */
 	val |= RH_A_PSM;
 	val |= RH_A_PSM;
+	/* Report overcurrent per port */
+	val |= RH_A_OCPM;
 	isp116x_write_reg32(isp116x, HCRHDESCA, val);
 	isp116x_write_reg32(isp116x, HCRHDESCA, val);
 	isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA);
 	isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA);
 
 

+ 1 - 1
include/linux/usb_isp116x.h

@@ -7,7 +7,7 @@
 struct isp116x_platform_data {
 struct isp116x_platform_data {
 	/* Enable internal resistors on downstream ports */
 	/* Enable internal resistors on downstream ports */
 	unsigned sel15Kres:1;
 	unsigned sel15Kres:1;
-	/* On-chip overcurrent protection */
+	/* On-chip overcurrent detection */
 	unsigned oc_enable:1;
 	unsigned oc_enable:1;
 	/* INT output polarity */
 	/* INT output polarity */
 	unsigned int_act_high:1;
 	unsigned int_act_high:1;