Revert "usb: dwc2: don't use ID/Vbus detection if usb-role-switch on STM32MP15 SoCs"

This reverts commit 916f8b627288039d9e771a9b2ab1b3c79b303039.

This was not meant to be applied as-is at the moment.

Cc: Minas Harutyunyan <hminas@synopsys.com>
Cc: Amelie Delaunay <amelie.delaunay@st.com>
Cc: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index bd792c9cdef9875169e2d46f3fb685b1875ea954..8f9d061c4d5fa641185e5bcf114af7625ecb085b 100644 (file)
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -183,11 +183,9 @@ static void dwc2_set_stm32mp15_fsotg_params(struct dwc2_hsotg *hsotg)
 static void dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg)
 {
        struct dwc2_core_params *p = &hsotg->params;
-       struct device_node *np = hsotg->dev->of_node;
 
        p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
-       p->activate_stm_id_vb_detection =
-               !of_property_read_bool(np, "usb-role-switch");
+       p->activate_stm_id_vb_detection = true;
        p->host_rx_fifo_size = 440;
        p->host_nperio_tx_fifo_size = 256;
        p->host_perio_tx_fifo_size = 256;