usb: dwc3: Fix OTG driver to work with v5.10 kernel

Modify the OTG driver to make it work with v5.10 kernel. Update Makefile to include compilation of the dependent drivers as well. Signed-off-by: Manish Narani <manish.narani@xilinx.com> State: Not-upstreamable
Xilinx · Feb 1, 2022 · 833d0bb · 833d0bb
1 parent d0fdd1b
commit 833d0bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
@@ -15,7 +15,8 @@ ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)\
 	dwc3-y				+= host.o
 endif
 
-ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
+ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)\
+		 $(CONFIG_USB_DWC3_OTG)),)
 	dwc3-y				+= gadget.o ep0.o gadget_hibernation.o
 endif
 

diff --git a/drivers/usb/dwc3/otg.c b/drivers/usb/dwc3/otg.c
@@ -1972,7 +1972,7 @@ static ssize_t store_hnp(struct device *dev, struct device_attribute *attr,
 	}
 
 	dev_info(dev, "b_hnp_enable is FALSE\n");
-	dwc->gadget.host_request_flag = 1;
+	dwc->gadget->host_request_flag = 1;
 
 	usb_put_phy(phy);
 	return count;