usb: s3c-otg: Rename driver to dwc2-otg

PATCH New Marek Vasut 2 participants 40 messages Dec 4, 2015 – Dec 15, 2015

Subsystems (4)

USB Arm Samsung Exynos Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture

lore

Share & tools

lore

Marek Vasut

author

2015-12-04 02:37 UTC #0 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

The driver is for the dwc2 otg block , so rename it accordingly finally.

Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
usb: s3c-otg: Split private bits from s3c_udc.h
usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG*
usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h

 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205 +++++++++++----------
 .../{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c}      |  21 ++-
 .../usb/gadget/dwc2_udc_otg_priv.h                 |  43 ++---
 .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} |  32 ++--
 ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202 ++++++++++----------
 include/configs/bcm28155_ap.h                      |   2 +-
 include/configs/exynos4-common.h                   |   4 +-
 include/configs/s5p_goni.h                         |   4 +-
 include/configs/s5pc210_universal.h                |   4 +-
 include/configs/smdkv310.h                         |   4 +-
 include/configs/socfpga_common.h                   |   2 +-
 include/usb/dwc2_udc.h                             |  23 +++
 25 files changed, 319 insertions(+), 307 deletions(-)
 rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%)
 rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%)
 rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%)
 rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%)
 rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%)
 create mode 100644 include/usb/dwc2_udc.h

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:37 UTC #1 lore raw

PATCH 1/24 usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h

Rename the header file, so it's obvious which driver it's part of. No functional change.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c                      | 2 +-
 drivers/usb/gadget/s3c_udc_otg_phy.c                  | 2 +-
 drivers/usb/gadget/{regs-otg.h => s3c_udc_otg_regs.h} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename drivers/usb/gadget/{regs-otg.h => s3c_udc_otg_regs.h} (100%)

drivers/usb/gadget/s3c_udc_otg.c +1 -1

index 7a2d1e7..184ff4e 100644
@@ -32,7 +32,7 @@
 
 #include <asm/mach-types.h>
 
-#include "regs-otg.h"
+#include "s3c_udc_otg_regs.h"
 #include <usb/lin_gadget_compat.h>
 
 /***********************************************************/

drivers/usb/gadget/s3c_udc_otg_phy.c +1 -1

index f13cb89..963b617 100644
@@ -32,7 +32,7 @@
 
 #include <asm/mach-types.h>
 
-#include "regs-otg.h"
+#include "s3c_udc_otg_regs.h"
 #include <usb/lin_gadget_compat.h>
 
 #include <usb/s3c_udc.h>

drivers/usb/gadget/s3c_udc_otg_regs.h renamed from drivers/usb/gadget/regs-otg.h +0 -0

similarity index 100%
rename from drivers/usb/gadget/regs-otg.h
rename to drivers/usb/gadget/s3c_udc_otg_regs.h

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #2 lore raw

PATCH 2/24 usb: s3c-otg: Rename struct s3c_udc to dwc2_udc

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames struct s3c_udc to struct dwc2_udc to make things more obvious and clear.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/bcm_udc_otg_phy.c      |  4 +--
 drivers/usb/gadget/s3c_udc_otg.c          | 46 +++++++++++++++----------------
 drivers/usb/gadget/s3c_udc_otg_phy.c      |  4 +--
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 38 ++++++++++++-------------
 include/usb/s3c_udc.h                     | 10 +++----
 5 files changed, 51 insertions(+), 51 deletions(-)

drivers/usb/gadget/bcm_udc_otg_phy.c +2 -2

index f8690b0..936247e 100644
@@ -12,7 +12,7 @@
 #include <usb/s3c_udc.h>
 #include "bcm_udc_otg.h"
 
-void otg_phy_init(struct s3c_udc *dev)
+void otg_phy_init(struct dwc2_udc *dev)
 {
 	/* set Phy to driving mode */
 	wfld_clear(HSOTG_CTRL_BASE_ADDR + HSOTG_CTRL_PHY_P1CTL_OFFSET,

@@ -37,7 +37,7 @@ void otg_phy_init(struct s3c_udc *dev)
 		 HSOTG_CTRL_PHY_P1CTL_SOFT_RESET_MASK);
 }
 
