Commit b11633c4 authored by Dinh Nguyen's avatar Dinh Nguyen Committed by Felipe Balbi

usb: dwc2: disable erroneous overcurrent condition

For the case where an external VBUS is used, we should enable the external
VBUS comparator in the driver. This would prevent an unnecessary
overcurrent error which would then disable the host port.

This patch uses the standard 'disable-over-current' binding to allow of the
option of disabling the over-current condition.
Reviewed-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 32428aa2
...@@ -395,6 +395,9 @@ enum dwc2_ep0_state { ...@@ -395,6 +395,9 @@ enum dwc2_ep0_state {
* (default when phy_type is UTMI+ or ULPI) * (default when phy_type is UTMI+ or ULPI)
* 1 - 6 MHz * 1 - 6 MHz
* (default when phy_type is Full Speed) * (default when phy_type is Full Speed)
* @oc_disable: Flag to disable overcurrent condition.
* 0 - Allow overcurrent condition to get detected
* 1 - Disable overcurrent condtion to get detected
* @ts_dline: Enable Term Select Dline pulsing * @ts_dline: Enable Term Select Dline pulsing
* 0 - No (default) * 0 - No (default)
* 1 - Yes * 1 - Yes
...@@ -492,6 +495,7 @@ struct dwc2_core_params { ...@@ -492,6 +495,7 @@ struct dwc2_core_params {
bool dma_desc_fs_enable; bool dma_desc_fs_enable;
bool host_support_fs_ls_low_power; bool host_support_fs_ls_low_power;
bool host_ls_low_power_phy_clk; bool host_ls_low_power_phy_clk;
bool oc_disable;
u8 host_channels; u8 host_channels;
u16 host_rx_fifo_size; u16 host_rx_fifo_size;
......
...@@ -213,6 +213,11 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy) ...@@ -213,6 +213,11 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
usbcfg &= ~(GUSBCFG_PHYIF16 | GUSBCFG_DDRSEL); usbcfg &= ~(GUSBCFG_PHYIF16 | GUSBCFG_DDRSEL);
if (hsotg->params.phy_ulpi_ddr) if (hsotg->params.phy_ulpi_ddr)
usbcfg |= GUSBCFG_DDRSEL; usbcfg |= GUSBCFG_DDRSEL;
/* Set external VBUS indicator as needed. */
if (hsotg->params.oc_disable)
usbcfg |= (GUSBCFG_ULPI_INT_VBUS_IND |
GUSBCFG_INDICATORPASSTHROUGH);
break; break;
case DWC2_PHY_TYPE_PARAM_UTMI: case DWC2_PHY_TYPE_PARAM_UTMI:
/* UTMI+ interface */ /* UTMI+ interface */
......
...@@ -346,6 +346,9 @@ static void dwc2_get_device_properties(struct dwc2_hsotg *hsotg) ...@@ -346,6 +346,9 @@ static void dwc2_get_device_properties(struct dwc2_hsotg *hsotg)
num); num);
} }
} }
if (of_find_property(hsotg->dev->of_node, "disable-over-current", NULL))
p->oc_disable = true;
} }
static void dwc2_check_param_otg_cap(struct dwc2_hsotg *hsotg) static void dwc2_check_param_otg_cap(struct dwc2_hsotg *hsotg)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment