diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c
index c58388c639eaddc1b9819d25e04a60473ca1b589..10b2e132eb07359b0e863a5714fa05621b99dde9 100644
--- a/drivers/usb/gadget/bcm_udc_otg_phy.c
+++ b/drivers/usb/gadget/bcm_udc_otg_phy.c
@@ -9,7 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
 
-#include "s3c_udc_otg_priv.h"
+#include "dwc2_udc_otg_priv.h"
 #include "bcm_udc_otg.h"
 
 void otg_phy_init(struct dwc2_udc *dev)
diff --git a/drivers/usb/gadget/s3c_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
similarity index 95%
rename from drivers/usb/gadget/s3c_udc_otg_priv.h
rename to drivers/usb/gadget/dwc2_udc_otg_priv.h
index fb3a019e031798c61009882d6a58acc060daaf5a..1dcb277ad3e72d475e896af61c650ff641b704fd 100644
--- a/drivers/usb/gadget/s3c_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef __S3C_UDC_OTG_PRIV__
-#define __S3C_UDC_OTG_PRIV__
+#ifndef __DWC2_UDC_OTG_PRIV__
+#define __DWC2_UDC_OTG_PRIV__
 
 #include <asm/errno.h>
 #include <linux/sizes.h>
@@ -95,4 +95,4 @@ struct dwc2_udc {
 void otg_phy_init(struct dwc2_udc *dev);
 void otg_phy_off(struct dwc2_udc *dev);
 
-#endif	/* __S3C_UDC_OTG_PRIV__ */
+#endif	/* __DWC2_UDC_OTG_PRIV__ */
diff --git a/drivers/usb/gadget/s3c_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h
similarity index 100%
rename from drivers/usb/gadget/s3c_udc_otg_regs.h
rename to drivers/usb/gadget/dwc2_udc_otg_regs.h
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 9cb6849ada8e4dd7ca6281ddf6898ef46a2ec132..0bff63f2f166675a13725a05e80cf5d6a0f5a24c 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -32,8 +32,8 @@
 
 #include <asm/mach-types.h>
 
-#include "s3c_udc_otg_regs.h"
-#include "s3c_udc_otg_priv.h"
+#include "dwc2_udc_otg_regs.h"
+#include "dwc2_udc_otg_priv.h"
 #include <usb/lin_gadget_compat.h>
 
 /***********************************************************/
diff --git a/drivers/usb/gadget/s3c_udc_otg_phy.c b/drivers/usb/gadget/s3c_udc_otg_phy.c
index a761b43b12dcd241b59aa80f4e77ad3d6c784c8e..ab7515bb56fa7bd88b04f7fd8dfc3a06da74bccd 100644
--- a/drivers/usb/gadget/s3c_udc_otg_phy.c
+++ b/drivers/usb/gadget/s3c_udc_otg_phy.c
@@ -32,8 +32,8 @@
 
 #include <asm/mach-types.h>
 
-#include "s3c_udc_otg_regs.h"
-#include "s3c_udc_otg_priv.h"
+#include "dwc2_udc_otg_regs.h"
+#include "dwc2_udc_otg_priv.h"
 #include <usb/lin_gadget_compat.h>
 
 #include <usb/s3c_udc.h>