-void otg_phy_off(struct s3c_udc *dev)
+void otg_phy_off(struct dwc2_udc *dev)
 {
 	/* Soft Disconnect */
 	wfld_set(HSOTG_BASE_ADDR + HSOTG_DCTL_OFFSET,

drivers/usb/gadget/s3c_udc_otg.c +23 ~~-23~~

133 lines not on this page · raw message

drivers/usb/gadget/s3c_udc_otg_phy.c +2 -2

index 963b617..ffc930c 100644
@@ -37,7 +37,7 @@
 
 #include <usb/s3c_udc.h>
 
-void otg_phy_init(struct s3c_udc *dev)
+void otg_phy_init(struct dwc2_udc *dev)
 {
 	unsigned int usb_phy_ctrl = dev->pdata->usb_phy_ctrl;
 	struct s3c_usbotg_phy *phy =

@@ -75,7 +75,7 @@ void otg_phy_init(struct s3c_udc *dev)
 	udelay(10);
 }
 
-void otg_phy_off(struct s3c_udc *dev)
+void otg_phy_off(struct dwc2_udc *dev)
 {
 	unsigned int usb_phy_ctrl = dev->pdata->usb_phy_ctrl;
 	struct s3c_usbotg_phy *phy =

drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +19 ~~-19~~

index 7e7a2c2..6695444 100644
@@ -25,7 +25,7 @@ int clear_feature_flag;
 #define GET_MAX_LUN_REQUEST	0xFE
 #define BOT_RESET_REQUEST	0xFF
 
-static inline void s3c_udc_ep0_zlp(struct s3c_udc *dev)
+static inline void s3c_udc_ep0_zlp(struct dwc2_udc *dev)
 {
 	u32 ep_ctrl;

@@ -186,7 +186,7 @@ int setdma_tx(struct s3c_ep *ep, struct s3c_request *req)
 	return length;
 }
 
-static void complete_rx(struct s3c_udc *dev, u8 ep_num)
+static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
 {
 	struct s3c_ep *ep = &dev->ep[ep_num];
 	struct s3c_request *req = NULL;

@@ -259,7 +259,7 @@ static void complete_rx(struct s3c_udc *dev, u8 ep_num)
 		setdma_rx(ep, req);
 }
 
-static void complete_tx(struct s3c_udc *dev, u8 ep_num)
+static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
 {
 	struct s3c_ep *ep = &dev->ep[ep_num];
 	struct s3c_request *req;

@@ -335,7 +335,7 @@ static void complete_tx(struct s3c_udc *dev, u8 ep_num)
 	}
 }
 
-static inline void s3c_udc_check_tx_queue(struct s3c_udc *dev, u8 ep_num)
+static inline void s3c_udc_check_tx_queue(struct dwc2_udc *dev, u8 ep_num)
 {
 	struct s3c_ep *ep = &dev->ep[ep_num];
 	struct s3c_request *req;

@@ -362,7 +362,7 @@ static inline void s3c_udc_check_tx_queue(struct s3c_udc *dev, u8 ep_num)
 
 }
 
-static void process_ep_in_intr(struct s3c_udc *dev)
+static void process_ep_in_intr(struct dwc2_udc *dev)
 {
 	u32 ep_intr, ep_intr_status;
 	u8 ep_num = 0;

@@ -409,7 +409,7 @@ static void process_ep_in_intr(struct s3c_udc *dev)
 	}
 }
 
-static void process_ep_out_intr(struct s3c_udc *dev)
+static void process_ep_out_intr(struct dwc2_udc *dev)
 {
 	u32 ep_intr, ep_intr_status;
 	u8 ep_num = 0;

@@ -463,7 +463,7 @@ static void process_ep_out_intr(struct s3c_udc *dev)
  */
 static int s3c_udc_irq(int irq, void *_dev)
 {
-	struct s3c_udc *dev = _dev;
+	struct dwc2_udc *dev = _dev;
 	u32 intr_status;
 	u32 usb_status, gintmsk;
 	unsigned long flags = 0;

@@ -584,7 +584,7 @@ static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
 {
 	struct s3c_request *req;
 	struct s3c_ep *ep;
-	struct s3c_udc *dev;
+	struct dwc2_udc *dev;
 	unsigned long flags = 0;
 	u32 ep_num, gintsts;

@@ -737,7 +737,7 @@ int s3c_fifo_read(struct s3c_ep *ep, u32 *cp, int max)
  * Called from control endpoint function
  * after it decodes a set address setup packet.
  */
-static void udc_set_address(struct s3c_udc *dev, unsigned char address)
+static void udc_set_address(struct dwc2_udc *dev, unsigned char address)
 {
 	u32 ctrl = readl(&reg->dcfg);
 	writel(DEVICE_ADDRESS(address) | ctrl, &reg->dcfg);

@@ -753,7 +753,7 @@ static void udc_set_address(struct s3c_udc *dev, unsigned char address)
 
 static inline void s3c_udc_ep0_set_stall(struct s3c_ep *ep)
 {
-	struct s3c_udc *dev;
+	struct dwc2_udc *dev;
 	u32		ep_ctrl = 0;
 
 	dev = ep->dev;

@@ -779,7 +779,7 @@ static inline void s3c_udc_ep0_set_stall(struct s3c_ep *ep)
 	s3c_udc_pre_setup();
 }
 
-static void s3c_ep0_read(struct s3c_udc *dev)
+static void s3c_ep0_read(struct dwc2_udc *dev)
 {
 	struct s3c_request *req;
 	struct s3c_ep *ep = &dev->ep[0];

@@ -816,7 +816,7 @@ static void s3c_ep0_read(struct s3c_udc *dev)
 /*
  * DATA_STATE_XMIT
  */
-static int s3c_ep0_write(struct s3c_udc *dev)
+static int s3c_ep0_write(struct dwc2_udc *dev)
 {
 	struct s3c_request *req;
 	struct s3c_ep *ep = &dev->ep[0];

@@ -859,7 +859,7 @@ static int s3c_ep0_write(struct s3c_udc *dev)
 	return 1;
 }
 
-int s3c_udc_get_status(struct s3c_udc *dev,
+int s3c_udc_get_status(struct dwc2_udc *dev,
 		struct usb_ctrlrequest *crq)
 {
 	u8 ep_num = crq->wIndex & 0x7F;

@@ -1032,7 +1032,7 @@ void s3c_udc_ep_clear_stall(struct s3c_ep *ep)
 static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
 {
 	struct s3c_ep	*ep;
-	struct s3c_udc	*dev;
+	struct dwc2_udc	*dev;
 	unsigned long	flags = 0;
 	u8		ep_num;

@@ -1125,7 +1125,7 @@ void s3c_udc_ep_activate(struct s3c_ep *ep)
 
 static int s3c_udc_clear_feature(struct usb_ep *_ep)
 {
-	struct s3c_udc	*dev;
+	struct dwc2_udc	*dev;
 	struct s3c_ep	*ep;
 	u8		ep_num;

@@ -1189,7 +1189,7 @@ static int s3c_udc_clear_feature(struct usb_ep *_ep)
 
 static int s3c_udc_set_feature(struct usb_ep *_ep)
 {
-	struct s3c_udc	*dev;
+	struct dwc2_udc	*dev;
 	struct s3c_ep	*ep;
 	u8		ep_num;

@@ -1262,7 +1262,7 @@ static int s3c_udc_set_feature(struct usb_ep *_ep)
 /*
  * WAIT_FOR_SETUP (OUT_PKT_RDY)
  */
-void s3c_ep0_setup(struct s3c_udc *dev)
+void s3c_ep0_setup(struct dwc2_udc *dev)
 {
 	struct s3c_ep *ep = &dev->ep[0];
 	int i;

@@ -1451,7 +1451,7 @@ void s3c_ep0_setup(struct s3c_udc *dev)
 /*
  * handle ep0 interrupt
  */
-static void s3c_handle_ep0(struct s3c_udc *dev)
+static void s3c_handle_ep0(struct dwc2_udc *dev)
 {
 	if (dev->ep0state == WAIT_FOR_SETUP) {
 		debug_cond(DEBUG_OUT_EP != 0,

@@ -1465,7 +1465,7 @@ static void s3c_handle_ep0(struct s3c_udc *dev)
 	}
 }
 
-static void s3c_ep0_kick(struct s3c_udc *dev, struct s3c_ep *ep)
+static void s3c_ep0_kick(struct dwc2_udc *dev, struct s3c_ep *ep)
 {
 	debug_cond(DEBUG_EP0 != 0,
 		   "%s: ep_is_in = %d\n", __func__, ep_is_in(ep));

include/usb/s3c_udc.h +5 -5

index 7f49a4e..f6c3a86 100644
@@ -55,7 +55,7 @@ enum ep_type {
 
 struct s3c_ep {
 	struct usb_ep ep;
-	struct s3c_udc *dev;
+	struct dwc2_udc *dev;
 
 	const struct usb_endpoint_descriptor *desc;
 	struct list_head queue;

@@ -76,7 +76,7 @@ struct s3c_request {
 	struct list_head queue;
 };
 
-struct s3c_udc {
+struct dwc2_udc {
 	struct usb_gadget gadget;
 	struct usb_gadget_driver *driver;

@@ -90,14 +90,14 @@ struct s3c_udc {
 	unsigned req_pending:1, req_std:1;
 };
 
-extern struct s3c_udc *the_controller;
+extern struct dwc2_udc *the_controller;
 
 #define ep_is_in(EP) (((EP)->bEndpointAddress&USB_DIR_IN) == USB_DIR_IN)
 #define ep_index(EP) ((EP)->bEndpointAddress&0xF)
 #define ep_maxpacket(EP) ((EP)->ep.maxpacket)
 
-extern void otg_phy_init(struct s3c_udc *dev);
-extern void otg_phy_off(struct s3c_udc *dev);
+extern void otg_phy_init(struct dwc2_udc *dev);
+extern void otg_phy_off(struct dwc2_udc *dev);
 
 extern void s3c_udc_ep_set_stall(struct s3c_ep *ep);
 extern int s3c_udc_probe(struct s3c_plat_otg_data *pdata);

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #3 lore raw

PATCH 3/24 usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames struct s3c_usbotg_reg to struct dwc2_usbotg_reg to make things more obvious and clear.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c      | 4 ++--
 drivers/usb/gadget/s3c_udc_otg_regs.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/usb/gadget/s3c_udc_otg.c +2 -2

index eb7f77e..00d03f3 100644
@@ -144,7 +144,7 @@ static struct usb_ep_ops s3c_ep_ops = {
 /***********************************************************/
 
 void __iomem		*regs_otg;
-struct s3c_usbotg_reg *reg;
+struct dwc2_usbotg_reg *reg;
 
 bool dfu_usb_get_reset(void)
 {

@@ -805,7 +805,7 @@ int s3c_udc_probe(struct s3c_plat_otg_data *pdata)
 
 	dev->pdata = pdata;
 
-	reg = (struct s3c_usbotg_reg *)pdata->regs_otg;
+	reg = (struct dwc2_usbotg_reg *)pdata->regs_otg;
 
 	/* regs_otg = (void *)pdata->regs_otg; */

drivers/usb/gadget/s3c_udc_otg_regs.h +1 -1

index ac5d112..c8da803 100644
@@ -48,7 +48,7 @@ struct ep_fifo {
 };
 
 /* USB2.0 OTG Controller register */
-struct s3c_usbotg_reg {
+struct dwc2_usbotg_reg {
 	/* Core Global Registers */
 	u32 gotgctl; /* OTG Control & Status */
 	u32 gotgint; /* OTG Interrupt */

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #4 lore raw

PATCH 4/24 usb: s3c-otg: Split private bits from s3c_udc.h

In reply to Marek Vasut

Most of the functions are local to the s3c_udc driver, remove them from the s3c_udc.h header to stop those bits from propagating all over the place. Instead, move all the private stuff into new private s3c_udc_otg_priv.h header.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/bcm_udc_otg_phy.c               |  2 +-
 drivers/usb/gadget/s3c_udc_otg.c                   |  1 +
 drivers/usb/gadget/s3c_udc_otg_phy.c               |  1 +
 .../usb/gadget/s3c_udc_otg_priv.h                  | 19 ++---
 include/usb/s3c_udc.h                              | 96 +---------------------
 5 files changed, 11 insertions(+), 108 deletions(-)
 copy include/usb/s3c_udc.h => drivers/usb/gadget/s3c_udc_otg_priv.h (86%)

drivers/usb/gadget/bcm_udc_otg_phy.c +1 -1

index 936247e..c58388c 100644
@@ -9,7 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
 
-#include <usb/s3c_udc.h>
+#include "s3c_udc_otg_priv.h"
 #include "bcm_udc_otg.h"
 
 void otg_phy_init(struct dwc2_udc *dev)

drivers/usb/gadget/s3c_udc_otg.c +1 -0

index 00d03f3..99c6a1b 100644
@@ -33,6 +33,7 @@
 #include <asm/mach-types.h>
 
 #include "s3c_udc_otg_regs.h"
+#include "s3c_udc_otg_priv.h"
 #include <usb/lin_gadget_compat.h>
 
 /***********************************************************/

drivers/usb/gadget/s3c_udc_otg_phy.c +1 -0

index ffc930c..169f8e4 100644
@@ -33,6 +33,7 @@
 #include <asm/mach-types.h>
 
 #include "s3c_udc_otg_regs.h"
+#include "s3c_udc_otg_priv.h"
 #include <usb/lin_gadget_compat.h>
 
 #include <usb/s3c_udc.h>

drivers/usb/gadget/s3c_udc_otg_priv.h renamed from include/usb/s3c_udc.h +5 ~~-14~~

similarity index 86%
copy from include/usb/s3c_udc.h
copy to drivers/usb/gadget/s3c_udc_otg_priv.h
index f6c3a86..004dd7a 100644
@@ -1,13 +1,12 @@
 /*
- * drivers/usb/gadget/s3c_udc.h
  * Samsung S3C 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
+#ifndef __S3C_UDC_OTG_PRIV__
+#define __S3C_UDC_OTG_PRIV__
 
 #include <asm/errno.h>
 #include <linux/sizes.h>

@@ -15,6 +14,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/list.h>
 #include <usb/lin_gadget_compat.h>
+#include <usb/s3c_udc.h>
 
 #define PHY0_SLEEP              (1 << 5)

@@ -100,14 +100,5 @@ extern void otg_phy_init(struct dwc2_udc *dev);
 extern void otg_phy_off(struct dwc2_udc *dev);
 
 extern void s3c_udc_ep_set_stall(struct s3c_ep *ep);
-extern int s3c_udc_probe(struct s3c_plat_otg_data *pdata);
-
-struct s3c_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;
-};
-#endif
+
+#endif	/* __S3C_UDC_OTG_PRIV__ */

include/usb/s3c_udc.h +3 ~~-93~~

106 lines not on this page · raw message

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #5 lore raw

PATCH 5/24 usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames struct s3c_usbotg_phy to struct dwc2_usbotg_phy to make things more obvious and clear.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg_phy.c  | 8 ++++----
 drivers/usb/gadget/s3c_udc_otg_regs.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

drivers/usb/gadget/s3c_udc_otg_phy.c +4 -4

index 169f8e4..a761b43 100644
@@ -41,8 +41,8 @@
 void otg_phy_init(struct dwc2_udc *dev)
 {
 	unsigned int usb_phy_ctrl = dev->pdata->usb_phy_ctrl;
-	struct s3c_usbotg_phy *phy =
-		(struct s3c_usbotg_phy *)dev->pdata->regs_phy;
+	struct dwc2_usbotg_phy *phy =
+		(struct dwc2_usbotg_phy *)dev->pdata->regs_phy;
 
 	dev->pdata->phy_control(1);

@@ -79,8 +79,8 @@ void otg_phy_init(struct dwc2_udc *dev)
 void otg_phy_off(struct dwc2_udc *dev)
 {
 	unsigned int usb_phy_ctrl = dev->pdata->usb_phy_ctrl;
-	struct s3c_usbotg_phy *phy =
-		(struct s3c_usbotg_phy *)dev->pdata->regs_phy;
+	struct dwc2_usbotg_phy *phy =
+		(struct dwc2_usbotg_phy *)dev->pdata->regs_phy;
 
 	/* reset controller just in case */
 	writel(PHY_SW_RST0, &phy->rstcon);

drivers/usb/gadget/s3c_udc_otg_regs.h +1 -1

index c8da803..e5115dd 100644
@@ -12,7 +12,7 @@
 #define __ASM_ARCH_REGS_USB_OTG_HS_H
 
 /* USB2.0 OTG Controller register */
-struct s3c_usbotg_phy {
+struct dwc2_usbotg_phy {
 	u32 phypwr;
 	u32 phyclk;
 	u32 rstcon;

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #6 lore raw

PATCH 6/24 usb: s3c-otg: Rename struct s3c_dev_*_ep

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames struct s3c_dev_*_ep to reflect this.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg_regs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/usb/gadget/s3c_udc_otg_regs.h +4 -4

index e5115dd..57affcb 100644
@@ -19,7 +19,7 @@ struct dwc2_usbotg_phy {
 };
 
 /* Device Logical IN Endpoint-Specific Registers */
-struct s3c_dev_in_endp {
+struct dwc2_dev_in_endp {
 	u32 diepctl;
 	u8  res1[4];
 	u32 diepint;

@@ -31,7 +31,7 @@ struct s3c_dev_in_endp {
 };
 
 /* Device Logical OUT Endpoint-Specific Registers */
-struct s3c_dev_out_endp {
+struct dwc2_dev_out_endp {
 	u32 doepctl;
 	u8  res1[4];
 	u32 doepint;

@@ -74,8 +74,8 @@ struct dwc2_usbotg_reg {
 	u32 daint; /* Device All Endpoints Interrupt */
 	u32 daintmsk; /* Device All Endpoints Interrupt Mask */
 	u8  res4[224];
-	struct s3c_dev_in_endp in_endp[16];
-	struct s3c_dev_out_endp out_endp[16];
+	struct dwc2_dev_in_endp in_endp[16];
+	struct dwc2_dev_out_endp out_endp[16];
 	u8  res5[768];
 	struct ep_fifo ep[16];
 };

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #7 lore raw

PATCH 7/24 usb: s3c-otg: Rename struct s3c_ep

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames struct s3c_ep to reflect this.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c          | 38 ++++++++++++------------
 drivers/usb/gadget/s3c_udc_otg_priv.h     |  6 ++--
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 48 +++++++++++++++----------------
 3 files changed, 46 insertions(+), 46 deletions(-)

drivers/usb/gadget/s3c_udc_otg.c +19 ~~-19~~

index 99c6a1b..4caa390 100644
@@ -96,20 +96,20 @@ static int s3c_dequeue(struct usb_ep *ep, struct usb_request *);
 static int s3c_fifo_status(struct usb_ep *ep);
 static void s3c_fifo_flush(struct usb_ep *ep);
 static void s3c_ep0_read(struct dwc2_udc *dev);
-static void s3c_ep0_kick(struct dwc2_udc *dev, struct s3c_ep *ep);
+static void s3c_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep);
 static void s3c_handle_ep0(struct dwc2_udc *dev);
 static int s3c_ep0_write(struct dwc2_udc *dev);
-static int write_fifo_ep0(struct s3c_ep *ep, struct s3c_request *req);
-static void done(struct s3c_ep *ep, struct s3c_request *req, int status);
+static int write_fifo_ep0(struct dwc2_ep *ep, struct s3c_request *req);
+static void done(struct dwc2_ep *ep, struct s3c_request *req, int status);
 static void stop_activity(struct dwc2_udc *dev,
 			  struct usb_gadget_driver *driver);
 static int udc_enable(struct dwc2_udc *dev);
 static void udc_set_address(struct dwc2_udc *dev, unsigned char address);
 static void reconfig_usbd(struct dwc2_udc *dev);
 static void set_max_pktsize(struct dwc2_udc *dev, enum usb_device_speed speed);
-static void nuke(struct s3c_ep *ep, int status);
+static void nuke(struct dwc2_ep *ep, int status);
 static int s3c_udc_set_halt(struct usb_ep *_ep, int value);
-static void s3c_udc_set_nak(struct s3c_ep *ep);
+static void s3c_udc_set_nak(struct dwc2_ep *ep);
 
 void set_udc_gadget_private_data(void *p)
 {

@@ -191,7 +191,7 @@ static void udc_reinit(struct dwc2_udc *dev)
 
 	/* basic endpoint records init */
 	for (i = 0; i < S3C_MAX_ENDPOINTS; i++) {
-		struct s3c_ep *ep = &dev->ep[i];
+		struct dwc2_ep *ep = &dev->ep[i];
 
 		if (i != 0)
 			list_add_tail(&ep->ep.ep_list, &dev->gadget.ep_list);

@@ -305,7 +305,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 /*
  *	done - retire a request; caller blocked irqs
  */
-static void done(struct s3c_ep *ep, struct s3c_request *req, int status)
+static void done(struct dwc2_ep *ep, struct s3c_request *req, int status)
 {
 	unsigned int stopped = ep->stopped;

@@ -356,7 +356,7 @@ static void done(struct s3c_ep *ep, struct s3c_request *req, int status)
 /*
  *	nuke - dequeue ALL requests
  */
-static void nuke(struct s3c_ep *ep, int status)
+static void nuke(struct dwc2_ep *ep, int status)
 {
 	struct s3c_request *req;

@@ -381,7 +381,7 @@ static void stop_activity(struct dwc2_udc *dev,
 
 	/* prevent new request submissions, kill any outstanding requests  */
 	for (i = 0; i < S3C_MAX_ENDPOINTS; i++) {
-		struct s3c_ep *ep = &dev->ep[i];
+		struct dwc2_ep *ep = &dev->ep[i];
 		ep->stopped = 1;
 		nuke(ep, -ESHUTDOWN);
 	}

@@ -530,13 +530,13 @@ static void set_max_pktsize(struct dwc2_udc *dev, enum usb_device_speed speed)
 static int s3c_ep_enable(struct usb_ep *_ep,
 			 const struct usb_endpoint_descriptor *desc)
 {
-	struct s3c_ep *ep;
+	struct dwc2_ep *ep;
 	struct dwc2_udc *dev;
 	unsigned long flags = 0;
 
 	debug("%s: %p\n", __func__, _ep);
 
-	ep = container_of(_ep, struct s3c_ep, ep);
+	ep = container_of(_ep, struct dwc2_ep, ep);
 	if (!_ep || !desc || ep->desc || _ep->name == ep0name
 	    || desc->bDescriptorType != USB_DT_ENDPOINT
 	    || ep->bEndpointAddress != desc->bEndpointAddress

@@ -595,12 +595,12 @@ static int s3c_ep_enable(struct usb_ep *_ep,
  */
 static int s3c_ep_disable(struct usb_ep *_ep)
 {
-	struct s3c_ep *ep;
+	struct dwc2_ep *ep;
 	unsigned long flags = 0;
 
 	debug("%s: %p\n", __func__, _ep);
 
-	ep = container_of(_ep, struct s3c_ep, ep);
+	ep = container_of(_ep, struct dwc2_ep, ep);
 	if (!_ep || !ep->desc) {
 		debug("%s: %s not enabled\n", __func__,
 		      _ep ? ep->ep.name : NULL);

@@ -652,13 +652,13 @@ static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req)
 /* dequeue JUST ONE request */
 static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 {
-	struct s3c_ep *ep;
+	struct dwc2_ep *ep;
 	struct s3c_request *req;
 	unsigned long flags = 0;
 
 	debug("%s: %p\n", __func__, _ep);
 
-	ep = container_of(_ep, struct s3c_ep, ep);
+	ep = container_of(_ep, struct dwc2_ep, ep);
 	if (!_ep || ep->ep.name == ep0name)
 		return -EINVAL;

@@ -686,9 +686,9 @@ static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 static int s3c_fifo_status(struct usb_ep *_ep)
 {
 	int count = 0;
-	struct s3c_ep *ep;
+	struct dwc2_ep *ep;
 
-	ep = container_of(_ep, struct s3c_ep, ep);
+	ep = container_of(_ep, struct dwc2_ep, ep);
 	if (!_ep) {
 		debug("%s: bad ep\n", __func__);
 		return -ENODEV;

@@ -708,9 +708,9 @@ static int s3c_fifo_status(struct usb_ep *_ep)
  */
 static void s3c_fifo_flush(struct usb_ep *_ep)
 {
-	struct s3c_ep *ep;
+	struct dwc2_ep *ep;
 
-	ep = container_of(_ep, struct s3c_ep, ep);
+	ep = container_of(_ep, struct dwc2_ep, ep);
 	if (unlikely(!_ep || (!ep->desc && ep->ep.name != ep0name))) {
 		debug("%s: bad ep\n", __func__);
 		return;

drivers/usb/gadget/s3c_udc_otg_priv.h +3 -3

index 004dd7a..bceb037 100644
@@ -53,7 +53,7 @@ enum ep_type {
 	ep_control, ep_bulk_in, ep_bulk_out, ep_interrupt
 };
 
-struct s3c_ep {
+struct dwc2_ep {
 	struct usb_ep ep;
 	struct dwc2_udc *dev;

@@ -83,7 +83,7 @@ struct dwc2_udc {
 	struct s3c_plat_otg_data *pdata;
 
 	int ep0state;
-	struct s3c_ep ep[S3C_MAX_ENDPOINTS];
+	struct dwc2_ep ep[S3C_MAX_ENDPOINTS];
 
 	unsigned char usb_address;

@@ -99,6 +99,6 @@ extern struct dwc2_udc *the_controller;
 extern void otg_phy_init(struct dwc2_udc *dev);
 extern void otg_phy_off(struct dwc2_udc *dev);
 
-extern void s3c_udc_ep_set_stall(struct s3c_ep *ep);
+extern void s3c_udc_ep_set_stall(struct dwc2_ep *ep);
 
 #endif	/* __S3C_UDC_OTG_PRIV__ */

drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +24 ~~-24~~

182 lines not on this page · raw message

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #8 lore raw

PATCH 8/24 usb: s3c-otg: Rename struct s3c_request

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames struct s3c_request to reflect this.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c          | 18 ++++++++--------
 drivers/usb/gadget/s3c_udc_otg_priv.h     |  2 +-
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 36 +++++++++++++++----------------
 3 files changed, 28 insertions(+), 28 deletions(-)

drivers/usb/gadget/s3c_udc_otg.c +9 -9

index 4caa390..22b9518 100644
@@ -99,8 +99,8 @@ static void s3c_ep0_read(struct dwc2_udc *dev);
 static void s3c_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep);
 static void s3c_handle_ep0(struct dwc2_udc *dev);
 static int s3c_ep0_write(struct dwc2_udc *dev);
-static int write_fifo_ep0(struct dwc2_ep *ep, struct s3c_request *req);
-static void done(struct dwc2_ep *ep, struct s3c_request *req, int status);
+static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req);
+static void done(struct dwc2_ep *ep, struct dwc2_request *req, int status);
 static void stop_activity(struct dwc2_udc *dev,
 			  struct usb_gadget_driver *driver);
 static int udc_enable(struct dwc2_udc *dev);

@@ -305,7 +305,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 /*
  *	done - retire a request; caller blocked irqs
  */
-static void done(struct dwc2_ep *ep, struct s3c_request *req, int status)
+static void done(struct dwc2_ep *ep, struct dwc2_request *req, int status)
 {
 	unsigned int stopped = ep->stopped;

@@ -358,13 +358,13 @@ static void done(struct dwc2_ep *ep, struct s3c_request *req, int status)
  */
 static void nuke(struct dwc2_ep *ep, int status)
 {
-	struct s3c_request *req;
+	struct dwc2_request *req;
 
 	debug("%s: %s %p\n", __func__, ep->ep.name, ep);
 
 	/* called with irqs blocked */
 	while (!list_empty(&ep->queue)) {
-		req = list_entry(ep->queue.next, struct s3c_request, queue);
+		req = list_entry(ep->queue.next, struct dwc2_request, queue);
 		done(ep, req, status);
 	}
 }

@@ -624,7 +624,7 @@ static int s3c_ep_disable(struct usb_ep *_ep)
 static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
 					     gfp_t gfp_flags)
 {
-	struct s3c_request *req;
+	struct dwc2_request *req;
 
 	debug("%s: %s %p\n", __func__, ep->name, ep);

@@ -640,11 +640,11 @@ static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
 
 static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req)
 {
-	struct s3c_request *req;
+	struct dwc2_request *req;
 
 	debug("%s: %p\n", __func__, ep);
 
-	req = container_of(_req, struct s3c_request, req);
+	req = container_of(_req, struct dwc2_request, req);
 	WARN_ON(!list_empty(&req->queue));
 	kfree(req);
 }

@@ -653,7 +653,7 @@ static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req)
 static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 {
 	struct dwc2_ep *ep;
-	struct s3c_request *req;
+	struct dwc2_request *req;
 	unsigned long flags = 0;
 
 	debug("%s: %p\n", __func__, _ep);

drivers/usb/gadget/s3c_udc_otg_priv.h +1 -1

index bceb037..953cded 100644
@@ -71,7 +71,7 @@ struct dwc2_ep {
 	int fifo_num;
 };
 
-struct s3c_request {
+struct dwc2_request {
 	struct usb_request req;
 	struct list_head queue;
 };

drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +18 ~~-18~~

index 53c9d4e..0288d44 100644
@@ -90,7 +90,7 @@ static inline void s3c_ep0_complete_out(void)
 }
 
 
-static int setdma_rx(struct dwc2_ep *ep, struct s3c_request *req)
+static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req)
 {
 	u32 *buf, ctrl;
 	u32 length, pktcnt;

@@ -128,7 +128,7 @@ static int setdma_rx(struct dwc2_ep *ep, struct s3c_request *req)
 
 }
 
-int setdma_tx(struct dwc2_ep *ep, struct s3c_request *req)
+int setdma_tx(struct dwc2_ep *ep, struct dwc2_request *req)
 {
 	u32 *buf, ctrl = 0;
 	u32 length, pktcnt;

@@ -189,7 +189,7 @@ int setdma_tx(struct dwc2_ep *ep, struct s3c_request *req)
 static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
 {
 	struct dwc2_ep *ep = &dev->ep[ep_num];
-	struct s3c_request *req = NULL;
+	struct dwc2_request *req = NULL;
 	u32 ep_tsr = 0, xfer_size = 0, is_short = 0;
 
 	if (list_empty(&ep->queue)) {

@@ -200,7 +200,7 @@ static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
 
 	}
 
-	req = list_entry(ep->queue.next, struct s3c_request, queue);
+	req = list_entry(ep->queue.next, struct dwc2_request, queue);
 	ep_tsr = readl(&reg->out_endp[ep_num].doeptsiz);
 
 	if (ep_num == EP0_CON)

@@ -248,7 +248,7 @@ static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
 
 			if (!list_empty(&ep->queue)) {
 				req = list_entry(ep->queue.next,
-					struct s3c_request, queue);
+					struct dwc2_request, queue);
 				debug_cond(DEBUG_OUT_EP != 0,
 					   "%s: Next Rx request start...\n",
 					   __func__);

@@ -262,7 +262,7 @@ static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
 static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
 {
 	struct dwc2_ep *ep = &dev->ep[ep_num];
-	struct s3c_request *req;
+	struct dwc2_request *req;
 	u32 ep_tsr = 0, xfer_size = 0, is_short = 0;
 	u32 last;

@@ -280,7 +280,7 @@ static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
 
 	}
 
-	req = list_entry(ep->queue.next, struct s3c_request, queue);
+	req = list_entry(ep->queue.next, struct dwc2_request, queue);
 
 	ep_tsr = readl(&reg->in_endp[ep_num].dieptsiz);

@@ -328,7 +328,7 @@ static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
 		done(ep, req, 0);
 
 	if (!list_empty(&ep->queue)) {
-		req = list_entry(ep->queue.next, struct s3c_request, queue);
+		req = list_entry(ep->queue.next, struct dwc2_request, queue);
 		debug_cond(DEBUG_IN_EP,
 			"%s: Next Tx request start...\n", __func__);
 		setdma_tx(ep, req);

@@ -338,13 +338,13 @@ static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
 static inline void s3c_udc_check_tx_queue(struct dwc2_udc *dev, u8 ep_num)
 {
 	struct dwc2_ep *ep = &dev->ep[ep_num];
-	struct s3c_request *req;
+	struct dwc2_request *req;
 
 	debug_cond(DEBUG_IN_EP,
 		"%s: Check queue, ep_num = %d\n", __func__, ep_num);
 
 	if (!list_empty(&ep->queue)) {
-		req = list_entry(ep->queue.next, struct s3c_request, queue);
+		req = list_entry(ep->queue.next, struct dwc2_request, queue);
 		debug_cond(DEBUG_IN_EP,
 			"%s: Next Tx request(0x%p) start...\n",
 			__func__, req);

@@ -582,13 +582,13 @@ static int s3c_udc_irq(int irq, void *_dev)
 static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
 			 gfp_t gfp_flags)
 {
-	struct s3c_request *req;
+	struct dwc2_request *req;
 	struct dwc2_ep *ep;
 	struct dwc2_udc *dev;
 	unsigned long flags = 0;
 	u32 ep_num, gintsts;
 
-	req = container_of(_req, struct s3c_request, req);
+	req = container_of(_req, struct dwc2_request, req);
 	if (unlikely(!_req || !_req->complete || !_req->buf
 		     || !list_empty(&req->queue))) {

@@ -680,7 +680,7 @@ static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
 /****************************************************************/
 
 /* return:  0 = still running, 1 = completed, negative = errno */
-static int write_fifo_ep0(struct dwc2_ep *ep, struct s3c_request *req)
+static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req)
 {
 	u32 max;
 	unsigned count;

@@ -781,11 +781,11 @@ static inline void s3c_udc_ep0_set_stall(struct dwc2_ep *ep)
 
 static void s3c_ep0_read(struct dwc2_udc *dev)
 {
-	struct s3c_request *req;
+	struct dwc2_request *req;
 	struct dwc2_ep *ep = &dev->ep[0];
 
 	if (!list_empty(&ep->queue)) {
-		req = list_entry(ep->queue.next, struct s3c_request, queue);
+		req = list_entry(ep->queue.next, struct dwc2_request, queue);
 
 	} else {
 		debug("%s: ---> BUG\n", __func__);

@@ -818,14 +818,14 @@ static void s3c_ep0_read(struct dwc2_udc *dev)
  */
 static int s3c_ep0_write(struct dwc2_udc *dev)
 {
-	struct s3c_request *req;
+	struct dwc2_request *req;
 	struct dwc2_ep *ep = &dev->ep[0];
 	int ret, need_zlp = 0;
 
 	if (list_empty(&ep->queue))
 		req = 0;
 	else
-		req = list_entry(ep->queue.next, struct s3c_request, queue);
+		req = list_entry(ep->queue.next, struct dwc2_request, queue);
 
 	if (!req) {
 		debug_cond(DEBUG_EP0 != 0, "%s: NULL REQ\n", __func__);

@@ -1050,7 +1050,7 @@ static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
 	if (value && ep_is_in(ep) && !list_empty(&ep->queue)) {
 		debug("%s: %s queue not empty, req = %p\n",
 			__func__, ep->ep.name,
-			list_entry(ep->queue.next, struct s3c_request, queue));
+			list_entry(ep->queue.next, struct dwc2_request, queue));
 
 		return -EAGAIN;
 	}

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #9 lore raw

PATCH 9/24 usb: s3c-otg: Staticize s3c_udc_ep_set_stall

In reply to Marek Vasut

This function is local to s3c_udc_otg_xfer_dma.c , staticize it.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg_priv.h     | 2 --
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

drivers/usb/gadget/s3c_udc_otg_priv.h +0 -2

index 953cded..881b825 100644
@@ -99,6 +99,4 @@ extern struct dwc2_udc *the_controller;
 extern void otg_phy_init(struct dwc2_udc *dev);
 extern void otg_phy_off(struct dwc2_udc *dev);
 
-extern void s3c_udc_ep_set_stall(struct dwc2_ep *ep);
-
 #endif	/* __S3C_UDC_OTG_PRIV__ */

drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +1 -1

index 0288d44..1390239 100644
@@ -946,7 +946,7 @@ static void s3c_udc_set_nak(struct dwc2_ep *ep)
 }
 
 
-void s3c_udc_ep_set_stall(struct dwc2_ep *ep)
+static void s3c_udc_ep_set_stall(struct dwc2_ep *ep)
 {
 	u8		ep_num;
 	u32		ep_ctrl = 0;

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #10 lore raw

PATCH 10/24 usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c

In reply to Marek Vasut

Just staticize the functions, they are not used outside of the file.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +7 -7

index 1390239..a8237d4 100644
@@ -41,7 +41,7 @@ static inline void s3c_udc_ep0_zlp(struct dwc2_udc *dev)
 	dev->ep0state = WAIT_FOR_IN_COMPLETE;
 }
 
-void s3c_udc_pre_setup(void)
+static void s3c_udc_pre_setup(void)
 {
 	u32 ep_ctrl;

@@ -128,7 +128,7 @@ static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req)
 
 }
 
-int setdma_tx(struct dwc2_ep *ep, struct dwc2_request *req)
+static int setdma_tx(struct dwc2_ep *ep, struct dwc2_request *req)
 {
 	u32 *buf, ctrl = 0;
 	u32 length, pktcnt;

@@ -718,7 +718,7 @@ static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req)
 	return 0;
 }
 
-int s3c_fifo_read(struct dwc2_ep *ep, u32 *cp, int max)
+static int s3c_fifo_read(struct dwc2_ep *ep, u32 *cp, int max)
 {
 	invalidate_dcache_range((unsigned long)cp, (unsigned long)cp +
 				ROUND(max, CONFIG_SYS_CACHELINE_SIZE));

@@ -859,7 +859,7 @@ static int s3c_ep0_write(struct dwc2_udc *dev)
 	return 1;
 }
 
-int s3c_udc_get_status(struct dwc2_udc *dev,
+static int s3c_udc_get_status(struct dwc2_udc *dev,
 		struct usb_ctrlrequest *crq)
 {
 	u8 ep_num = crq->wIndex & 0x7F;

@@ -981,7 +981,7 @@ static void s3c_udc_ep_set_stall(struct dwc2_ep *ep)
 	return;
 }
 
-void s3c_udc_ep_clear_stall(struct dwc2_ep *ep)
+static void s3c_udc_ep_clear_stall(struct dwc2_ep *ep)
 {
 	u8		ep_num;
 	u32		ep_ctrl = 0;

@@ -1076,7 +1076,7 @@ static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
 	return 0;
 }
 
-void s3c_udc_ep_activate(struct dwc2_ep *ep)
+static void s3c_udc_ep_activate(struct dwc2_ep *ep)
 {
 	u8 ep_num;
 	u32 ep_ctrl = 0, daintmsk = 0;

@@ -1262,7 +1262,7 @@ static int s3c_udc_set_feature(struct usb_ep *_ep)
 /*
  * WAIT_FOR_SETUP (OUT_PKT_RDY)
  */
-void s3c_ep0_setup(struct dwc2_udc *dev)
+static void s3c_ep0_setup(struct dwc2_udc *dev)
 {
 	struct dwc2_ep *ep = &dev->ep[0];
 	int i;

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #11 lore raw

PATCH 11/24 usb: s3c-otg: Rename s3c_ep0_*() functions

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames the s3c_ep0_*() functions to reflect this.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c          |  6 +++---
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

drivers/usb/gadget/s3c_udc_otg.c +3 -3

index 22b9518..a5091dc 100644
@@ -95,10 +95,10 @@ static int s3c_queue(struct usb_ep *ep, struct usb_request *, gfp_t gfp_flags);
 static int s3c_dequeue(struct usb_ep *ep, struct usb_request *);
 static int s3c_fifo_status(struct usb_ep *ep);
 static void s3c_fifo_flush(struct usb_ep *ep);
-static void s3c_ep0_read(struct dwc2_udc *dev);
-static void s3c_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep);
+static void dwc2_ep0_read(struct dwc2_udc *dev);
+static void dwc2_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep);
 static void s3c_handle_ep0(struct dwc2_udc *dev);
-static int s3c_ep0_write(struct dwc2_udc *dev);
+static int dwc2_ep0_write(struct dwc2_udc *dev);
 static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req);
 static void done(struct dwc2_ep *ep, struct dwc2_request *req, int status);
 static void stop_activity(struct dwc2_udc *dev,

drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +11 ~~-11~~

index a8237d4..aa50639 100644
@@ -62,7 +62,7 @@ static void s3c_udc_pre_setup(void)
 
 }
 
-static inline void s3c_ep0_complete_out(void)
+static inline void dwc2_ep0_complete_out(void)
 {
 	u32 ep_ctrl;

@@ -268,7 +268,7 @@ static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
 
 	if (dev->ep0state == WAIT_FOR_NULL_COMPLETE) {
 		dev->ep0state = WAIT_FOR_OUT_COMPLETE;
-		s3c_ep0_complete_out();
+		dwc2_ep0_complete_out();
 		return;
 	}

@@ -315,7 +315,7 @@ static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
 				__func__, ep_num);
 			done(ep, req, 0);
 			dev->ep0state = WAIT_FOR_OUT_COMPLETE;
-			s3c_ep0_complete_out();
+			dwc2_ep0_complete_out();
 		} else {
 			debug_cond(DEBUG_IN_EP,
 				"%s: ep_num = %d, invalid ep state\n",

@@ -646,7 +646,7 @@ static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
 		if (ep_num == 0) {
 			/* EP0 */
 			list_add_tail(&req->queue, &ep->queue);
-			s3c_ep0_kick(dev, ep);
+			dwc2_ep0_kick(dev, ep);
 			req = 0;
 
 		} else if (ep_is_in(ep)) {

@@ -779,7 +779,7 @@ static inline void s3c_udc_ep0_set_stall(struct dwc2_ep *ep)
 	s3c_udc_pre_setup();
 }
 
-static void s3c_ep0_read(struct dwc2_udc *dev)
+static void dwc2_ep0_read(struct dwc2_udc *dev)
 {
 	struct dwc2_request *req;
 	struct dwc2_ep *ep = &dev->ep[0];

@@ -816,7 +816,7 @@ static void s3c_ep0_read(struct dwc2_udc *dev)
 /*
  * DATA_STATE_XMIT
  */
-static int s3c_ep0_write(struct dwc2_udc *dev)
+static int dwc2_ep0_write(struct dwc2_udc *dev)
 {
 	struct dwc2_request *req;
 	struct dwc2_ep *ep = &dev->ep[0];

@@ -1262,7 +1262,7 @@ static int s3c_udc_set_feature(struct usb_ep *_ep)
 /*
  * WAIT_FOR_SETUP (OUT_PKT_RDY)
  */
-static void s3c_ep0_setup(struct dwc2_udc *dev)
+static void dwc2_ep0_setup(struct dwc2_udc *dev)
 {
 	struct dwc2_ep *ep = &dev->ep[0];
 	int i;

@@ -1456,7 +1456,7 @@ static void s3c_handle_ep0(struct dwc2_udc *dev)
 	if (dev->ep0state == WAIT_FOR_SETUP) {
 		debug_cond(DEBUG_OUT_EP != 0,
 			   "%s: WAIT_FOR_SETUP\n", __func__);
-		s3c_ep0_setup(dev);
+		dwc2_ep0_setup(dev);
 
 	} else {
 		debug_cond(DEBUG_OUT_EP != 0,

@@ -1465,16 +1465,16 @@ static void s3c_handle_ep0(struct dwc2_udc *dev)
 	}
 }
 
-static void s3c_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep)
+static void dwc2_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep)
 {
 	debug_cond(DEBUG_EP0 != 0,
 		   "%s: ep_is_in = %d\n", __func__, ep_is_in(ep));
 	if (ep_is_in(ep)) {
 		dev->ep0state = DATA_STATE_XMIT;
-		s3c_ep0_write(dev);
+		dwc2_ep0_write(dev);
 
 	} else {
 		dev->ep0state = DATA_STATE_RECV;
-		s3c_ep0_read(dev);
+		dwc2_ep0_read(dev);
 	}
 }

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #12 lore raw

PATCH 12/24 usb: s3c-otg: Rename s3c_ep_*() functions

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames the s3c_ep_*() functions to reflect this.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

drivers/usb/gadget/s3c_udc_otg.c +11 ~~-11~~

index a5091dc..0b75f26 100644
@@ -84,9 +84,9 @@ static dma_addr_t usb_ctrl_dma_addr;
 /*
   Local declarations.
 */
-static int s3c_ep_enable(struct usb_ep *ep,
+static int dwc2_ep_enable(struct usb_ep *ep,
 			 const struct usb_endpoint_descriptor *);
-static int s3c_ep_disable(struct usb_ep *ep);
+static int dwc2_ep_disable(struct usb_ep *ep);
 static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
 					     gfp_t gfp_flags);
 static void s3c_free_request(struct usb_ep *ep, struct usb_request *);

@@ -124,9 +124,9 @@ void *get_udc_gadget_private_data(struct usb_gadget *gadget)
 	return gadget->dev.device_data;
 }
 
-static struct usb_ep_ops s3c_ep_ops = {
-	.enable = s3c_ep_enable,
-	.disable = s3c_ep_disable,
+static struct usb_ep_ops dwc2_ep_ops = {
+	.enable = dwc2_ep_enable,
+	.disable = dwc2_ep_disable,
 
 	.alloc_request = s3c_alloc_request,
 	.free_request = s3c_free_request,

@@ -527,7 +527,7 @@ static void set_max_pktsize(struct dwc2_udc *dev, enum usb_device_speed speed)
 	writel(ep_ctrl|(0<<0), &reg->out_endp[EP0_CON].doepctl);
 }
 
-static int s3c_ep_enable(struct usb_ep *_ep,
+static int dwc2_ep_enable(struct usb_ep *_ep,
 			 const struct usb_endpoint_descriptor *desc)
 {
 	struct dwc2_ep *ep;

@@ -593,7 +593,7 @@ static int s3c_ep_enable(struct usb_ep *_ep,
 /*
  * Disable EP
  */
-static int s3c_ep_disable(struct usb_ep *_ep)
+static int dwc2_ep_disable(struct usb_ep *_ep)
 {
 	struct dwc2_ep *ep;
 	unsigned long flags = 0;

@@ -735,7 +735,7 @@ static struct dwc2_udc memory = {
 	.ep[0] = {
 		.ep = {
 			.name = ep0name,
-			.ops = &s3c_ep_ops,
+			.ops = &dwc2_ep_ops,
 			.maxpacket = EP0_FIFO_SIZE,
 		},
 		.dev = &memory,

@@ -750,7 +750,7 @@ static struct dwc2_udc memory = {
 	.ep[1] = {
 		.ep = {
 			.name = "ep1in-bulk",
-			.ops = &s3c_ep_ops,
+			.ops = &dwc2_ep_ops,
 			.maxpacket = EP_FIFO_SIZE,
 		},
 		.dev = &memory,

@@ -765,7 +765,7 @@ static struct dwc2_udc memory = {
 	.ep[2] = {
 		.ep = {
 			.name = "ep2out-bulk",
-			.ops = &s3c_ep_ops,
+			.ops = &dwc2_ep_ops,
 			.maxpacket = EP_FIFO_SIZE,
 		},
 		.dev = &memory,

@@ -780,7 +780,7 @@ static struct dwc2_udc memory = {
 	.ep[3] = {
 		.ep = {
 			.name = "ep3in-int",
-			.ops = &s3c_ep_ops,
+			.ops = &dwc2_ep_ops,
 			.maxpacket = EP_FIFO_SIZE,
 		},
 		.dev = &memory,

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #13 lore raw

PATCH 13/24 usb: s3c-otg: Rename s3c_udc_*() functions

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames the s3c_ep_*() functions to reflect this. The function s3c_udc_probe() is a special case and is not renamed by this patch yet.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c          | 18 ++++----
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 76 +++++++++++++++----------------
 2 files changed, 47 insertions(+), 47 deletions(-)

drivers/usb/gadget/s3c_udc_otg.c +9 -9

index 0b75f26..4cf82e2 100644
@@ -108,8 +108,8 @@ static void udc_set_address(struct dwc2_udc *dev, unsigned char address);
 static void reconfig_usbd(struct dwc2_udc *dev);
 static void set_max_pktsize(struct dwc2_udc *dev, enum usb_device_speed speed);
 static void nuke(struct dwc2_ep *ep, int status);
-static int s3c_udc_set_halt(struct usb_ep *_ep, int value);
-static void s3c_udc_set_nak(struct dwc2_ep *ep);
+static int dwc2_udc_set_halt(struct usb_ep *_ep, int value);
+static void dwc2_udc_set_nak(struct dwc2_ep *ep);
 
 void set_udc_gadget_private_data(void *p)
 {

@@ -134,7 +134,7 @@ static struct usb_ep_ops dwc2_ep_ops = {
 	.queue = s3c_queue,
 	.dequeue = s3c_dequeue,
 
-	.set_halt = s3c_udc_set_halt,
+	.set_halt = dwc2_udc_set_halt,
 	.fifo_status = s3c_fifo_status,
 	.fifo_flush = s3c_fifo_flush,
 };

@@ -578,11 +578,11 @@ static int dwc2_ep_enable(struct usb_ep *_ep,
 	ep->ep.maxpacket = le16_to_cpu(get_unaligned(&desc->wMaxPacketSize));
 
 	/* Reset halt state */
-	s3c_udc_set_nak(ep);
-	s3c_udc_set_halt(_ep, 0);
+	dwc2_udc_set_nak(ep);
+	dwc2_udc_set_halt(_ep, 0);
 
 	spin_lock_irqsave(&ep->dev->lock, flags);
-	s3c_udc_ep_activate(ep);
+	dwc2_udc_ep_activate(ep);
 	spin_unlock_irqrestore(&ep->dev->lock, flags);
 
 	debug("%s: enabled %s, stopped = %d, maxpacket = %d\n",

@@ -719,14 +719,14 @@ static void s3c_fifo_flush(struct usb_ep *_ep)
 	debug("%s: %d\n", __func__, ep_index(ep));
 }
 
-static const struct usb_gadget_ops s3c_udc_ops = {
+static const struct usb_gadget_ops dwc2_udc_ops = {
 	/* current versions must always be self-powered */
 };
 
 static struct dwc2_udc memory = {
 	.usb_address = 0,
 	.gadget = {
-		.ops = &s3c_udc_ops,
+		.ops = &dwc2_udc_ops,
 		.ep0 = &memory.ep[0].ep,
 		.name = driver_name,
 	},

@@ -840,6 +840,6 @@ int usb_gadget_handle_interrupts(int index)
 	u32 gintmsk = readl(&reg->gintmsk);
 
 	if (intr_status & gintmsk)
-		return s3c_udc_irq(1, (void *)the_controller);
+		return dwc2_udc_irq(1, (void *)the_controller);
 	return 0;
 }

drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +38 ~~-38~~

280 lines not on this page · raw message

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #14 lore raw

PATCH 14/24 usb: s3c-otg: Rename remaining local s3c_*() functions

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames the remaining local s3c_*() functions to reflect this.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c          | 36 +++++++++++++++----------------
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 10 ++++-----
 2 files changed, 23 insertions(+), 23 deletions(-)

drivers/usb/gadget/s3c_udc_otg.c +18 ~~-18~~

index 4cf82e2..a960eff 100644
@@ -87,17 +87,17 @@ static dma_addr_t usb_ctrl_dma_addr;
 static int dwc2_ep_enable(struct usb_ep *ep,
 			 const struct usb_endpoint_descriptor *);
 static int dwc2_ep_disable(struct usb_ep *ep);
-static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
+static struct usb_request *dwc2_alloc_request(struct usb_ep *ep,
 					     gfp_t gfp_flags);
-static void s3c_free_request(struct usb_ep *ep, struct usb_request *);
+static void dwc2_free_request(struct usb_ep *ep, struct usb_request *);
 
-static int s3c_queue(struct usb_ep *ep, struct usb_request *, gfp_t gfp_flags);
-static int s3c_dequeue(struct usb_ep *ep, struct usb_request *);
-static int s3c_fifo_status(struct usb_ep *ep);
-static void s3c_fifo_flush(struct usb_ep *ep);
+static int dwc2_queue(struct usb_ep *ep, struct usb_request *, gfp_t gfp_flags);
+static int dwc2_dequeue(struct usb_ep *ep, struct usb_request *);
+static int dwc2_fifo_status(struct usb_ep *ep);
+static void dwc2_fifo_flush(struct usb_ep *ep);
 static void dwc2_ep0_read(struct dwc2_udc *dev);
 static void dwc2_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep);
-static void s3c_handle_ep0(struct dwc2_udc *dev);
+static void dwc2_handle_ep0(struct dwc2_udc *dev);
 static int dwc2_ep0_write(struct dwc2_udc *dev);
 static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req);
 static void done(struct dwc2_ep *ep, struct dwc2_request *req, int status);

@@ -128,15 +128,15 @@ static struct usb_ep_ops dwc2_ep_ops = {
 	.enable = dwc2_ep_enable,
 	.disable = dwc2_ep_disable,
 
-	.alloc_request = s3c_alloc_request,
-	.free_request = s3c_free_request,
+	.alloc_request = dwc2_alloc_request,
+	.free_request = dwc2_free_request,
 
-	.queue = s3c_queue,
-	.dequeue = s3c_dequeue,
+	.queue = dwc2_queue,
+	.dequeue = dwc2_dequeue,
 
 	.set_halt = dwc2_udc_set_halt,
-	.fifo_status = s3c_fifo_status,
-	.fifo_flush = s3c_fifo_flush,
+	.fifo_status = dwc2_fifo_status,
+	.fifo_flush = dwc2_fifo_flush,
 };
 
 #define create_proc_files() do {} while (0)

@@ -621,7 +621,7 @@ static int dwc2_ep_disable(struct usb_ep *_ep)
 	return 0;
 }
 
-static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
+static struct usb_request *dwc2_alloc_request(struct usb_ep *ep,
 					     gfp_t gfp_flags)
 {
 	struct dwc2_request *req;

@@ -638,7 +638,7 @@ static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
 	return &req->req;
 }
 
-static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req)
+static void dwc2_free_request(struct usb_ep *ep, struct usb_request *_req)
 {
 	struct dwc2_request *req;

@@ -650,7 +650,7 @@ static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req)
 }
 
 /* dequeue JUST ONE request */
-static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req)
+static int dwc2_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 {
 	struct dwc2_ep *ep;
 	struct dwc2_request *req;

@@ -683,7 +683,7 @@ static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 /*
  * Return bytes in EP FIFO
  */
-static int s3c_fifo_status(struct usb_ep *_ep)
+static int dwc2_fifo_status(struct usb_ep *_ep)
 {
 	int count = 0;
 	struct dwc2_ep *ep;

@@ -706,7 +706,7 @@ static int s3c_fifo_status(struct usb_ep *_ep)
 /*
  * Flush EP FIFO
  */
-static void s3c_fifo_flush(struct usb_ep *_ep)
+static void dwc2_fifo_flush(struct usb_ep *_ep)
 {
 	struct dwc2_ep *ep;

drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +5 -5

index e93d602..b8b2703 100644
@@ -446,7 +446,7 @@ static void process_ep_out_intr(struct dwc2_udc *dev)
 				    CTRL_OUT_EP_SETUP_PHASE_DONE) {
 					debug_cond(DEBUG_OUT_EP != 0,
 						   "SETUP packet arrived\n");
-					s3c_handle_ep0(dev);
+					dwc2_handle_ep0(dev);
 				}
 			} else {
 				if (ep_intr_status & TRANSFER_DONE)

@@ -579,7 +579,7 @@ static int dwc2_udc_irq(int irq, void *_dev)
 /** Queue one request
  *  Kickstart transfer if needed
  */
-static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
+static int dwc2_queue(struct usb_ep *_ep, struct usb_request *_req,
 			 gfp_t gfp_flags)
 {
 	struct dwc2_request *req;

@@ -718,7 +718,7 @@ static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req)
 	return 0;
 }
 
-static int s3c_fifo_read(struct dwc2_ep *ep, u32 *cp, int max)
+static int dwc2_fifo_read(struct dwc2_ep *ep, u32 *cp, int max)
 {
 	invalidate_dcache_range((unsigned long)cp, (unsigned long)cp +
 				ROUND(max, CONFIG_SYS_CACHELINE_SIZE));

@@ -1272,7 +1272,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
 	nuke(ep, -EPROTO);
 
 	/* read control req from fifo (8 bytes) */
-	s3c_fifo_read(ep, (u32 *)usb_ctrl, 8);
+	dwc2_fifo_read(ep, (u32 *)usb_ctrl, 8);
 
 	debug_cond(DEBUG_SETUP != 0,
 		   "%s: bRequestType = 0x%x(%s), bRequest = 0x%x"

@@ -1451,7 +1451,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
 /*
  * handle ep0 interrupt
  */
-static void s3c_handle_ep0(struct dwc2_udc *dev)
+static void dwc2_handle_ep0(struct dwc2_udc *dev)
 {
 	if (dev->ep0state == WAIT_FOR_SETUP) {
 		debug_cond(DEBUG_OUT_EP != 0,

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #15 lore raw

PATCH 15/24 usb: s3c-otg: Zap useless externs

In reply to Marek Vasut

The extern statements are useless, remove them. Also remove the extern ... controller, which is completely useless.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg_priv.h | 6 ++----
 include/usb/s3c_udc.h                 | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

drivers/usb/gadget/s3c_udc_otg_priv.h +2 -4

index 881b825..e3ef2d8 100644
@@ -90,13 +90,11 @@ struct dwc2_udc {
 	unsigned req_pending:1, req_std:1;
 };
 
-extern struct dwc2_udc *the_controller;
-
 #define ep_is_in(EP) (((EP)->bEndpointAddress&USB_DIR_IN) == USB_DIR_IN)
 #define ep_index(EP) ((EP)->bEndpointAddress&0xF)
 #define ep_maxpacket(EP) ((EP)->ep.maxpacket)
 
-extern void otg_phy_init(struct dwc2_udc *dev);
-extern void otg_phy_off(struct dwc2_udc *dev);
+void otg_phy_init(struct dwc2_udc *dev);
+void otg_phy_off(struct dwc2_udc *dev);
 
 #endif	/* __S3C_UDC_OTG_PRIV__ */

include/usb/s3c_udc.h +1 -1

index 7064b86..345e46c 100644
@@ -18,6 +18,6 @@ struct s3c_plat_otg_data {
 	unsigned int	usb_gusbcfg;
 };
 
-extern int s3c_udc_probe(struct s3c_plat_otg_data *pdata);
+int s3c_udc_probe(struct s3c_plat_otg_data *pdata);
 
 #endif

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #16 lore raw

PATCH 16/24 usb: s3c-otg: Change the driver name to dwc2-udc

In reply to Marek Vasut

Just change the driver name.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/s3c_udc_otg.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/usb/gadget/s3c_udc_otg.c +3 -3

index a960eff..9cb6849 100644
@@ -63,12 +63,12 @@ static char *state_names[] = {
 	"WAIT_FOR_NULL_COMPLETE",
 };
 
-#define DRIVER_DESC "S3C HS USB OTG Device Driver, (c) Samsung Electronics"
+#define DRIVER_DESC "DWC2 HS USB OTG Device Driver, (c) Samsung Electronics"
 #define DRIVER_VERSION "15 March 2009"
 
 struct dwc2_udc	*the_controller;
 
-static const char driver_name[] = "s3c-udc";
+static const char driver_name[] = "dwc2-udc";
 static const char driver_desc[] = DRIVER_DESC;
 static const char ep0name[] = "ep0-control";

@@ -219,7 +219,7 @@ static int udc_enable(struct dwc2_udc *dev)
 	reconfig_usbd(dev);
 
 	debug_cond(DEBUG_SETUP != 0,
-		   "S3C USB 2.0 OTG Controller Core Initialized : 0x%x\n",
+		   "DWC2 USB 2.0 OTG Controller Core Initialized : 0x%x\n",
 		    readl(&reg->gintmsk));
 
 	dev->gadget.speed = USB_SPEED_UNKNOWN;

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #17 lore raw

PATCH 17/24 usb: s3c-otg: Rename local headers to dwc2_*h

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames the local header files to dwc2_*h and adjusts the sources to use the new names.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/bcm_udc_otg_phy.c                           | 2 +-
 drivers/usb/gadget/{s3c_udc_otg_priv.h => dwc2_udc_otg_priv.h} | 6 +++---
 drivers/usb/gadget/{s3c_udc_otg_regs.h => dwc2_udc_otg_regs.h} | 0
 drivers/usb/gadget/s3c_udc_otg.c                               | 4 ++--
 drivers/usb/gadget/s3c_udc_otg_phy.c                           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename drivers/usb/gadget/{s3c_udc_otg_priv.h => dwc2_udc_otg_priv.h} (95%)
 rename drivers/usb/gadget/{s3c_udc_otg_regs.h => dwc2_udc_otg_regs.h} (100%)

drivers/usb/gadget/bcm_udc_otg_phy.c +1 -1

index c58388c..10b2e13 100644
@@ -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)

drivers/usb/gadget/dwc2_udc_otg_priv.h renamed from drivers/usb/gadget/s3c_udc_otg_priv.h +3 -3

similarity index 95%
rename from drivers/usb/gadget/s3c_udc_otg_priv.h
rename to drivers/usb/gadget/dwc2_udc_otg_priv.h
index e3ef2d8..dca7838 100644
@@ -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>

@@ -97,4 +97,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__ */

drivers/usb/gadget/dwc2_udc_otg_regs.h renamed from drivers/usb/gadget/s3c_udc_otg_regs.h +0 -0

similarity index 100%
rename from drivers/usb/gadget/s3c_udc_otg_regs.h
rename to drivers/usb/gadget/dwc2_udc_otg_regs.h

drivers/usb/gadget/s3c_udc_otg.c +2 -2

index 9cb6849..0bff63f 100644
@@ -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>
 
 /***********************************************************/

drivers/usb/gadget/s3c_udc_otg_phy.c +2 -2

index a761b43..ab7515b 100644
@@ -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>

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #18 lore raw

PATCH 18/24 usb: s3c-otg: Rename sources to dwc2_*c

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames the local source files to dwc2_*c and adjusts the Makefile to use the new names.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/Makefile                                           | 4 ++--
 drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}                  | 4 ++--
 drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c}          | 2 +-
 .../usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c}    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (99%)
 rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (98%)
 rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (99%)

drivers/usb/gadget/Makefile +2 -2

index 6288ecf..dd4df00 100644
@@ -13,8 +13,8 @@ ifdef CONFIG_USB_GADGET
 obj-$(CONFIG_USB_GADGET_AT91) += at91_udc.o
 obj-$(CONFIG_USB_GADGET_ATMEL_USBA) += atmel_usba_udc.o
 obj-$(CONFIG_USB_GADGET_BCM_UDC_OTG_PHY) += bcm_udc_otg_phy.o
-obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o
-obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += s3c_udc_otg_phy.o
+obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += dwc2_udc_otg.o
+obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += dwc2_udc_otg_phy.o
 obj-$(CONFIG_USB_GADGET_FOTG210) += fotg210.o
 obj-$(CONFIG_CI_UDC)	+= ci_udc.o
 obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o

drivers/usb/gadget/dwc2_udc_otg.c renamed from drivers/usb/gadget/s3c_udc_otg.c +2 -2

similarity index 99%
rename from drivers/usb/gadget/s3c_udc_otg.c
rename to drivers/usb/gadget/dwc2_udc_otg.c
index 0bff63f..40a7125 100644
@@ -1,5 +1,5 @@
 /*
- * drivers/usb/gadget/s3c_udc_otg.c
+ * drivers/usb/gadget/dwc2_udc_otg.c
  * Samsung S3C on-chip full/high speed USB OTG 2.0 device controllers
  *
  * Copyright (C) 2008 for Samsung Electronics

@@ -157,7 +157,7 @@ __weak void otg_phy_off(struct dwc2_udc *dev) {}
 
 /***********************************************************/
 
-#include "s3c_udc_otg_xfer_dma.c"
+#include "dwc2_udc_otg_xfer_dma.c"
 
 /*
  *	udc_disable - disable USB device controller

drivers/usb/gadget/dwc2_udc_otg_phy.c renamed from drivers/usb/gadget/s3c_udc_otg_phy.c +1 -1

similarity index 98%
rename from drivers/usb/gadget/s3c_udc_otg_phy.c
rename to drivers/usb/gadget/dwc2_udc_otg_phy.c
index ab7515b..eedfe37 100644
@@ -1,5 +1,5 @@
 /*
- * drivers/usb/gadget/s3c_udc_otg.c
+ * drivers/usb/gadget/dwc2_udc_otg.c
  * Samsung S3C on-chip full/high speed USB OTG 2.0 device controllers
  *
  * Copyright (C) 2008 for Samsung Electronics

drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c renamed from drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +1 -1

similarity index 99%
rename from drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
rename to drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index b8b2703..fe02c0f 100644
@@ -1,5 +1,5 @@
 /*
- * drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+ * drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
  * Samsung S3C on-chip full/high speed USB OTG 2.0 device controllers
  *
  * Copyright (C) 2009 for Samsung Electronics

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #19 lore raw

PATCH 19/24 usb: s3c-otg: Rename remaining macros

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch renames the remaining S3C_* macros to match the DWC2 naming.

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/dwc2_udc_otg.c          | 14 +++++++-------
 drivers/usb/gadget/dwc2_udc_otg_priv.h     |  6 +++---
 drivers/usb/gadget/dwc2_udc_otg_regs.h     | 20 ++++++++++----------
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c |  4 ++--
 4 files changed, 22 insertions(+), 22 deletions(-)

drivers/usb/gadget/dwc2_udc_otg.c +7 -7

index 40a7125..93514a9 100644
@@ -190,7 +190,7 @@ static void udc_reinit(struct dwc2_udc *dev)
 	dev->ep0state = WAIT_FOR_SETUP;
 
 	/* basic endpoint records init */
-	for (i = 0; i < S3C_MAX_ENDPOINTS; i++) {
+	for (i = 0; i < DWC2_MAX_ENDPOINTS; i++) {
 		struct dwc2_ep *ep = &dev->ep[i];
 
 		if (i != 0)

@@ -380,7 +380,7 @@ static void stop_activity(struct dwc2_udc *dev,
 	dev->gadget.speed = USB_SPEED_UNKNOWN;
 
 	/* prevent new request submissions, kill any outstanding requests  */
-	for (i = 0; i < S3C_MAX_ENDPOINTS; i++) {
+	for (i = 0; i < DWC2_MAX_ENDPOINTS; i++) {
 		struct dwc2_ep *ep = &dev->ep[i];
 		ep->stopped = 1;
 		nuke(ep, -ESHUTDOWN);

@@ -448,7 +448,7 @@ static void reconfig_usbd(struct dwc2_udc *dev)
 	writel(DEPCTL_EPDIS|DEPCTL_SNAK, &reg->out_endp[EP0_CON].doepctl);
 	writel(DEPCTL_EPDIS|DEPCTL_SNAK, &reg->in_endp[EP0_CON].diepctl);
 
-	for (i = 1; i < S3C_MAX_ENDPOINTS; i++) {
+	for (i = 1; i < DWC2_MAX_ENDPOINTS; i++) {
 		writel(DEPCTL_EPDIS|DEPCTL_SNAK, &reg->out_endp[i].doepctl);
 		writel(DEPCTL_EPDIS|DEPCTL_SNAK, &reg->in_endp[i].diepctl);
 	}

@@ -470,7 +470,7 @@ static void reconfig_usbd(struct dwc2_udc *dev)
 	writel((NPTX_FIFO_SIZE >> 2) << 16 | ((RX_FIFO_SIZE >> 2)) << 0,
 	       &reg->gnptxfsiz);
 
-	for (i = 1; i < S3C_MAX_HW_ENDPOINTS; i++)
+	for (i = 1; i < DWC2_MAX_HW_ENDPOINTS; i++)
 		writel((PTX_FIFO_SIZE >> 2) << 16 |
 		       ((RX_FIFO_SIZE + NPTX_FIFO_SIZE +
 			 PTX_FIFO_SIZE*(i-1)) >> 2) << 0,

@@ -479,13 +479,13 @@ static void reconfig_usbd(struct dwc2_udc *dev)
 	/* Flush the RX FIFO */
 	writel(RX_FIFO_FLUSH, &reg->grstctl);
 	while (readl(&reg->grstctl) & RX_FIFO_FLUSH)
-		debug("%s: waiting for S3C_UDC_OTG_GRSTCTL\n", __func__);
+		debug("%s: waiting for DWC2_UDC_OTG_GRSTCTL\n", __func__);
 
 	/* Flush all the Tx FIFO's */
 	writel(TX_FIFO_FLUSH_ALL, &reg->grstctl);
 	writel(TX_FIFO_FLUSH_ALL | TX_FIFO_FLUSH, &reg->grstctl);
 	while (readl(&reg->grstctl) & TX_FIFO_FLUSH)
-		debug("%s: waiting for S3C_UDC_OTG_GRSTCTL\n", __func__);
+		debug("%s: waiting for DWC2_UDC_OTG_GRSTCTL\n", __func__);
 
 	/* 13. Clear NAK bit of EP0, EP1, EP2*/
 	/* For Slave mode*/

@@ -515,7 +515,7 @@ static void set_max_pktsize(struct dwc2_udc *dev, enum usb_device_speed speed)
 	}
 
 	dev->ep[0].ep.maxpacket = ep0_fifo_size;
-	for (i = 1; i < S3C_MAX_ENDPOINTS; i++)
+	for (i = 1; i < DWC2_MAX_ENDPOINTS; i++)
 		dev->ep[i].ep.maxpacket = ep_fifo_size;
 
 	/* EP0 - Control IN (64 bytes)*/

drivers/usb/gadget/dwc2_udc_otg_priv.h +3 -3

index dca7838..ecf7dbf 100644
@@ -26,8 +26,8 @@
 #define EP_FIFO_SIZE		512
 #define EP_FIFO_SIZE2		1024
 /* ep0-control, ep1in-bulk, ep2out-bulk, ep3in-int */
-#define S3C_MAX_ENDPOINTS	4
-#define S3C_MAX_HW_ENDPOINTS	16
+#define DWC2_MAX_ENDPOINTS	4
+#define DWC2_MAX_HW_ENDPOINTS	16
 
 #define WAIT_FOR_SETUP          0
 #define DATA_STATE_XMIT         1

@@ -83,7 +83,7 @@ struct dwc2_udc {
 	struct s3c_plat_otg_data *pdata;
 
 	int ep0state;
-	struct dwc2_ep ep[S3C_MAX_ENDPOINTS];
+	struct dwc2_ep ep[DWC2_MAX_ENDPOINTS];
 
 	unsigned char usb_address;

drivers/usb/gadget/dwc2_udc_otg_regs.h +10 ~~-10~~

index 57affcb..78ec90e 100644
@@ -83,11 +83,11 @@ struct dwc2_usbotg_reg {
 /*===================================================================== */
 /*definitions related to CSR setting */
 
-/* S3C_UDC_OTG_GOTGCTL */
+/* DWC2_UDC_OTG_GOTGCTL */
 #define B_SESSION_VALID		(0x1<<19)
 #define A_SESSION_VALID		(0x1<<18)
 
-/* S3C_UDC_OTG_GAHBCFG */
+/* DWC2_UDC_OTG_GAHBCFG */
 #define PTXFE_HALF			(0<<8)
 #define PTXFE_ZERO			(1<<8)
 #define NPTXFE_HALF			(0<<7)

@@ -102,11 +102,11 @@ struct dwc2_usbotg_reg {
 #define GBL_INT_UNMASK			(1<<0)
 #define GBL_INT_MASK			(0<<0)
 
-/* S3C_UDC_OTG_GRSTCTL */
+/* DWC2_UDC_OTG_GRSTCTL */
 #define AHB_MASTER_IDLE		(1u<<31)
 #define CORE_SOFT_RESET		(0x1<<0)
 
-/* S3C_UDC_OTG_GINTSTS/S3C_UDC_OTG_GINTMSK core interrupt register */
+/* DWC2_UDC_OTG_GINTSTS/DWC2_UDC_OTG_GINTMSK core interrupt register */
 #define INT_RESUME			(1u<<31)
 #define INT_DISCONN			(0x1<<29)
 #define INT_CONN_ID_STS_CNG		(0x1<<28)

@@ -146,22 +146,22 @@ struct dwc2_usbotg_reg {
 #define USB_LOW_6MHZ			(0x2<<1)
 #define USB_FULL_48MHZ			(0x3<<1)
 
-/* S3C_UDC_OTG_GRXSTSP STATUS */
+/* DWC2_UDC_OTG_GRXSTSP STATUS */
 #define OUT_PKT_RECEIVED		(0x2<<17)
 #define OUT_TRANSFER_COMPLELTED	(0x3<<17)
 #define SETUP_TRANSACTION_COMPLETED	(0x4<<17)
 #define SETUP_PKT_RECEIVED		(0x6<<17)
 #define GLOBAL_OUT_NAK			(0x1<<17)
 
-/* S3C_UDC_OTG_DCTL device control register */
+/* DWC2_UDC_OTG_DCTL device control register */
 #define NORMAL_OPERATION		(0x1<<0)
 #define SOFT_DISCONNECT		(0x1<<1)
 
-/* S3C_UDC_OTG_DAINT device all endpoint interrupt register */
+/* DWC2_UDC_OTG_DAINT device all endpoint interrupt register */
 #define DAINT_OUT_BIT			(16)
 #define DAINT_MASK			(0xFFFF)
 
-/* S3C_UDC_OTG_DIEPCTL0/DOEPCTL0 device
+/* DWC2_UDC_OTG_DIEPCTL0/DOEPCTL0 device
    control IN/OUT endpoint 0 control register */
 #define DEPCTL_EPENA			(0x1<<31)
 #define DEPCTL_EPDIS			(0x1<<30)

@@ -191,9 +191,9 @@ struct dwc2_usbotg_reg {
 #define DIEPCTL0_NEXT_EP_BIT		(11)
 
 
-/* S3C_UDC_OTG_DIEPMSK/DOEPMSK device IN/OUT endpoint
+/* DWC2_UDC_OTG_DIEPMSK/DOEPMSK device IN/OUT endpoint
    common interrupt mask register */
-/* S3C_UDC_OTG_DIEPINTn/DOEPINTn device IN/OUT endpoint interrupt register */
+/* DWC2_UDC_OTG_DIEPINTn/DOEPINTn device IN/OUT endpoint interrupt register */
 #define BACK2BACK_SETUP_RECEIVED	(0x1<<6)
 #define INTKNEPMIS			(0x1<<5)
 #define INTKN_TXFEMP			(0x1<<4)

drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +2 -2

index fe02c0f..d56d401 100644
@@ -652,14 +652,14 @@ static int dwc2_queue(struct usb_ep *_ep, struct usb_request *_req,
 		} else if (ep_is_in(ep)) {
 			gintsts = readl(&reg->gintsts);
 			debug_cond(DEBUG_IN_EP,
-				   "%s: ep_is_in, S3C_UDC_OTG_GINTSTS=0x%x\n",
+				   "%s: ep_is_in, DWC2_UDC_OTG_GINTSTS=0x%x\n",
 				   __func__, gintsts);
 
 			setdma_tx(ep, req);
 		} else {
 			gintsts = readl(&reg->gintsts);
 			debug_cond(DEBUG_OUT_EP != 0,
-				   "%s:ep_is_out, S3C_UDC_OTG_GINTSTS=0x%x\n",
+				   "%s:ep_is_out, DWC2_UDC_OTG_GINTSTS=0x%x\n",
 				   __func__, gintsts);
 
 			setdma_rx(ep, req);

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #20 lore raw

PATCH 20/24 usb: s3c-otg: Tweak the comments

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. Tweak the comments in the driver to reflect this fact.

Signed-off-by Marek Vasut <[email protected]>

---
 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 +-
 drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 2 +-
 include/usb/s3c_udc.h                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

drivers/usb/gadget/dwc2_udc_otg.c +1 -1

index 93514a9..772d948 100644
@@ -1,6 +1,6 @@
 /*
  * drivers/usb/gadget/dwc2_udc_otg.c
- * Samsung S3C on-chip full/high speed USB OTG 2.0 device controllers
+ * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers
  *
  * Copyright (C) 2008 for Samsung Electronics
  *

drivers/usb/gadget/dwc2_udc_otg_phy.c +1 -1

index eedfe37..d3e9840 100644
@@ -1,6 +1,6 @@
 /*
  * drivers/usb/gadget/dwc2_udc_otg.c
- * Samsung S3C on-chip full/high speed USB OTG 2.0 device controllers
+ * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers
  *
  * Copyright (C) 2008 for Samsung Electronics
  *

drivers/usb/gadget/dwc2_udc_otg_priv.h +1 -1

index ecf7dbf..96d66b2 100644
@@ -1,5 +1,5 @@
 /*
- * Samsung S3C on-chip full/high speed USB device controllers
+ * Designware DWC2 on-chip full/high speed USB device controllers
  * Copyright (C) 2005 for Samsung Electronics
  *
  * SPDX-License-Identifier:	GPL-2.0+

drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +1 -1

index d56d401..bce9c30 100644
@@ -1,6 +1,6 @@
 /*
  * drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
- * Samsung S3C on-chip full/high speed USB OTG 2.0 device controllers
+ * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers
  *
  * Copyright (C) 2009 for Samsung Electronics
  *

include/usb/s3c_udc.h +1 -1

index 345e46c..4c0ff67 100644
@@ -1,6 +1,6 @@
 /*
  * drivers/usb/gadget/s3c_udc.h
- * Samsung S3C on-chip full/high speed USB device controllers
+ * Designware DWC2 on-chip full/high speed USB device controllers
  * Copyright (C) 2005 for Samsung Electronics
  *
  * SPDX-License-Identifier:	GPL-2.0+

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #21 lore raw

PATCH 21/24 usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG*

In reply to Marek Vasut

The s3c-otg IP block is in fact a DWC2 OTG one, so finally rename the config option to make it less misleading. No functional change, just a mechanical change done using the following script:

  git grep USB_GADGET_S3C_UDC_OTG | cut -d : -f 1 | sort -u | \
  while read line ; do
    sed -i "s/USB_GADGET_S3C_UDC_OTG/USB_GADGET_DWC2_OTG/g" $line ;
  done

Signed-off-by Marek Vasut <[email protected]>

---
 drivers/usb/gadget/Makefile         | 4 ++--
 include/configs/bcm28155_ap.h       | 2 +-
 include/configs/exynos4-common.h    | 4 ++--
 include/configs/s5p_goni.h          | 4 ++--
 include/configs/s5pc210_universal.h | 4 ++--
 include/configs/smdkv310.h          | 4 ++--
 include/configs/socfpga_common.h    | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

drivers/usb/gadget/Makefile +2 -2

index dd4df00..c915c79 100644
@@ -13,8 +13,8 @@ ifdef CONFIG_USB_GADGET
 obj-$(CONFIG_USB_GADGET_AT91) += at91_udc.o
 obj-$(CONFIG_USB_GADGET_ATMEL_USBA) += atmel_usba_udc.o
 obj-$(CONFIG_USB_GADGET_BCM_UDC_OTG_PHY) += bcm_udc_otg_phy.o
-obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += dwc2_udc_otg.o
-obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += dwc2_udc_otg_phy.o
+obj-$(CONFIG_USB_GADGET_DWC2_OTG) += dwc2_udc_otg.o
+obj-$(CONFIG_USB_GADGET_DWC2_OTG_PHY) += dwc2_udc_otg_phy.o
 obj-$(CONFIG_USB_GADGET_FOTG210) += fotg210.o
 obj-$(CONFIG_CI_UDC)	+= ci_udc.o
 obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o

include/configs/bcm28155_ap.h +1 -1

index 131f613..a257084 100644
@@ -142,7 +142,7 @@
 #define CONFIG_USB_GADGET
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_VBUS_DRAW	0
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USBID_ADDR		0x34052c46

include/configs/exynos4-common.h +2 -2

index ec1f882..d101a77 100644
@@ -51,8 +51,8 @@
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* Reserve 2 sectors */
 
 #define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
-#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+#define CONFIG_USB_GADGET_DWC2_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG_PHY
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_VBUS_DRAW	2

include/configs/s5p_goni.h +2 -2

index 2877e19..8f65d7e 100644
@@ -269,8 +269,8 @@
 
 #define CONFIG_SYS_MAX_I2C_BUS	7
 #define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
-#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+#define CONFIG_USB_GADGET_DWC2_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG_PHY
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_CMD_USB_MASS_STORAGE

include/configs/s5pc210_universal.h +2 -2

index 35fef2b..7bb62ca 100644
@@ -177,8 +177,8 @@
 #define CONFIG_POWER_MAX8998
 
 #define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
-#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+#define CONFIG_USB_GADGET_DWC2_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG_PHY
 #define CONFIG_USB_GADGET_DUALSPEED
 
 /*

include/configs/smdkv310.h +2 -2

index 217cfc0..2492f99 100644
@@ -13,8 +13,8 @@
 
 #undef CONFIG_BOARD_COMMON
 #undef CONFIG_USB_GADGET
-#undef CONFIG_USB_GADGET_S3C_UDC_OTG
-#undef CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+#undef CONFIG_USB_GADGET_DWC2_OTG
+#undef CONFIG_USB_GADGET_DWC2_OTG_PHY
 #undef CONFIG_CMD_USB_MASS_STORAGE
 #undef CONFIG_REVISION_TAG
 #undef CONFIG_CMD_THOR_DOWNLOAD

include/configs/socfpga_common.h +1 -1

index b3f65b6..b0bc689 100644
@@ -243,7 +243,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
+#define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_VBUS_DRAW	2

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #22 lore raw

PATCH 22/24 usb: s3c-otg: Rename struct s3c_plat_otg_data

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch is the first to rename global symbol, the struct s3c_plat_otg_data.

The rename is done automatically:

	$ sed -i "s/s3c_plat_otg_data/dwc2_plat_otg_data/g" \
		`git grep s3c_plat_otg_data | cut -d : -f 1`

Signed-off-by Marek Vasut <[email protected]>

---
 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              | 4 ++--
 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_priv.h   | 2 +-
 include/usb/s3c_udc.h                    | 4 ++--
 14 files changed, 16 insertions(+), 16 deletions(-)

board/altera/arria5-socdk/socfpga.c +1 -1

index a1dbc49..10f8f68 100644
@@ -68,7 +68,7 @@ int board_phy_config(struct phy_device *phydev)
 #endif
 
 #ifdef CONFIG_USB_GADGET
-struct s3c_plat_otg_data socfpga_otg_data = {
+struct dwc2_plat_otg_data socfpga_otg_data = {
 	.regs_otg	= CONFIG_USB_DWC2_REG_ADDR,
 	.usb_gusbcfg	= 0x1417,
 };

board/altera/cyclone5-socdk/socfpga.c +1 -1

index a1dbc49..10f8f68 100644
@@ -68,7 +68,7 @@ int board_phy_config(struct phy_device *phydev)
 #endif
 
 #ifdef CONFIG_USB_GADGET
-struct s3c_plat_otg_data socfpga_otg_data = {
+struct dwc2_plat_otg_data socfpga_otg_data = {
 	.regs_otg	= CONFIG_USB_DWC2_REG_ADDR,
 	.usb_gusbcfg	= 0x1417,
 };

board/broadcom/bcm28155_ap/bcm28155_ap.c +1 -1

index 20eb191..e517db3 100644
@@ -95,7 +95,7 @@ int board_mmc_init(bd_t *bis)
 #endif
 
 #ifdef CONFIG_USB_GADGET
-static struct s3c_plat_otg_data bcm_otg_data = {
+static struct dwc2_plat_otg_data bcm_otg_data = {
 	.regs_otg	= HSOTG_BASE_ADDR
 };

board/denx/mcvevk/socfpga.c +1 -1

index 1a23a7d..f27b64e 100644
@@ -28,7 +28,7 @@ int board_init(void)
 }
 
 #ifdef CONFIG_USB_GADGET
-struct s3c_plat_otg_data socfpga_otg_data = {
+struct dwc2_plat_otg_data socfpga_otg_data = {
 	.regs_otg	= CONFIG_USB_DWC2_REG_ADDR,
 	.usb_gusbcfg	= 0x1417,
 };

board/ebv/socrates/socfpga.c +1 -1

index a1dbc49..10f8f68 100644
@@ -68,7 +68,7 @@ int board_phy_config(struct phy_device *phydev)
 #endif
 
 #ifdef CONFIG_USB_GADGET
-struct s3c_plat_otg_data socfpga_otg_data = {
+struct dwc2_plat_otg_data socfpga_otg_data = {
 	.regs_otg	= CONFIG_USB_DWC2_REG_ADDR,
 	.usb_gusbcfg	= 0x1417,
 };

board/samsung/goni/goni.c +1 -1

index d943d63..2ba556e 100644
@@ -183,7 +183,7 @@ static int s5pc1xx_phy_control(int on)
 	return 0;
 }
 
-struct s3c_plat_otg_data s5pc110_otg_data = {
+struct dwc2_plat_otg_data s5pc110_otg_data = {
 	.phy_control = s5pc1xx_phy_control,
 	.regs_phy = S5PC110_PHY_BASE,
 	.regs_otg = S5PC110_OTG_BASE,

board/samsung/odroid/odroid.c +1 -1

index 36d493d..58cbb72 100644
@@ -452,7 +452,7 @@ static int s5pc210_phy_control(int on)
 		return regulator_set_mode(dev, OPMODE_LPM);
 }
 
-struct s3c_plat_otg_data s5pc210_otg_data = {
+struct dwc2_plat_otg_data s5pc210_otg_data = {
 	.phy_control	= s5pc210_phy_control,
 	.regs_phy	= EXYNOS4X12_USBPHY_BASE,
 	.regs_otg	= EXYNOS4X12_USBOTG_BASE,

board/samsung/trats/trats.c +2 -2

index e163e45..3a553c1 100644
@@ -41,7 +41,7 @@ u32 get_board_rev(void)
 #endif
 
 static void check_hw_revision(void);
-struct s3c_plat_otg_data s5pc210_otg_data;
+struct dwc2_plat_otg_data s5pc210_otg_data;
 
 int exynos_init(void)
 {

@@ -419,7 +419,7 @@ static int s5pc210_phy_control(int on)
 	return 0;
 }
 
-struct s3c_plat_otg_data s5pc210_otg_data = {
+struct dwc2_plat_otg_data s5pc210_otg_data = {
 	.phy_control	= s5pc210_phy_control,
 	.regs_phy	= EXYNOS4_USBPHY_BASE,
 	.regs_otg	= EXYNOS4_USBOTG_BASE,

board/samsung/trats2/trats2.c +1 -1

index a737749..e52a817 100644
@@ -303,7 +303,7 @@ static int s5pc210_phy_control(int on)
 	return 0;
 }
 
-struct s3c_plat_otg_data s5pc210_otg_data = {
+struct dwc2_plat_otg_data s5pc210_otg_data = {
 	.phy_control	= s5pc210_phy_control,
 	.regs_phy	= EXYNOS4X12_USBPHY_BASE,
 	.regs_otg	= EXYNOS4X12_USBOTG_BASE,

board/samsung/universal_c210/universal.c +1 -1

index df46713..747d556 100644
@@ -179,7 +179,7 @@ static int s5pc210_phy_control(int on)
 	return 0;
 }
 
-struct s3c_plat_otg_data s5pc210_otg_data = {
+struct dwc2_plat_otg_data s5pc210_otg_data = {
 	.phy_control = s5pc210_phy_control,
 	.regs_phy = EXYNOS4_USBPHY_BASE,
 	.regs_otg = EXYNOS4_USBOTG_BASE,

board/terasic/sockit/socfpga.c +1 -1

index a1dbc49..10f8f68 100644
@@ -68,7 +68,7 @@ int board_phy_config(struct phy_device *phydev)
 #endif
 
 #ifdef CONFIG_USB_GADGET
-struct s3c_plat_otg_data socfpga_otg_data = {
+struct dwc2_plat_otg_data socfpga_otg_data = {
 	.regs_otg	= CONFIG_USB_DWC2_REG_ADDR,
 	.usb_gusbcfg	= 0x1417,
 };

drivers/usb/gadget/dwc2_udc_otg.c +1 -1

index 772d948..2e2dfe1 100644
@@ -797,7 +797,7 @@ static struct dwc2_udc memory = {
  *	probe - binds to the platform device
  */
 
-int s3c_udc_probe(struct s3c_plat_otg_data *pdata)
+int s3c_udc_probe(struct dwc2_plat_otg_data *pdata)
 {
 	struct dwc2_udc *dev = &memory;
 	int retval = 0;

drivers/usb/gadget/dwc2_udc_otg_priv.h +1 -1

index 96d66b2..0da549c 100644
@@ -80,7 +80,7 @@ struct dwc2_udc {
 	struct usb_gadget gadget;
 	struct usb_gadget_driver *driver;
 
-	struct s3c_plat_otg_data *pdata;
+	struct dwc2_plat_otg_data *pdata;
 
 	int ep0state;
 	struct dwc2_ep ep[DWC2_MAX_ENDPOINTS];

include/usb/s3c_udc.h +2 -2

index 4c0ff67..01590c0 100644
@@ -9,7 +9,7 @@
 #ifndef __S3C_USB_GADGET
 #define __S3C_USB_GADGET
 
-struct s3c_plat_otg_data {
+struct dwc2_plat_otg_data {
 	int		(*phy_control)(int on);
 	unsigned int	regs_phy;
 	unsigned int	regs_otg;

@@ -18,6 +18,6 @@ struct s3c_plat_otg_data {
 	unsigned int	usb_gusbcfg;
 };
 
-int s3c_udc_probe(struct s3c_plat_otg_data *pdata);
+int s3c_udc_probe(struct dwc2_plat_otg_data *pdata);
 
 #endif

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #23 lore raw

PATCH 23/24 usb: s3c-otg: Rename s3c_udc_probe() function

In reply to Marek Vasut

The driver is actually for the Designware DWC2 controller. This patch is the second and final to rename global symbol, the s3c_udc_probe() function.

The rename is done automatically:

	$ sed -i "s/s3c_udc_probe/dwc2_udc_probe/g" \
		`git grep s3c_udc_probe | cut -d : -f 1`

Signed-off-by Marek Vasut <[email protected]>

---
 board/altera/arria5-socdk/socfpga.c      | 2 +-
 board/altera/cyclone5-socdk/socfpga.c    | 2 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c | 4 ++--
 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 +-
 include/usb/s3c_udc.h                    | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

board/altera/arria5-socdk/socfpga.c +1 -1

index 10f8f68..e640d8c 100644
@@ -75,7 +75,7 @@ struct dwc2_plat_otg_data socfpga_otg_data = {
 
 int board_usb_init(int index, enum usb_init_type init)
 {
-	return s3c_udc_probe(&socfpga_otg_data);
+	return dwc2_udc_probe(&socfpga_otg_data);
 }
 
 int g_dnl_board_usb_cable_connected(void)

board/altera/cyclone5-socdk/socfpga.c +1 -1

index 10f8f68..e640d8c 100644
@@ -75,7 +75,7 @@ struct dwc2_plat_otg_data socfpga_otg_data = {
 
 int board_usb_init(int index, enum usb_init_type init)
 {
-	return s3c_udc_probe(&socfpga_otg_data);
+	return dwc2_udc_probe(&socfpga_otg_data);
 }
 
 int g_dnl_board_usb_cable_connected(void)

board/broadcom/bcm28155_ap/bcm28155_ap.c +2 -2

index e517db3..09397fc 100644
@@ -101,8 +101,8 @@ static struct dwc2_plat_otg_data bcm_otg_data = {
 
 int board_usb_init(int index, enum usb_init_type init)
 {
-	debug("%s: performing s3c_udc_probe\n", __func__);
-	return s3c_udc_probe(&bcm_otg_data);
+	debug("%s: performing dwc2_udc_probe\n", __func__);
+	return dwc2_udc_probe(&bcm_otg_data);
 }
 
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)

board/denx/mcvevk/socfpga.c +1 -1

index f27b64e..3870b0b 100644
@@ -35,7 +35,7 @@ struct dwc2_plat_otg_data socfpga_otg_data = {
 
 int board_usb_init(int index, enum usb_init_type init)
 {
-	return s3c_udc_probe(&socfpga_otg_data);
+	return dwc2_udc_probe(&socfpga_otg_data);
 }
 
 int g_dnl_board_usb_cable_connected(void)

board/ebv/socrates/socfpga.c +1 -1

index 10f8f68..e640d8c 100644
@@ -75,7 +75,7 @@ struct dwc2_plat_otg_data socfpga_otg_data = {
 
 int board_usb_init(int index, enum usb_init_type init)
 {
-	return s3c_udc_probe(&socfpga_otg_data);
+	return dwc2_udc_probe(&socfpga_otg_data);
 }
 
 int g_dnl_board_usb_cable_connected(void)

board/samsung/goni/goni.c +1 -1

index 2ba556e..2725a46 100644
@@ -193,7 +193,7 @@ struct dwc2_plat_otg_data s5pc110_otg_data = {
 int board_usb_init(int index, enum usb_init_type init)
 {
 	debug("USB_udc_probe\n");
-	return s3c_udc_probe(&s5pc110_otg_data);
+	return dwc2_udc_probe(&s5pc110_otg_data);
 }
 #endif

board/samsung/odroid/odroid.c +1 -1

index 58cbb72..a3ee159 100644
@@ -510,6 +510,6 @@ int board_usb_init(int index, enum usb_init_type init)
 	}
 #endif
 	debug("USB_udc_probe\n");
-	return s3c_udc_probe(&s5pc210_otg_data);
+	return dwc2_udc_probe(&s5pc210_otg_data);
 }
 #endif

board/samsung/trats/trats.c +1 -1

index 3a553c1..6f711a8 100644
@@ -430,7 +430,7 @@ struct dwc2_plat_otg_data s5pc210_otg_data = {
 int board_usb_init(int index, enum usb_init_type init)
 {
 	debug("USB_udc_probe\n");
-	return s3c_udc_probe(&s5pc210_otg_data);
+	return dwc2_udc_probe(&s5pc210_otg_data);
 }
 
 int g_dnl_board_usb_cable_connected(void)

board/samsung/trats2/trats2.c +1 -1

index e52a817..dd7a606 100644
@@ -314,7 +314,7 @@ struct dwc2_plat_otg_data s5pc210_otg_data = {
 int board_usb_init(int index, enum usb_init_type init)
 {
 	debug("USB_udc_probe\n");
-	return s3c_udc_probe(&s5pc210_otg_data);
+	return dwc2_udc_probe(&s5pc210_otg_data);
 }
 
 int g_dnl_board_usb_cable_connected(void)

board/samsung/universal_c210/universal.c +1 -1

index 747d556..0c1b9d8 100644
@@ -191,7 +191,7 @@ struct dwc2_plat_otg_data s5pc210_otg_data = {
 int board_usb_init(int index, enum usb_init_type init)
 {
 	debug("USB_udc_probe\n");
-	return s3c_udc_probe(&s5pc210_otg_data);
+	return dwc2_udc_probe(&s5pc210_otg_data);
 }
 
 int exynos_early_init_f(void)

board/terasic/sockit/socfpga.c +1 -1

index 10f8f68..e640d8c 100644
@@ -75,7 +75,7 @@ struct dwc2_plat_otg_data socfpga_otg_data = {
 
 int board_usb_init(int index, enum usb_init_type init)
 {
-	return s3c_udc_probe(&socfpga_otg_data);
+	return dwc2_udc_probe(&socfpga_otg_data);
 }
 
 int g_dnl_board_usb_cable_connected(void)

drivers/usb/gadget/dwc2_udc_otg.c +1 -1

index 2e2dfe1..ad9ed33 100644
@@ -797,7 +797,7 @@ static struct dwc2_udc memory = {
  *	probe - binds to the platform device
  */
 
-int s3c_udc_probe(struct dwc2_plat_otg_data *pdata)
+int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata)
 {
 	struct dwc2_udc *dev = &memory;
 	int retval = 0;

include/usb/s3c_udc.h +1 -1

index 01590c0..d8aeca6 100644
@@ -18,6 +18,6 @@ struct dwc2_plat_otg_data {
 	unsigned int	usb_gusbcfg;
 };
 
-int s3c_udc_probe(struct dwc2_plat_otg_data *pdata);
+int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata);
 
 #endif

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-04 02:38 UTC #24 lore raw

PATCH 24/24 usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h

In reply to Marek Vasut

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 <[email protected]>

---
 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/{s3c_udc.h => dwc2_udc.h}    | 8 ++++----
 15 files changed, 18 insertions(+), 18 deletions(-)
 rename include/usb/{s3c_udc.h => dwc2_udc.h} (78%)

board/altera/arria5-socdk/socfpga.c +1 -1

index e640d8c..0fbbc34 100644
@@ -9,7 +9,7 @@
 #include <asm/io.h>
 
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <usb_mass_storage.h>
 
 #include <micrel.h>

board/altera/cyclone5-socdk/socfpga.c +1 -1

index e640d8c..0fbbc34 100644
@@ -9,7 +9,7 @@
 #include <asm/io.h>
 
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <usb_mass_storage.h>
 
 #include <micrel.h>

board/broadcom/bcm28155_ap/bcm28155_ap.c +1 -1

index 09397fc..b3a4a41 100644
@@ -13,7 +13,7 @@
 #include <asm/arch/sysmap.h>
 
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <g_dnl.h>
 
 #define SECWATCHDOG_SDOGCR_OFFSET	0x00000000

board/denx/mcvevk/socfpga.c +1 -1

index 3870b0b..0f93722 100644
@@ -9,7 +9,7 @@
 #include <asm/io.h>
 
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <usb_mass_storage.h>
 
 DECLARE_GLOBAL_DATA_PTR;

board/ebv/socrates/socfpga.c +1 -1

index e640d8c..0fbbc34 100644
@@ -9,7 +9,7 @@
 #include <asm/io.h>
 
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <usb_mass_storage.h>
 
 #include <micrel.h>

board/samsung/goni/goni.c +1 -1

index 2725a46..1600568 100644
@@ -10,7 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <power/pmic.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <asm/arch/cpu.h>
 #include <power/max8998_pmic.h>
 #include <samsung/misc.h>

board/samsung/odroid/odroid.c +1 -1

index a3ee159..b4cb332 100644
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <mmc.h>
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <samsung/misc.h>
 #include "setup.h"

board/samsung/trats/trats.c +1 -1

index 6f711a8..54d01ec 100644
@@ -18,7 +18,7 @@
 #include <asm/arch/watchdog.h>
 #include <asm/arch/power.h>
 #include <power/pmic.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <power/max8997_pmic.h>
 #include <power/max8997_muic.h>
 #include <power/battery.h>

board/samsung/trats2/trats2.c +1 -1

index dd7a606..7b28ae8 100644
@@ -21,7 +21,7 @@
 #include <libtizen.h>
 #include <errno.h>
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <usb_mass_storage.h>
 
 DECLARE_GLOBAL_DATA_PTR;

board/samsung/universal_c210/universal.c +1 -1

index 0c1b9d8..c25b486 100644
@@ -17,7 +17,7 @@
 #include <ld9040.h>
 #include <power/pmic.h>
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <asm/arch/cpu.h>
 #include <power/max8998_pmic.h>
 #include <libtizen.h>

board/terasic/sockit/socfpga.c +1 -1

index e640d8c..0fbbc34 100644
@@ -9,7 +9,7 @@
 #include <asm/io.h>
 
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <usb_mass_storage.h>
 
 #include <micrel.h>

drivers/usb/gadget/dwc2_udc_otg.c +1 -1

index ad9ed33..ffe2952 100644
@@ -46,7 +46,7 @@
 #define DEBUG_OUT_EP 0
 #define DEBUG_IN_EP 0
 
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 
 #define EP0_CON		0
 #define EP_MASK		0xF

drivers/usb/gadget/dwc2_udc_otg_phy.c +1 -1

index d3e9840..e0cbbc0 100644
@@ -36,7 +36,7 @@
 #include "dwc2_udc_otg_priv.h"
 #include <usb/lin_gadget_compat.h>
 
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 
 void otg_phy_init(struct dwc2_udc *dev)
 {

drivers/usb/gadget/dwc2_udc_otg_priv.h +1 -1

index 0da549c..5e9ad10 100644
@@ -14,7 +14,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/list.h>
 #include <usb/lin_gadget_compat.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 
 #define PHY0_SLEEP              (1 << 5)

include/usb/dwc2_udc.h renamed from include/usb/s3c_udc.h +4 -4

similarity index 78%
rename from include/usb/s3c_udc.h
rename to include/usb/dwc2_udc.h
index d8aeca6..1f3effe 100644
@@ -1,13 +1,13 @@
 /*
- * drivers/usb/gadget/s3c_udc.h
+ * 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 __S3C_USB_GADGET
-#define __S3C_USB_GADGET
+#ifndef __DWC2_USB_GADGET
+#define __DWC2_USB_GADGET
 
 struct dwc2_plat_otg_data {
 	int		(*phy_control)(int on);

@@ -20,4 +20,4 @@ struct dwc2_plat_otg_data {
 
 int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata);
 
-#endif
+#endif	/* __DWC2_USB_GADGET */

Signature · 1 line

2.1.4

Lukasz Majewski

2015-12-04 09:09 UTC #25 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

In reply to Marek Vasut

Hi Marek,

Quoted 2 lines

The driver is for the dwc2 otg block , so rename it accordingly finally.

Yeah finally ...

And neither me nor Przemek added to CC....

Quoted 64 lines

Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
usb: s3c-otg: Split private bits from s3c_udc.h
usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG*
usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++ 25 files
changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Marek Vasut

author

2015-12-04 13:38 UTC #26 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Quoted 1 line · Lukasz Majewski

Hi Marek,

Hi!

Quoted 6 lines

Quoted 2 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Yeah finally ...
And neither me nor Przemek added to CC....

You were CCed on all the patches though ... do you prefer your samsung address next time ?

Quoted 55 lines

Quoted 55 lines
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
usb: s3c-otg: Split private bits from s3c_udc.h
usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG*
usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++ 25 files
changed, 319 insertions(+), 307 deletions(-) rename

Quoted 8 lines

Quoted 8 lines
drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h

Best regards,
Marek Vasut

Lukasz Majewski

2015-12-04 15:12 UTC #27 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Hi Marek,

Quoted 8 lines · Lukasz Majewski

Quoted 1 line
Hi Marek,
Hi!
Quoted 3 lines
Quoted 2 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.

Quoted 6 lines

Quoted 3 lines
Yeah finally ...
And neither me nor Przemek added to CC....
You were CCed on all the patches though ... do you prefer your samsung address next time ?

Both :-)

Patches looks good. I only need to run them through my testing monster :-)

Thanks for preparing them.

Quoted 68 lines

Quoted 56 lines
Quoted 56 lines
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
usb: s3c-otg: Split private bits from s3c_udc.h
usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++ 25
files changed, 319 insertions(+), 307 deletions(-) rename
Quoted 8 lines
Quoted 8 lines
drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
Best regards,
Marek Vasut

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Marek Vasut

author

2015-12-04 15:22 UTC #28 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Quoted 1 line · Lukasz Majewski

Hi Marek,

Hi,

Quoted 8 lines

Quoted 8 lines · Lukasz Majewski
Quoted 1 line
Hi Marek,
Hi!
Quoted 3 lines
Quoted 2 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.

Quoted 8 lines

Quoted 6 lines
Quoted 3 lines
Yeah finally ...
And neither me nor Przemek added to CC....
You were CCed on all the patches though ... do you prefer your samsung address next time ?
Both :-)

You're a greedy one, aren't you ... ;-)

Quoted 2 lines

Patches looks good. I only need to run them through my testing monster :-)

Thanks!

Best regards,
Marek Vasut

Lukasz Majewski

2015-12-09 09:37 UTC #29 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

In reply to Marek Vasut

Hi Marek,

Quoted 56 lines

The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
usb: s3c-otg: Split private bits from s3c_udc.h
usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG*
usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++ 25 files

Quoted 10 lines

changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h

What is the base sha1 and branch for those patches?

I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Marek Vasut

author

2015-12-09 14:15 UTC #30 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Quoted 69 lines · Lukasz Majewski

Hi Marek,
Quoted 57 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
usb: s3c-otg: Split private bits from s3c_udc.h
usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG*
usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++ 25 files
Quoted 9 lines
changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h

Quoted 4 lines

What is the base sha1 and branch for those patches?
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)

I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.

Lukasz Majewski

2015-12-09 15:02 UTC #31 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Hi Marek,

Quoted 70 lines · Lukasz Majewski

Quoted 69 lines
Hi Marek,
Quoted 66 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
usb: s3c-otg: Split private bits from s3c_udc.h
usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++ 25
files changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h

Quoted 9 lines

Quoted 4 lines
What is the base sha1 and branch for those patches?
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.

Ok, thanks.

I will examine that.

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Marek Vasut

author

2015-12-09 15:17 UTC #32 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Quoted 79 lines · Lukasz Majewski

Hi Marek,
Quoted 77 lines · Lukasz Majewski
Quoted 75 lines
Hi Marek,
Quoted 59 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
usb: s3c-otg: Split private bits from s3c_udc.h
usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++ 25
Quoted 9 lines
files changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
What is the base sha1 and branch for those patches?
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)

Quoted 7 lines

Quoted 3 lines
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.
Ok, thanks.
I will examine that.

OK, shall I wait with application then ?

Lukasz Majewski

2015-12-09 16:06 UTC #33 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Hi Marek,

Quoted 86 lines · Lukasz Majewski

Quoted 85 lines
Hi Marek,
Quoted 82 lines
Quoted 72 lines · Lukasz Majewski
Hi Marek,
Quoted 61 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to
dwc2_usbotg_reg usb: s3c-otg: Split private bits from s3c_udc.h usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++
25 files changed, 319 insertions(+), 307 deletions(-) rename
Quoted 8 lines
drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
Quoted 4 lines
What is the base sha1 and branch for those patches?
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.

Quoted 6 lines

Quoted 3 lines
Ok, thanks.
I will examine that.
OK, shall I wait with application then ?

Please prepare u-boot-usb/s3c-udc branch.

I will grab patches from there for testing.

If those patches are the same as those send to ML, then I will ack them all by sending reply to patch series cover letter.

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Marek Vasut

author

2015-12-09 16:22 UTC #34 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Quoted 93 lines · Lukasz Majewski

Hi Marek,
Quoted 91 lines · Lukasz Majewski
Quoted 90 lines
Hi Marek,
Quoted 77 lines
On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski
Quoted 74 lines · wrote:
Hi Marek,
Quoted 71 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to
dwc2_usbotg_reg usb: s3c-otg: Split private bits from s3c_udc.h usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
usb: s3c-otg: Rename s3c_ep0_*() functions
usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6 +-
 board/altera/cyclone5-socdk/socfpga.c              |   6 +-
 board/broadcom/bcm28155_ap/bcm28155_ap.c           |   8 +-
 board/denx/mcvevk/socfpga.c                        |   6 +-
 board/ebv/socrates/socfpga.c                       |   6 +-
 board/samsung/goni/goni.c                          |   6 +-
 board/samsung/odroid/odroid.c                      |   6 +-
 board/samsung/trats/trats.c                        |   8 +-
 board/samsung/trats2/trats2.c                      |   6 +-
 board/samsung/universal_c210/universal.c           |   6 +-
 board/terasic/sockit/socfpga.c                     |   6 +-
 drivers/usb/gadget/Makefile                        |   4 +-
 drivers/usb/gadget/bcm_udc_otg_phy.c               |   6 +-
 .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c}   | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h | 43
++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202
++++++++++----------
include/configs/bcm28155_ap.h                      |   2 +-
include/configs/exynos4-common.h                   |   4 +-
include/configs/s5p_goni.h                         |   4 +-
include/configs/s5pc210_universal.h                |   4 +-
include/configs/smdkv310.h                         |   4 +-
include/configs/socfpga_common.h                   |   2 +-
include/usb/dwc2_udc.h                             |  23 +++
25 files changed, 319 insertions(+), 307 deletions(-) rename
drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
Quoted 8 lines
Quoted 4 lines
What is the base sha1 and branch for those patches?
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.
Ok, thanks.

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
I will examine that.
OK, shall I wait with application then ?
Please prepare u-boot-usb/s3c-udc branch.
I will grab patches from there for testing.

It's already there since my last email ;)

Quoted 2 lines

If those patches are the same as those send to ML, then I will ack them all by sending reply to patch series cover letter.

Roger :)

Lukasz Majewski

2015-12-10 16:07 UTC #35 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Hi Marek,

Quoted 103 lines · Lukasz Majewski

Quoted 102 lines
Hi Marek,
Quoted 100 lines
Quoted 98 lines · Lukasz Majewski
Hi Marek,
Quoted 95 lines
On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski
Quoted 84 lines · wrote:
Hi Marek,
Quoted 71 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to
dwc2_usbotg_reg usb: s3c-otg: Split private bits from s3c_udc.h usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in
s3c_udc_otg_xfer_dma.c usb: s3c-otg: Rename s3c_ep0_*() functions usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6
+- board/altera/cyclone5-socdk/socfpga.c |
6 +- board/broadcom/bcm28155_ap/bcm28155_ap.c
| 8 +-
board/denx/mcvevk/socfpga.c | 6
+- board/ebv/socrates/socfpga.c |
6 +- board/samsung/goni/goni.c
| 6 +-
board/samsung/odroid/odroid.c | 6
+- board/samsung/trats/trats.c |
8 +- board/samsung/trats2/trats2.c
| 6 +-
board/samsung/universal_c210/universal.c | 6
+- board/terasic/sockit/socfpga.c |
6 +- drivers/usb/gadget/Makefile
| 4 +-
drivers/usb/gadget/bcm_udc_otg_phy.c | 6
+- .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} |
205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h |
43 ++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202 ++++++++++----------
include/configs/bcm28155_ap.h | 2
+- include/configs/exynos4-common.h |
4 +- include/configs/s5p_goni.h
| 4 +-
include/configs/s5pc210_universal.h | 4
+- include/configs/smdkv310.h |
4 +- include/configs/socfpga_common.h
| 2 +-
include/usb/dwc2_udc.h | 23
+++ 25 files changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c =>
Quoted 8 lines
dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
What is the base sha1 and branch for those patches?
Quoted 2 lines
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.

Quoted 7 lines

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Ok, thanks.
I will examine that.
OK, shall I wait with application then ?
Please prepare u-boot-usb/s3c-udc branch.

I've run this patch series through buildman (before running tests):

./tools/buildman/buildman.py --branch=HEAD samsung --detail --verbose --show_errors --force-build --count=24 --output-dir=./BUILD/

And I've received several errors:

arm: + odroid
+../board/samsung/odroid/odroid.c:460:15: error: 'PHY0_SLEEP'
undeclared here (not in a function)
+ .usb_flags = PHY0_SLEEP,
+ ^
+make[2]: *** [board/samsung/odroid/odroid.o] Error 1 +make[1]: *** [board/samsung/odroid] Error 2
+make: *** [sub-make] Error 2

Please fix :-)

Quoted 10 lines

Quoted 2 lines
I will grab patches from there for testing.
It's already there since my last email ;)
Quoted 2 lines
If those patches are the same as those send to ML, then I will ack them all by sending reply to patch series cover letter.
Roger :)

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Marek Vasut

author

2015-12-10 16:51 UTC #36 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Quoted 145 lines · Lukasz Majewski

Hi Marek,
Quoted 119 lines · Lukasz Majewski
Quoted 118 lines
Hi Marek,
Quoted 116 lines
On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski
Quoted 113 lines · wrote:
Hi Marek,
Quoted 110 lines
On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski
Quoted 99 lines · wrote:
Hi Marek,
Quoted 83 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to
dwc2_usbotg_reg usb: s3c-otg: Split private bits from s3c_udc.h usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in
s3c_udc_otg_xfer_dma.c usb: s3c-otg: Rename s3c_ep0_*() functions usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6
+- board/altera/cyclone5-socdk/socfpga.c |
6 +- board/broadcom/bcm28155_ap/bcm28155_ap.c
| 8 +-
board/denx/mcvevk/socfpga.c | 6
+- board/ebv/socrates/socfpga.c |
6 +- board/samsung/goni/goni.c
| 6 +-
board/samsung/odroid/odroid.c | 6
+- board/samsung/trats/trats.c |
8 +- board/samsung/trats2/trats2.c
| 6 +-
board/samsung/universal_c210/universal.c | 6
+- board/terasic/sockit/socfpga.c |
6 +- drivers/usb/gadget/Makefile
| 4 +-
drivers/usb/gadget/bcm_udc_otg_phy.c | 6
+- .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} |
205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h |
43 ++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202 ++++++++++----------
include/configs/bcm28155_ap.h | 2
+- include/configs/exynos4-common.h |
4 +- include/configs/s5p_goni.h
| 4 +-
include/configs/s5pc210_universal.h | 4
+- include/configs/smdkv310.h |
4 +- include/configs/socfpga_common.h
| 2 +-
Quoted 11 lines
include/usb/dwc2_udc.h | 23
+++ 25 files changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
What is the base sha1 and branch for those patches?
Quoted 2 lines
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Ok, thanks.
I will examine that.
OK, shall I wait with application then ?
Please prepare u-boot-usb/s3c-udc branch.
I've run this patch series through buildman (before running tests):
./tools/buildman/buildman.py --branch=HEAD samsung --detail --verbose --show_errors --force-build --count=24 --output-dir=./BUILD/
And I've received several errors:
arm: + odroid
+../board/samsung/odroid/odroid.c:460:15: error: 'PHY0_SLEEP'
undeclared here (not in a function)
(quoted diff) +5 -0
+  .usb_flags = PHY0_SLEEP,
+               ^
+make[2]: *** [board/samsung/odroid/odroid.o] Error 1
+make[1]: *** [board/samsung/odroid] Error 2
+make: *** [sub-make] Error 2

Quoted 1 line

Please fix :-)

Try the attached fix, if it's OK with you I will wrap it into 04/24 . -------------- next part --------------
A non-text attachment was scrubbed...
Name: diff.diff
Type: text/x-patch
Size: 872 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151210/32e1de3d/attachment.bin>

Marek Vasut

author

2015-12-10 17:08 UTC #37 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Quoted 148 lines · Marek Vasut

Quoted 147 lines · Lukasz Majewski
Hi Marek,
Quoted 119 lines · Lukasz Majewski
Quoted 118 lines
Hi Marek,
Quoted 116 lines
On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski
Quoted 113 lines · wrote:
Hi Marek,
Quoted 110 lines
On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski
Quoted 99 lines · wrote:
Hi Marek,
Quoted 83 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
usb: s3c-otg: Rename struct s3c_usbotg_reg to
dwc2_usbotg_reg usb: s3c-otg: Split private bits from s3c_udc.h usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy usb: s3c-otg: Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in
s3c_udc_otg_xfer_dma.c usb: s3c-otg: Rename s3c_ep0_*() functions usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*() functions
usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
 board/altera/arria5-socdk/socfpga.c                |   6
+- board/altera/cyclone5-socdk/socfpga.c |
6 +- board/broadcom/bcm28155_ap/bcm28155_ap.c
| 8 +-
board/denx/mcvevk/socfpga.c | 6
+- board/ebv/socrates/socfpga.c |
6 +- board/samsung/goni/goni.c
| 6 +-
board/samsung/odroid/odroid.c | 6
+- board/samsung/trats/trats.c |
8 +- board/samsung/trats2/trats2.c
| 6 +-
board/samsung/universal_c210/universal.c | 6
+- board/terasic/sockit/socfpga.c |
6 +- drivers/usb/gadget/Makefile
| 4 +-
drivers/usb/gadget/bcm_udc_otg_phy.c | 6
+- .../usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} |
205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h |
43 ++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32 ++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202 ++++++++++----------
include/configs/bcm28155_ap.h | 2
+- include/configs/exynos4-common.h |
4 +- include/configs/s5p_goni.h
| 4 +-
include/configs/s5pc210_universal.h | 4
+- include/configs/smdkv310.h |
4 +- include/configs/socfpga_common.h
| 2 +-
Quoted 11 lines
include/usb/dwc2_udc.h | 23
+++ 25 files changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
What is the base sha1 and branch for those patches?
Quoted 2 lines
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Ok, thanks.
I will examine that.
OK, shall I wait with application then ?
Please prepare u-boot-usb/s3c-udc branch.
I've run this patch series through buildman (before running tests):
./tools/buildman/buildman.py --branch=HEAD samsung --detail --verbose --show_errors --force-build --count=24 --output-dir=./BUILD/
And I've received several errors:
arm: + odroid
+../board/samsung/odroid/odroid.c:460:15: error: 'PHY0_SLEEP'
undeclared here (not in a function)
(quoted diff) +5 -0
+  .usb_flags = PHY0_SLEEP,
+               ^
+make[2]: *** [board/samsung/odroid/odroid.o] Error 1
+make[1]: *** [board/samsung/odroid] Error 2
+make: *** [sub-make] Error 2

Quoted 3 lines

Quoted 1 line
Please fix :-)
Try the attached fix, if it's OK with you I will wrap it into 04/24 .

I pushed the updated branch to u-boot-usb/s3c-udc , so give it a spin.

Lukasz Majewski

2015-12-15 14:40 UTC #38 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Hi Marek,

Quoted 168 lines · Marek Vasut

Quoted 167 lines
Quoted 165 lines · Lukasz Majewski
Hi Marek,
Quoted 135 lines
Quoted 133 lines · Lukasz Majewski
Hi Marek,
Quoted 131 lines
On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski
Quoted 127 lines · wrote:
Hi Marek,
Quoted 124 lines
On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski
Quoted 111 lines · wrote:
Hi Marek,
Quoted 94 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to
s3c_udc_otg_regs.h usb: s3c-otg: Rename struct s3c_udc to dwc2_udc usb: s3c-otg: Rename struct s3c_usbotg_reg to
dwc2_usbotg_reg usb: s3c-otg: Split private bits from s3c_udc.h usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy usb: s3c-otg:
Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in
s3c_udc_otg_xfer_dma.c usb: s3c-otg: Rename s3c_ep0_*() functions usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*()
functions usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to
usb/dwc2_udc.h
board/altera/arria5-socdk/socfpga.c
| 6
+-
board/altera/cyclone5-socdk/socfpga.c
| 6 +- board/broadcom/bcm28155_ap/bcm28155_ap.c
| 8 +-
board/denx/mcvevk/socfpga.c
| 6 +-
board/ebv/socrates/socfpga.c
| 6 +- board/samsung/goni/goni.c
| 6 +-
board/samsung/odroid/odroid.c
| 6 +-
board/samsung/trats/trats.c
| 8 +- board/samsung/trats2/trats2.c
| 6 +-
board/samsung/universal_c210/universal.c
| 6 +-
board/terasic/sockit/socfpga.c
| 6 +- drivers/usb/gadget/Makefile
| 4 +-
drivers/usb/gadget/bcm_udc_otg_phy.c
| 6 +- .../usb/gadget/{s3c_udc_otg.c =>
dwc2_udc_otg.c} | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h
| 43 ++--- .../usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} | 32
++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202 ++++++++++---------- include/configs/bcm28155_ap.h
| 2 +-
include/configs/exynos4-common.h
| 4 +- include/configs/s5p_goni.h
| 4 +-
include/configs/s5pc210_universal.h
| 4 +-
include/configs/smdkv310.h
| 4 +- include/configs/socfpga_common.h
| 2 +-
Quoted 14 lines
include/usb/dwc2_udc.h
| 23 +++ 25 files changed, 319 insertions(+), 307 deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
Quoted 4 lines
What is the base sha1 and branch for those patches?
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Ok, thanks.
I will examine that.
OK, shall I wait with application then ?
Please prepare u-boot-usb/s3c-udc branch.
I've run this patch series through buildman (before running tests):
./tools/buildman/buildman.py --branch=HEAD samsung --detail --verbose --show_errors --force-build --count=24 --output-dir=./BUILD/
And I've received several errors:
arm: + odroid
+../board/samsung/odroid/odroid.c:460:15: error: 'PHY0_SLEEP'
undeclared here (not in a function)
(quoted diff) +5 -0
+  .usb_flags = PHY0_SLEEP,
+               ^
+make[2]: *** [board/samsung/odroid/odroid.o] Error 1
+make[1]: *** [board/samsung/odroid] Error 2
+make: *** [sub-make] Error 2

Quoted 7 lines

Quoted 4 lines
Quoted 1 line
Please fix :-)
Try the attached fix, if it's OK with you I will wrap it into 04/24 .
I pushed the updated branch to u-boot-usb/s3c-udc , so give it a spin.

Reviewed-by Lukasz Majewski <[email protected]>

Tested-by Lukasz Majewski <[email protected]>

Test HW: Trats (Exynos4210) and Odroid XU3 (Exynos5800)

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Marek Vasut

author

2015-12-15 22:50 UTC #39 lore raw

cover usb: s3c-otg: Rename driver to dwc2-otg

Quoted 1 line · Lukasz Majewski

Hi Marek,

Hi!

Quoted 203 lines

Quoted 203 lines · Marek Vasut
Quoted 201 lines
On Thursday, December 10, 2015 at 05:07:53 PM, Lukasz Majewski
Quoted 194 lines · wrote:
Hi Marek,
Quoted 171 lines
On Wednesday, December 09, 2015 at 05:06:52 PM, Lukasz Majewski
Quoted 168 lines · wrote:
Hi Marek,
Quoted 159 lines
On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski
Quoted 155 lines · wrote:
Hi Marek,
Quoted 152 lines
On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski
Quoted 139 lines · wrote:
Hi Marek,
Quoted 124 lines
The driver is for the dwc2 otg block , so rename it accordingly finally.
Marek Vasut (24):
usb: s3c-otg: Rename regs-otg.h to
s3c_udc_otg_regs.h usb: s3c-otg: Rename struct s3c_udc to dwc2_udc usb: s3c-otg: Rename struct s3c_usbotg_reg to
dwc2_usbotg_reg usb: s3c-otg: Split private bits from s3c_udc.h usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy usb: s3c-otg:
Rename struct s3c_dev_*_ep
usb: s3c-otg: Rename struct s3c_ep
usb: s3c-otg: Rename struct s3c_request
usb: s3c-otg: Staticize s3c_udc_ep_set_stall
usb: s3c-otg: Staticize functions in
s3c_udc_otg_xfer_dma.c usb: s3c-otg: Rename s3c_ep0_*() functions usb: s3c-otg: Rename s3c_ep_*() functions
usb: s3c-otg: Rename s3c_udc_*() functions
usb: s3c-otg: Rename remaining local s3c_*()
functions usb: s3c-otg: Zap useless externs
usb: s3c-otg: Change the driver name to dwc2-udc
usb: s3c-otg: Rename local headers to dwc2_*h
usb: s3c-otg: Rename sources to dwc2_*c
usb: s3c-otg: Rename remaining macros
usb: s3c-otg: Tweak the comments
usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to
USB_GADGET_DWC2_OTG* usb: s3c-otg: Rename struct s3c_plat_otg_data
usb: s3c-otg: Rename s3c_udc_probe() function
usb: s3c-otg: Rename usb/s3c_udc.h to
usb/dwc2_udc.h
board/altera/arria5-socdk/socfpga.c
| 6
+-
board/altera/cyclone5-socdk/socfpga.c
| 6 +- board/broadcom/bcm28155_ap/bcm28155_ap.c
| 
|   8 +-
board/denx/mcvevk/socfpga.c
| 6 +-
board/ebv/socrates/socfpga.c
| 6 +- board/samsung/goni/goni.c
| 
|   6 +-
board/samsung/odroid/odroid.c
| 6 +-
board/samsung/trats/trats.c
| 8 +- board/samsung/trats2/trats2.c
| 
|   6 +-
board/samsung/universal_c210/universal.c
| 6 +-
board/terasic/sockit/socfpga.c
| 6 +- drivers/usb/gadget/Makefile
| 
|   4 +-
drivers/usb/gadget/bcm_udc_otg_phy.c
| 6 +- .../usb/gadget/{s3c_udc_otg.c =>
dwc2_udc_otg.c} | 205
+++++++++++---------- .../{s3c_udc_otg_phy.c =>
dwc2_udc_otg_phy.c} | 21
++- .../usb/gadget/dwc2_udc_otg_priv.h
| 43 ++--- .../usb/gadget/{regs-otg.h =>
dwc2_udc_otg_regs.h} | 32
++-- ..._udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} | 202 ++++++++++---------- include/configs/bcm28155_ap.h
| 2 +-
include/configs/exynos4-common.h
| 4 +- include/configs/s5p_goni.h
| 
|   4 +-
include/configs/s5pc210_universal.h
| 4 +-
include/configs/smdkv310.h
| 4 +- include/configs/socfpga_common.h
| 
|   2 +-
include/usb/dwc2_udc.h
| 23 +++ 25 files changed, 319 insertions(+), 307
Quoted 12 lines
deletions(-) rename drivers/usb/gadget/{s3c_udc_otg.c => dwc2_udc_otg.c} (77%) rename drivers/usb/gadget/{s3c_udc_otg_phy.c => dwc2_udc_otg_phy.c} (83%) rename include/usb/s3c_udc.h => drivers/usb/gadget/dwc2_udc_otg_priv.h (69%) rename drivers/usb/gadget/{regs-otg.h => dwc2_udc_otg_regs.h} (92%) rename drivers/usb/gadget/{s3c_udc_otg_xfer_dma.c => dwc2_udc_otg_xfer_dma.c} (88%) create mode 100644 include/usb/dwc2_udc.h
Quoted 4 lines
What is the base sha1 and branch for those patches?
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
I should've updated u-boot-usb, sorry about that. I can pick them through u-boot-usb/master if you don't mind to make things easier for you. I put the patches into u-boot-usb/s3c-udc for now.
Quoted 5 lines
Quoted 3 lines
Ok, thanks.
I will examine that.
OK, shall I wait with application then ?
Please prepare u-boot-usb/s3c-udc branch.
I've run this patch series through buildman (before running tests):
./tools/buildman/buildman.py --branch=HEAD samsung --detail --verbose --show_errors --force-build --count=24 --output-dir=./BUILD/
And I've received several errors:
arm: + odroid
+../board/samsung/odroid/odroid.c:460:15: error: 'PHY0_SLEEP'
undeclared here (not in a function)
(quoted diff) +5 -0
+  .usb_flags = PHY0_SLEEP,
+               ^
+make[2]: *** [board/samsung/odroid/odroid.o] Error 1
+make[1]: *** [board/samsung/odroid] Error 2
+make: *** [sub-make] Error 2
Quoted 1 line
Please fix :-)
Try the attached fix, if it's OK with you I will wrap it into 04/24 .

Quoted 6 lines

Quoted 1 line
I pushed the updated branch to u-boot-usb/s3c-udc , so give it a spin.
Reviewed-by Lukasz Majewski <[email protected]>
Tested-by Lukasz Majewski <[email protected]>
Test HW: Trats (Exynos4210) and Odroid XU3 (Exynos5800)

OK, applied, thanks!