From 5d5716eebccaa9b9ab977b7d5a9fae2abb7a8829 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 4 Dec 2015 02:51:20 +0100 Subject: usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h The driver is actually for the Designware DWC2 controller. This patch renames the global s3c_udc.h header to dwc2_udc.h. The rename is done automatically: $ sed -i "s/s3c_udc\.h/dwc2_udc.h/g" \ `git grep "s3c_udc\.h" | cut -d : -f 1` Signed-off-by: Marek Vasut --- board/altera/arria5-socdk/socfpga.c | 2 +- board/altera/cyclone5-socdk/socfpga.c | 2 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 2 +- board/denx/mcvevk/socfpga.c | 2 +- board/ebv/socrates/socfpga.c | 2 +- board/samsung/goni/goni.c | 2 +- board/samsung/odroid/odroid.c | 2 +- board/samsung/trats/trats.c | 2 +- board/samsung/trats2/trats2.c | 2 +- board/samsung/universal_c210/universal.c | 2 +- board/terasic/sockit/socfpga.c | 2 +- drivers/usb/gadget/dwc2_udc_otg.c | 2 +- drivers/usb/gadget/dwc2_udc_otg_phy.c | 2 +- drivers/usb/gadget/dwc2_udc_otg_priv.h | 2 +- include/usb/dwc2_udc.h | 25 +++++++++++++++++++++++++ include/usb/s3c_udc.h | 25 ------------------------- 16 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 include/usb/dwc2_udc.h delete mode 100644 include/usb/s3c_udc.h diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c index e640d8cccf..0fbbc3456c 100644 --- a/board/altera/arria5-socdk/socfpga.c +++ b/board/altera/arria5-socdk/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/board/altera/cyclone5-socdk/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c index e640d8cccf..0fbbc3456c 100644 --- a/board/altera/cyclone5-socdk/socfpga.c +++ b/board/altera/cyclone5-socdk/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c index 09397fc55b..b3a4a4144d 100644 --- a/board/broadcom/bcm28155_ap/bcm28155_ap.c +++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #define SECWATCHDOG_SDOGCR_OFFSET 0x00000000 diff --git a/board/denx/mcvevk/socfpga.c b/board/denx/mcvevk/socfpga.c index 3870b0b2af..0f93722dfb 100644 --- a/board/denx/mcvevk/socfpga.c +++ b/board/denx/mcvevk/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/ebv/socrates/socfpga.c b/board/ebv/socrates/socfpga.c index e640d8cccf..0fbbc3456c 100644 --- a/board/ebv/socrates/socfpga.c +++ b/board/ebv/socrates/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 2725a46858..1600568193 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index a3ee159d3e..b4cb33240e 100644 --- a/board/samsung/odroid/odroid.c +++ b/board/samsung/odroid/odroid.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include "setup.h" diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 6f711a8c64..54d01ec439 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index dd7a606838..7b28ae8cc7 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 0c1b9d820a..c25b486f4a 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c index e640d8cccf..0fbbc3456c 100644 --- a/board/terasic/sockit/socfpga.c +++ b/board/terasic/sockit/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index ad9ed33a65..ffe2952f56 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -46,7 +46,7 @@ #define DEBUG_OUT_EP 0 #define DEBUG_IN_EP 0 -#include +#include #define EP0_CON 0 #define EP_MASK 0xF diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c index d3e9840585..e0cbbc0757 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_phy.c +++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c @@ -36,7 +36,7 @@ #include "dwc2_udc_otg_priv.h" #include -#include +#include void otg_phy_init(struct dwc2_udc *dev) { diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h index c5e9dc29d8..b2c1fc4105 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_priv.h +++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include /*-------------------------------------------------------------------------*/ /* DMA bounce buffer size, 16K is enough even for mass storage */ diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h new file mode 100644 index 0000000000..302e9a35a2 --- /dev/null +++ b/include/usb/dwc2_udc.h @@ -0,0 +1,25 @@ +/* + * drivers/usb/gadget/dwc2_udc.h + * Designware DWC2 on-chip full/high speed USB device controllers + * Copyright (C) 2005 for Samsung Electronics + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __DWC2_USB_GADGET +#define __DWC2_USB_GADGET + +#define PHY0_SLEEP (1 << 5) + +struct dwc2_plat_otg_data { + int (*phy_control)(int on); + unsigned int regs_phy; + unsigned int regs_otg; + unsigned int usb_phy_ctrl; + unsigned int usb_flags; + unsigned int usb_gusbcfg; +}; + +int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata); + +#endif /* __DWC2_USB_GADGET */ diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h deleted file mode 100644 index 9bc1aad9a7..0000000000 --- a/include/usb/s3c_udc.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * drivers/usb/gadget/s3c_udc.h - * Designware DWC2 on-chip full/high speed USB device controllers - * Copyright (C) 2005 for Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __S3C_USB_GADGET -#define __S3C_USB_GADGET - -#define PHY0_SLEEP (1 << 5) - -struct dwc2_plat_otg_data { - int (*phy_control)(int on); - unsigned int regs_phy; - unsigned int regs_otg; - unsigned int usb_phy_ctrl; - unsigned int usb_flags; - unsigned int usb_gusbcfg; -}; - -int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata); - -#endif -- cgit v1.2.1