* [U-Boot] [PATCH 01/24] usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
@ 2015-12-04 2:37 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 02/24] usb: s3c-otg: Rename struct s3c_udc to dwc2_udc Marek Vasut
` (24 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:37 UTC (permalink / raw)
To: u-boot
Rename the header file, so it's obvious which driver it's part of.
No functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
---
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%)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 7a2d1e7..184ff4e 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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>
/***********************************************************/
diff --git a/drivers/usb/gadget/s3c_udc_otg_phy.c b/drivers/usb/gadget/s3c_udc_otg_phy.c
index f13cb89..963b617 100644
--- a/drivers/usb/gadget/s3c_udc_otg_phy.c
+++ b/drivers/usb/gadget/s3c_udc_otg_phy.c
@@ -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>
diff --git a/drivers/usb/gadget/regs-otg.h b/drivers/usb/gadget/s3c_udc_otg_regs.h
similarity index 100%
rename from drivers/usb/gadget/regs-otg.h
rename to drivers/usb/gadget/s3c_udc_otg_regs.h
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 02/24] usb: s3c-otg: Rename struct s3c_udc to dwc2_udc
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
2015-12-04 2:37 ` [U-Boot] [PATCH 01/24] usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 03/24] usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg Marek Vasut
` (23 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c
index f8690b0..936247e 100644
--- a/drivers/usb/gadget/bcm_udc_otg_phy.c
+++ b/drivers/usb/gadget/bcm_udc_otg_phy.c
@@ -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,
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 184ff4e..eb7f77e 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -65,7 +65,7 @@ static char *state_names[] = {
#define DRIVER_DESC "S3C HS USB OTG Device Driver, (c) Samsung Electronics"
#define DRIVER_VERSION "15 March 2009"
-struct s3c_udc *the_controller;
+struct dwc2_udc *the_controller;
static const char driver_name[] = "s3c-udc";
static const char driver_desc[] = DRIVER_DESC;
@@ -94,18 +94,18 @@ 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 s3c_udc *dev);
-static void s3c_ep0_kick(struct s3c_udc *dev, struct s3c_ep *ep);
-static void s3c_handle_ep0(struct s3c_udc *dev);
-static int s3c_ep0_write(struct s3c_udc *dev);
+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_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 void stop_activity(struct s3c_udc *dev,
+static void stop_activity(struct dwc2_udc *dev,
struct usb_gadget_driver *driver);
-static int udc_enable(struct s3c_udc *dev);
-static void udc_set_address(struct s3c_udc *dev, unsigned char address);
-static void reconfig_usbd(struct s3c_udc *dev);
-static void set_max_pktsize(struct s3c_udc *dev, enum usb_device_speed speed);
+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 int s3c_udc_set_halt(struct usb_ep *_ep, int value);
static void s3c_udc_set_nak(struct s3c_ep *ep);
@@ -151,8 +151,8 @@ bool dfu_usb_get_reset(void)
return !!(readl(®->gintsts) & INT_RESET);
}
-__weak void otg_phy_init(struct s3c_udc *dev) {}
-__weak void otg_phy_off(struct s3c_udc *dev) {}
+__weak void otg_phy_init(struct dwc2_udc *dev) {}
+__weak void otg_phy_off(struct dwc2_udc *dev) {}
/***********************************************************/
@@ -161,7 +161,7 @@ __weak void otg_phy_off(struct s3c_udc *dev) {}
/*
* udc_disable - disable USB device controller
*/
-static void udc_disable(struct s3c_udc *dev)
+static void udc_disable(struct dwc2_udc *dev)
{
debug_cond(DEBUG_SETUP != 0, "%s: %p\n", __func__, dev);
@@ -177,7 +177,7 @@ static void udc_disable(struct s3c_udc *dev)
/*
* udc_reinit - initialize software state
*/
-static void udc_reinit(struct s3c_udc *dev)
+static void udc_reinit(struct dwc2_udc *dev)
{
unsigned int i;
@@ -210,7 +210,7 @@ static void udc_reinit(struct s3c_udc *dev)
/* until it's enabled, this UDC should be completely invisible
* to any USB host.
*/
-static int udc_enable(struct s3c_udc *dev)
+static int udc_enable(struct dwc2_udc *dev)
{
debug_cond(DEBUG_SETUP != 0, "%s: %p\n", __func__, dev);
@@ -231,7 +231,7 @@ static int udc_enable(struct s3c_udc *dev)
*/
int usb_gadget_register_driver(struct usb_gadget_driver *driver)
{
- struct s3c_udc *dev = the_controller;
+ struct dwc2_udc *dev = the_controller;
int retval = 0;
unsigned long flags = 0;
@@ -280,7 +280,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
*/
int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
{
- struct s3c_udc *dev = the_controller;
+ struct dwc2_udc *dev = the_controller;
unsigned long flags = 0;
if (!dev)
@@ -368,7 +368,7 @@ static void nuke(struct s3c_ep *ep, int status)
}
}
-static void stop_activity(struct s3c_udc *dev,
+static void stop_activity(struct dwc2_udc *dev,
struct usb_gadget_driver *driver)
{
int i;
@@ -396,7 +396,7 @@ static void stop_activity(struct s3c_udc *dev,
udc_reinit(dev);
}
-static void reconfig_usbd(struct s3c_udc *dev)
+static void reconfig_usbd(struct dwc2_udc *dev)
{
/* 2. Soft-reset OTG Core and then unreset again. */
int i;
@@ -496,7 +496,7 @@ static void reconfig_usbd(struct s3c_udc *dev)
writel(GAHBCFG_INIT, ®->gahbcfg);
}
-static void set_max_pktsize(struct s3c_udc *dev, enum usb_device_speed speed)
+static void set_max_pktsize(struct dwc2_udc *dev, enum usb_device_speed speed)
{
unsigned int ep_ctrl;
int i;
@@ -530,7 +530,7 @@ static int s3c_ep_enable(struct usb_ep *_ep,
const struct usb_endpoint_descriptor *desc)
{
struct s3c_ep *ep;
- struct s3c_udc *dev;
+ struct dwc2_udc *dev;
unsigned long flags = 0;
debug("%s: %p\n", __func__, _ep);
@@ -722,7 +722,7 @@ static const struct usb_gadget_ops s3c_udc_ops = {
/* current versions must always be self-powered */
};
-static struct s3c_udc memory = {
+static struct dwc2_udc memory = {
.usb_address = 0,
.gadget = {
.ops = &s3c_udc_ops,
@@ -798,7 +798,7 @@ static struct s3c_udc memory = {
int s3c_udc_probe(struct s3c_plat_otg_data *pdata)
{
- struct s3c_udc *dev = &memory;
+ struct dwc2_udc *dev = &memory;
int retval = 0;
debug("%s: %p\n", __func__, pdata);
diff --git a/drivers/usb/gadget/s3c_udc_otg_phy.c b/drivers/usb/gadget/s3c_udc_otg_phy.c
index 963b617..ffc930c 100644
--- a/drivers/usb/gadget/s3c_udc_otg_phy.c
+++ b/drivers/usb/gadget/s3c_udc_otg_phy.c
@@ -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 =
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index 7e7a2c2..6695444 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -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(®->dcfg);
writel(DEVICE_ADDRESS(address) | ctrl, ®->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));
diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h
index 7f49a4e..f6c3a86 100644
--- a/include/usb/s3c_udc.h
+++ b/include/usb/s3c_udc.h
@@ -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);
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 03/24] usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
2015-12-04 2:37 ` [U-Boot] [PATCH 01/24] usb: s3c-otg: Rename regs-otg.h to s3c_udc_otg_regs.h Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 02/24] usb: s3c-otg: Rename struct s3c_udc to dwc2_udc Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 04/24] usb: s3c-otg: Split private bits from s3c_udc.h Marek Vasut
` (22 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
drivers/usb/gadget/s3c_udc_otg.c | 4 ++--
drivers/usb/gadget/s3c_udc_otg_regs.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index eb7f77e..00d03f3 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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; */
diff --git a/drivers/usb/gadget/s3c_udc_otg_regs.h b/drivers/usb/gadget/s3c_udc_otg_regs.h
index ac5d112..c8da803 100644
--- a/drivers/usb/gadget/s3c_udc_otg_regs.h
+++ b/drivers/usb/gadget/s3c_udc_otg_regs.h
@@ -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 */
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 04/24] usb: s3c-otg: Split private bits from s3c_udc.h
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (2 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 03/24] usb: s3c-otg: Rename struct s3c_usbotg_reg to dwc2_usbotg_reg Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 05/24] usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy Marek Vasut
` (21 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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%)
diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c
index 936247e..c58388c 100644
--- a/drivers/usb/gadget/bcm_udc_otg_phy.c
+++ b/drivers/usb/gadget/bcm_udc_otg_phy.c
@@ -9,7 +9,7 @@
#include <asm/io.h>
#include <asm/arch/sysmap.h>
-#include <usb/s3c_udc.h>
+#include "s3c_udc_otg_priv.h"
#include "bcm_udc_otg.h"
void otg_phy_init(struct dwc2_udc *dev)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 00d03f3..99c6a1b 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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>
/***********************************************************/
diff --git a/drivers/usb/gadget/s3c_udc_otg_phy.c b/drivers/usb/gadget/s3c_udc_otg_phy.c
index ffc930c..169f8e4 100644
--- a/drivers/usb/gadget/s3c_udc_otg_phy.c
+++ b/drivers/usb/gadget/s3c_udc_otg_phy.c
@@ -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>
diff --git a/include/usb/s3c_udc.h b/drivers/usb/gadget/s3c_udc_otg_priv.h
similarity index 86%
copy from include/usb/s3c_udc.h
copy to drivers/usb/gadget/s3c_udc_otg_priv.h
index f6c3a86..004dd7a 100644
--- a/include/usb/s3c_udc.h
+++ b/drivers/usb/gadget/s3c_udc_otg_priv.h
@@ -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__ */
diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h
index f6c3a86..7064b86 100644
--- a/include/usb/s3c_udc.h
+++ b/include/usb/s3c_udc.h
@@ -9,99 +9,6 @@
#ifndef __S3C_USB_GADGET
#define __S3C_USB_GADGET
-#include <asm/errno.h>
-#include <linux/sizes.h>
-#include <linux/usb/ch9.h>
-#include <linux/usb/gadget.h>
-#include <linux/list.h>
-#include <usb/lin_gadget_compat.h>
-
-#define PHY0_SLEEP (1 << 5)
-
-/*-------------------------------------------------------------------------*/
-/* DMA bounce buffer size, 16K is enough even for mass storage */
-#define DMA_BUFFER_SIZE (16*SZ_1K)
-
-#define EP0_FIFO_SIZE 64
-#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 WAIT_FOR_SETUP 0
-#define DATA_STATE_XMIT 1
-#define DATA_STATE_NEED_ZLP 2
-#define WAIT_FOR_OUT_STATUS 3
-#define DATA_STATE_RECV 4
-#define WAIT_FOR_COMPLETE 5
-#define WAIT_FOR_OUT_COMPLETE 6
-#define WAIT_FOR_IN_COMPLETE 7
-#define WAIT_FOR_NULL_COMPLETE 8
-
-#define TEST_J_SEL 0x1
-#define TEST_K_SEL 0x2
-#define TEST_SE0_NAK_SEL 0x3
-#define TEST_PACKET_SEL 0x4
-#define TEST_FORCE_ENABLE_SEL 0x5
-
-/* ************************************************************************* */
-/* IO
- */
-
-enum ep_type {
- ep_control, ep_bulk_in, ep_bulk_out, ep_interrupt
-};
-
-struct s3c_ep {
- struct usb_ep ep;
- struct dwc2_udc *dev;
-
- const struct usb_endpoint_descriptor *desc;
- struct list_head queue;
- unsigned long pio_irqs;
- int len;
- void *dma_buf;
-
- u8 stopped;
- u8 bEndpointAddress;
- u8 bmAttributes;
-
- enum ep_type ep_type;
- int fifo_num;
-};
-
-struct s3c_request {
- struct usb_request req;
- struct list_head queue;
-};
-
-struct dwc2_udc {
- struct usb_gadget gadget;
- struct usb_gadget_driver *driver;
-
- struct s3c_plat_otg_data *pdata;
-
- int ep0state;
- struct s3c_ep ep[S3C_MAX_ENDPOINTS];
-
- unsigned char usb_address;
-
- 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);
-
-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;
@@ -110,4 +17,7 @@ struct s3c_plat_otg_data {
unsigned int usb_flags;
unsigned int usb_gusbcfg;
};
+
+extern int s3c_udc_probe(struct s3c_plat_otg_data *pdata);
+
#endif
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 05/24] usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (3 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 04/24] usb: s3c-otg: Split private bits from s3c_udc.h Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 06/24] usb: s3c-otg: Rename struct s3c_dev_*_ep Marek Vasut
` (20 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg_phy.c b/drivers/usb/gadget/s3c_udc_otg_phy.c
index 169f8e4..a761b43 100644
--- a/drivers/usb/gadget/s3c_udc_otg_phy.c
+++ b/drivers/usb/gadget/s3c_udc_otg_phy.c
@@ -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);
diff --git a/drivers/usb/gadget/s3c_udc_otg_regs.h b/drivers/usb/gadget/s3c_udc_otg_regs.h
index c8da803..e5115dd 100644
--- a/drivers/usb/gadget/s3c_udc_otg_regs.h
+++ b/drivers/usb/gadget/s3c_udc_otg_regs.h
@@ -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;
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 06/24] usb: s3c-otg: Rename struct s3c_dev_*_ep
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (4 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 05/24] usb: s3c-otg: Rename struct s3c_usbotg_phy to dwc2_usbotg_phy Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 07/24] usb: s3c-otg: Rename struct s3c_ep Marek Vasut
` (19 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
The driver is actually for the Designware DWC2 controller.
This patch renames struct s3c_dev_*_ep to reflect this.
Signed-off-by: Marek Vasut <marex@denx.de>
---
drivers/usb/gadget/s3c_udc_otg_regs.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg_regs.h b/drivers/usb/gadget/s3c_udc_otg_regs.h
index e5115dd..57affcb 100644
--- a/drivers/usb/gadget/s3c_udc_otg_regs.h
+++ b/drivers/usb/gadget/s3c_udc_otg_regs.h
@@ -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];
};
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 07/24] usb: s3c-otg: Rename struct s3c_ep
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (5 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 06/24] usb: s3c-otg: Rename struct s3c_dev_*_ep Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 08/24] usb: s3c-otg: Rename struct s3c_request Marek Vasut
` (18 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
The driver is actually for the Designware DWC2 controller.
This patch renames struct s3c_ep to reflect this.
Signed-off-by: Marek Vasut <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 99c6a1b..4caa390 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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;
diff --git a/drivers/usb/gadget/s3c_udc_otg_priv.h b/drivers/usb/gadget/s3c_udc_otg_priv.h
index 004dd7a..bceb037 100644
--- a/drivers/usb/gadget/s3c_udc_otg_priv.h
+++ b/drivers/usb/gadget/s3c_udc_otg_priv.h
@@ -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__ */
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index 6695444..53c9d4e 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -90,7 +90,7 @@ static inline void s3c_ep0_complete_out(void)
}
-static int setdma_rx(struct s3c_ep *ep, struct s3c_request *req)
+static int setdma_rx(struct dwc2_ep *ep, struct s3c_request *req)
{
u32 *buf, ctrl;
u32 length, pktcnt;
@@ -128,7 +128,7 @@ static int setdma_rx(struct s3c_ep *ep, struct s3c_request *req)
}
-int setdma_tx(struct s3c_ep *ep, struct s3c_request *req)
+int setdma_tx(struct dwc2_ep *ep, struct s3c_request *req)
{
u32 *buf, ctrl = 0;
u32 length, pktcnt;
@@ -188,7 +188,7 @@ int setdma_tx(struct s3c_ep *ep, struct s3c_request *req)
static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
{
- struct s3c_ep *ep = &dev->ep[ep_num];
+ struct dwc2_ep *ep = &dev->ep[ep_num];
struct s3c_request *req = NULL;
u32 ep_tsr = 0, xfer_size = 0, is_short = 0;
@@ -261,7 +261,7 @@ static void complete_rx(struct dwc2_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 dwc2_ep *ep = &dev->ep[ep_num];
struct s3c_request *req;
u32 ep_tsr = 0, xfer_size = 0, is_short = 0;
u32 last;
@@ -337,7 +337,7 @@ 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 s3c_ep *ep = &dev->ep[ep_num];
+ struct dwc2_ep *ep = &dev->ep[ep_num];
struct s3c_request *req;
debug_cond(DEBUG_IN_EP,
@@ -583,7 +583,7 @@ static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
gfp_t gfp_flags)
{
struct s3c_request *req;
- struct s3c_ep *ep;
+ struct dwc2_ep *ep;
struct dwc2_udc *dev;
unsigned long flags = 0;
u32 ep_num, gintsts;
@@ -596,7 +596,7 @@ static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
return -EINVAL;
}
- 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))) {
@@ -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 s3c_ep *ep, struct s3c_request *req)
+static int write_fifo_ep0(struct dwc2_ep *ep, struct s3c_request *req)
{
u32 max;
unsigned count;
@@ -718,7 +718,7 @@ static int write_fifo_ep0(struct s3c_ep *ep, struct s3c_request *req)
return 0;
}
-int s3c_fifo_read(struct s3c_ep *ep, u32 *cp, int max)
+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));
@@ -751,7 +751,7 @@ static void udc_set_address(struct dwc2_udc *dev, unsigned char address)
dev->usb_address = address;
}
-static inline void s3c_udc_ep0_set_stall(struct s3c_ep *ep)
+static inline void s3c_udc_ep0_set_stall(struct dwc2_ep *ep)
{
struct dwc2_udc *dev;
u32 ep_ctrl = 0;
@@ -782,7 +782,7 @@ static inline void s3c_udc_ep0_set_stall(struct s3c_ep *ep)
static void s3c_ep0_read(struct dwc2_udc *dev)
{
struct s3c_request *req;
- struct s3c_ep *ep = &dev->ep[0];
+ struct dwc2_ep *ep = &dev->ep[0];
if (!list_empty(&ep->queue)) {
req = list_entry(ep->queue.next, struct s3c_request, queue);
@@ -819,7 +819,7 @@ static void s3c_ep0_read(struct dwc2_udc *dev)
static int s3c_ep0_write(struct dwc2_udc *dev)
{
struct s3c_request *req;
- struct s3c_ep *ep = &dev->ep[0];
+ struct dwc2_ep *ep = &dev->ep[0];
int ret, need_zlp = 0;
if (list_empty(&ep->queue))
@@ -920,7 +920,7 @@ int s3c_udc_get_status(struct dwc2_udc *dev,
return 0;
}
-static void s3c_udc_set_nak(struct s3c_ep *ep)
+static void s3c_udc_set_nak(struct dwc2_ep *ep)
{
u8 ep_num;
u32 ep_ctrl = 0;
@@ -946,7 +946,7 @@ static void s3c_udc_set_nak(struct s3c_ep *ep)
}
-void s3c_udc_ep_set_stall(struct s3c_ep *ep)
+void s3c_udc_ep_set_stall(struct dwc2_ep *ep)
{
u8 ep_num;
u32 ep_ctrl = 0;
@@ -981,7 +981,7 @@ void s3c_udc_ep_set_stall(struct s3c_ep *ep)
return;
}
-void s3c_udc_ep_clear_stall(struct s3c_ep *ep)
+void s3c_udc_ep_clear_stall(struct dwc2_ep *ep)
{
u8 ep_num;
u32 ep_ctrl = 0;
@@ -1031,12 +1031,12 @@ 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 dwc2_ep *ep;
struct dwc2_udc *dev;
unsigned long flags = 0;
u8 ep_num;
- ep = container_of(_ep, struct s3c_ep, ep);
+ ep = container_of(_ep, struct dwc2_ep, ep);
ep_num = ep_index(ep);
if (unlikely(!_ep || !ep->desc || ep_num == EP0_CON ||
@@ -1076,7 +1076,7 @@ static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
return 0;
}
-void s3c_udc_ep_activate(struct s3c_ep *ep)
+void s3c_udc_ep_activate(struct dwc2_ep *ep)
{
u8 ep_num;
u32 ep_ctrl = 0, daintmsk = 0;
@@ -1126,10 +1126,10 @@ void s3c_udc_ep_activate(struct s3c_ep *ep)
static int s3c_udc_clear_feature(struct usb_ep *_ep)
{
struct dwc2_udc *dev;
- struct s3c_ep *ep;
+ struct dwc2_ep *ep;
u8 ep_num;
- ep = container_of(_ep, struct s3c_ep, ep);
+ ep = container_of(_ep, struct dwc2_ep, ep);
ep_num = ep_index(ep);
dev = ep->dev;
@@ -1190,10 +1190,10 @@ static int s3c_udc_clear_feature(struct usb_ep *_ep)
static int s3c_udc_set_feature(struct usb_ep *_ep)
{
struct dwc2_udc *dev;
- struct s3c_ep *ep;
+ struct dwc2_ep *ep;
u8 ep_num;
- ep = container_of(_ep, struct s3c_ep, ep);
+ ep = container_of(_ep, struct dwc2_ep, ep);
ep_num = ep_index(ep);
dev = ep->dev;
@@ -1264,7 +1264,7 @@ static int s3c_udc_set_feature(struct usb_ep *_ep)
*/
void s3c_ep0_setup(struct dwc2_udc *dev)
{
- struct s3c_ep *ep = &dev->ep[0];
+ struct dwc2_ep *ep = &dev->ep[0];
int i;
u8 ep_num;
@@ -1465,7 +1465,7 @@ static void s3c_handle_ep0(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)
{
debug_cond(DEBUG_EP0 != 0,
"%s: ep_is_in = %d\n", __func__, ep_is_in(ep));
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 08/24] usb: s3c-otg: Rename struct s3c_request
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (6 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 07/24] usb: s3c-otg: Rename struct s3c_ep Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 09/24] usb: s3c-otg: Staticize s3c_udc_ep_set_stall Marek Vasut
` (17 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
The driver is actually for the Designware DWC2 controller.
This patch renames struct s3c_request to reflect this.
Signed-off-by: Marek Vasut <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 4caa390..22b9518 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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);
diff --git a/drivers/usb/gadget/s3c_udc_otg_priv.h b/drivers/usb/gadget/s3c_udc_otg_priv.h
index bceb037..953cded 100644
--- a/drivers/usb/gadget/s3c_udc_otg_priv.h
+++ b/drivers/usb/gadget/s3c_udc_otg_priv.h
@@ -71,7 +71,7 @@ struct dwc2_ep {
int fifo_num;
};
-struct s3c_request {
+struct dwc2_request {
struct usb_request req;
struct list_head queue;
};
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index 53c9d4e..0288d44 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -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(®->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(®->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;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 09/24] usb: s3c-otg: Staticize s3c_udc_ep_set_stall
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (7 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 08/24] usb: s3c-otg: Rename struct s3c_request Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 10/24] usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c Marek Vasut
` (16 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
This function is local to s3c_udc_otg_xfer_dma.c , staticize it.
Signed-off-by: Marek Vasut <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg_priv.h b/drivers/usb/gadget/s3c_udc_otg_priv.h
index 953cded..881b825 100644
--- a/drivers/usb/gadget/s3c_udc_otg_priv.h
+++ b/drivers/usb/gadget/s3c_udc_otg_priv.h
@@ -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__ */
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index 0288d44..1390239 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -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;
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 10/24] usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (8 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 09/24] usb: s3c-otg: Staticize s3c_udc_ep_set_stall Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 11/24] usb: s3c-otg: Rename s3c_ep0_*() functions Marek Vasut
` (15 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
Just staticize the functions, they are not used outside of the file.
Signed-off-by: Marek Vasut <marex@denx.de>
---
drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index 1390239..a8237d4 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -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;
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 11/24] usb: s3c-otg: Rename s3c_ep0_*() functions
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (9 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 10/24] usb: s3c-otg: Staticize functions in s3c_udc_otg_xfer_dma.c Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 12/24] usb: s3c-otg: Rename s3c_ep_*() functions Marek Vasut
` (14 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
The driver is actually for the Designware DWC2 controller.
This patch renames the s3c_ep0_*() functions to reflect this.
Signed-off-by: Marek Vasut <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 22b9518..a5091dc 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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,
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index a8237d4..aa50639 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -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);
}
}
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 12/24] usb: s3c-otg: Rename s3c_ep_*() functions
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (10 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 11/24] usb: s3c-otg: Rename s3c_ep0_*() functions Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 13/24] usb: s3c-otg: Rename s3c_udc_*() functions Marek Vasut
` (13 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
The driver is actually for the Designware DWC2 controller.
This patch renames the s3c_ep_*() functions to reflect this.
Signed-off-by: Marek Vasut <marex@denx.de>
---
drivers/usb/gadget/s3c_udc_otg.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index a5091dc..0b75f26 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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), ®->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,
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 13/24] usb: s3c-otg: Rename s3c_udc_*() functions
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (11 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 12/24] usb: s3c-otg: Rename s3c_ep_*() functions Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 14/24] usb: s3c-otg: Rename remaining local s3c_*() functions Marek Vasut
` (12 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 0b75f26..4cf82e2 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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(®->gintmsk);
if (intr_status & gintmsk)
- return s3c_udc_irq(1, (void *)the_controller);
+ return dwc2_udc_irq(1, (void *)the_controller);
return 0;
}
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index aa50639..e93d602 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -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 dwc2_udc *dev)
+static inline void dwc2_udc_ep0_zlp(struct dwc2_udc *dev)
{
u32 ep_ctrl;
@@ -41,7 +41,7 @@ static inline void s3c_udc_ep0_zlp(struct dwc2_udc *dev)
dev->ep0state = WAIT_FOR_IN_COMPLETE;
}
-static void s3c_udc_pre_setup(void)
+static void dwc2_udc_pre_setup(void)
{
u32 ep_ctrl;
@@ -240,7 +240,7 @@ static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
if (is_short || req->req.actual == req->req.length) {
if (ep_num == EP0_CON && dev->ep0state == DATA_STATE_RECV) {
debug_cond(DEBUG_OUT_EP != 0, " => Send ZLP\n");
- s3c_udc_ep0_zlp(dev);
+ dwc2_udc_ep0_zlp(dev);
/* packet will be completed in complete_tx() */
dev->ep0state = WAIT_FOR_IN_COMPLETE;
} else {
@@ -335,7 +335,7 @@ 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)
+static inline void dwc2_udc_check_tx_queue(struct dwc2_udc *dev, u8 ep_num)
{
struct dwc2_ep *ep = &dev->ep[ep_num];
struct dwc2_request *req;
@@ -392,12 +392,12 @@ static void process_ep_in_intr(struct dwc2_udc *dev)
dev->ep0state = WAIT_FOR_SETUP;
if (dev->ep0state == WAIT_FOR_SETUP)
- s3c_udc_pre_setup();
+ dwc2_udc_pre_setup();
/* continue transfer after
set_clear_halt for DMA mode */
if (clear_feature_flag == 1) {
- s3c_udc_check_tx_queue(dev,
+ dwc2_udc_check_tx_queue(dev,
clear_feature_num);
clear_feature_flag = 0;
}
@@ -438,7 +438,7 @@ static void process_ep_out_intr(struct dwc2_udc *dev)
complete_rx(dev, ep_num);
else {
dev->ep0state = WAIT_FOR_SETUP;
- s3c_udc_pre_setup();
+ dwc2_udc_pre_setup();
}
}
@@ -461,7 +461,7 @@ static void process_ep_out_intr(struct dwc2_udc *dev)
/*
* usb client interrupt handler.
*/
-static int s3c_udc_irq(int irq, void *_dev)
+static int dwc2_udc_irq(int irq, void *_dev)
{
struct dwc2_udc *dev = _dev;
u32 intr_status;
@@ -554,7 +554,7 @@ static int s3c_udc_irq(int irq, void *_dev)
reconfig_usbd(dev);
dev->ep0state = WAIT_FOR_SETUP;
reset_available = 0;
- s3c_udc_pre_setup();
+ dwc2_udc_pre_setup();
} else
reset_available = 1;
@@ -742,7 +742,7 @@ static void udc_set_address(struct dwc2_udc *dev, unsigned char address)
u32 ctrl = readl(®->dcfg);
writel(DEVICE_ADDRESS(address) | ctrl, ®->dcfg);
- s3c_udc_ep0_zlp(dev);
+ dwc2_udc_ep0_zlp(dev);
debug_cond(DEBUG_EP0 != 0,
"%s: USB OTG 2.0 Device address=%d, DCFG=0x%x\n",
@@ -751,7 +751,7 @@ static void udc_set_address(struct dwc2_udc *dev, unsigned char address)
dev->usb_address = address;
}
-static inline void s3c_udc_ep0_set_stall(struct dwc2_ep *ep)
+static inline void dwc2_udc_ep0_set_stall(struct dwc2_ep *ep)
{
struct dwc2_udc *dev;
u32 ep_ctrl = 0;
@@ -776,7 +776,7 @@ static inline void s3c_udc_ep0_set_stall(struct dwc2_ep *ep)
*/
dev->ep0state = WAIT_FOR_SETUP;
- s3c_udc_pre_setup();
+ dwc2_udc_pre_setup();
}
static void dwc2_ep0_read(struct dwc2_udc *dev)
@@ -802,7 +802,7 @@ static void dwc2_ep0_read(struct dwc2_udc *dev)
* or Bulk-Only mass storge reset */
ep->len = 0;
- s3c_udc_ep0_zlp(dev);
+ dwc2_udc_ep0_zlp(dev);
debug_cond(DEBUG_EP0 != 0,
"%s: req.length = 0, bRequest = %d\n",
@@ -859,7 +859,7 @@ static int dwc2_ep0_write(struct dwc2_udc *dev)
return 1;
}
-static int s3c_udc_get_status(struct dwc2_udc *dev,
+static int dwc2_udc_get_status(struct dwc2_udc *dev,
struct usb_ctrlrequest *crq)
{
u8 ep_num = crq->wIndex & 0x7F;
@@ -920,7 +920,7 @@ static int s3c_udc_get_status(struct dwc2_udc *dev,
return 0;
}
-static void s3c_udc_set_nak(struct dwc2_ep *ep)
+static void dwc2_udc_set_nak(struct dwc2_ep *ep)
{
u8 ep_num;
u32 ep_ctrl = 0;
@@ -946,7 +946,7 @@ static void s3c_udc_set_nak(struct dwc2_ep *ep)
}
-static void s3c_udc_ep_set_stall(struct dwc2_ep *ep)
+static void dwc2_udc_ep_set_stall(struct dwc2_ep *ep)
{
u8 ep_num;
u32 ep_ctrl = 0;
@@ -981,7 +981,7 @@ static void s3c_udc_ep_set_stall(struct dwc2_ep *ep)
return;
}
-static void s3c_udc_ep_clear_stall(struct dwc2_ep *ep)
+static void dwc2_udc_ep_clear_stall(struct dwc2_ep *ep)
{
u8 ep_num;
u32 ep_ctrl = 0;
@@ -1029,7 +1029,7 @@ static void s3c_udc_ep_clear_stall(struct dwc2_ep *ep)
return;
}
-static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
+static int dwc2_udc_set_halt(struct usb_ep *_ep, int value)
{
struct dwc2_ep *ep;
struct dwc2_udc *dev;
@@ -1062,13 +1062,13 @@ static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
if (value == 0) {
ep->stopped = 0;
- s3c_udc_ep_clear_stall(ep);
+ dwc2_udc_ep_clear_stall(ep);
} else {
if (ep_num == 0)
dev->ep0state = WAIT_FOR_SETUP;
ep->stopped = 1;
- s3c_udc_ep_set_stall(ep);
+ dwc2_udc_ep_set_stall(ep);
}
spin_unlock_irqrestore(&dev->lock, flags);
@@ -1076,7 +1076,7 @@ static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
return 0;
}
-static void s3c_udc_ep_activate(struct dwc2_ep *ep)
+static void dwc2_udc_ep_activate(struct dwc2_ep *ep)
{
u8 ep_num;
u32 ep_ctrl = 0, daintmsk = 0;
@@ -1123,7 +1123,7 @@ static void s3c_udc_ep_activate(struct dwc2_ep *ep)
}
-static int s3c_udc_clear_feature(struct usb_ep *_ep)
+static int dwc2_udc_clear_feature(struct usb_ep *_ep)
{
struct dwc2_udc *dev;
struct dwc2_ep *ep;
@@ -1158,7 +1158,7 @@ static int s3c_udc_clear_feature(struct usb_ep *_ep)
break;
}
- s3c_udc_ep0_zlp(dev);
+ dwc2_udc_ep0_zlp(dev);
break;
case USB_RECIP_ENDPOINT:
@@ -1168,14 +1168,14 @@ static int s3c_udc_clear_feature(struct usb_ep *_ep)
if (usb_ctrl->wValue == USB_ENDPOINT_HALT) {
if (ep_num == 0) {
- s3c_udc_ep0_set_stall(ep);
+ dwc2_udc_ep0_set_stall(ep);
return 0;
}
- s3c_udc_ep0_zlp(dev);
+ dwc2_udc_ep0_zlp(dev);
- s3c_udc_ep_clear_stall(ep);
- s3c_udc_ep_activate(ep);
+ dwc2_udc_ep_clear_stall(ep);
+ dwc2_udc_ep_activate(ep);
ep->stopped = 0;
clear_feature_num = ep_num;
@@ -1187,7 +1187,7 @@ static int s3c_udc_clear_feature(struct usb_ep *_ep)
return 0;
}
-static int s3c_udc_set_feature(struct usb_ep *_ep)
+static int dwc2_udc_set_feature(struct usb_ep *_ep)
{
struct dwc2_udc *dev;
struct dwc2_ep *ep;
@@ -1232,7 +1232,7 @@ static int s3c_udc_set_feature(struct usb_ep *_ep)
break;
}
- s3c_udc_ep0_zlp(dev);
+ dwc2_udc_ep0_zlp(dev);
return 0;
case USB_RECIP_INTERFACE:
@@ -1245,14 +1245,14 @@ static int s3c_udc_set_feature(struct usb_ep *_ep)
"\tSET_FEATURE: USB_RECIP_ENDPOINT\n");
if (usb_ctrl->wValue == USB_ENDPOINT_HALT) {
if (ep_num == 0) {
- s3c_udc_ep0_set_stall(ep);
+ dwc2_udc_ep0_set_stall(ep);
return 0;
}
ep->stopped = 1;
- s3c_udc_ep_set_stall(ep);
+ dwc2_udc_ep_set_stall(ep);
}
- s3c_udc_ep0_zlp(dev);
+ dwc2_udc_ep0_zlp(dev);
return 0;
}
@@ -1306,7 +1306,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
"wLength = %d, setup returned\n",
usb_ctrl->wLength);
- s3c_udc_ep0_set_stall(ep);
+ dwc2_udc_ep0_set_stall(ep);
dev->ep0state = WAIT_FOR_SETUP;
return;
@@ -1317,7 +1317,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
"%s:BOT Rest:invalid wLength =%d, setup returned\n",
__func__, usb_ctrl->wLength);
- s3c_udc_ep0_set_stall(ep);
+ dwc2_udc_ep0_set_stall(ep);
dev->ep0state = WAIT_FOR_SETUP;
return;
@@ -1384,7 +1384,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
break;
case USB_REQ_GET_STATUS:
- if (!s3c_udc_get_status(dev, usb_ctrl))
+ if (!dwc2_udc_get_status(dev, usb_ctrl))
return;
break;
@@ -1392,7 +1392,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
case USB_REQ_CLEAR_FEATURE:
ep_num = usb_ctrl->wIndex & 0x7f;
- if (!s3c_udc_clear_feature(&dev->ep[ep_num].ep))
+ if (!dwc2_udc_clear_feature(&dev->ep[ep_num].ep))
return;
break;
@@ -1400,7 +1400,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
case USB_REQ_SET_FEATURE:
ep_num = usb_ctrl->wIndex & 0x7f;
- if (!s3c_udc_set_feature(&dev->ep[ep_num].ep))
+ if (!dwc2_udc_set_feature(&dev->ep[ep_num].ep))
return;
break;
@@ -1427,7 +1427,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
if (i < 0) {
/* setup processing failed, force stall */
- s3c_udc_ep0_set_stall(ep);
+ dwc2_udc_ep0_set_stall(ep);
dev->ep0state = WAIT_FOR_SETUP;
debug_cond(DEBUG_SETUP != 0,
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 14/24] usb: s3c-otg: Rename remaining local s3c_*() functions
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (12 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 13/24] usb: s3c-otg: Rename s3c_udc_*() functions Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 15/24] usb: s3c-otg: Zap useless externs Marek Vasut
` (11 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 4cf82e2..a960eff 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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;
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index e93d602..b8b2703 100644
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -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,
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 15/24] usb: s3c-otg: Zap useless externs
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (13 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 14/24] usb: s3c-otg: Rename remaining local s3c_*() functions Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 16/24] usb: s3c-otg: Change the driver name to dwc2-udc Marek Vasut
` (10 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
The extern statements are useless, remove them. Also remove the
extern ... controller, which is completely useless.
Signed-off-by: Marek Vasut <marex@denx.de>
---
drivers/usb/gadget/s3c_udc_otg_priv.h | 6 ++----
include/usb/s3c_udc.h | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg_priv.h b/drivers/usb/gadget/s3c_udc_otg_priv.h
index 881b825..e3ef2d8 100644
--- a/drivers/usb/gadget/s3c_udc_otg_priv.h
+++ b/drivers/usb/gadget/s3c_udc_otg_priv.h
@@ -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__ */
diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h
index 7064b86..345e46c 100644
--- a/include/usb/s3c_udc.h
+++ b/include/usb/s3c_udc.h
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 16/24] usb: s3c-otg: Change the driver name to dwc2-udc
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (14 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 15/24] usb: s3c-otg: Zap useless externs Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 17/24] usb: s3c-otg: Rename local headers to dwc2_*h Marek Vasut
` (9 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
Just change the driver name.
Signed-off-by: Marek Vasut <marex@denx.de>
---
drivers/usb/gadget/s3c_udc_otg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index a960eff..9cb6849 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -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(®->gintmsk));
dev->gadget.speed = USB_SPEED_UNKNOWN;
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 17/24] usb: s3c-otg: Rename local headers to dwc2_*h
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (15 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 16/24] usb: s3c-otg: Change the driver name to dwc2-udc Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 18/24] usb: s3c-otg: Rename sources to dwc2_*c Marek Vasut
` (8 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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%)
diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c
index c58388c..10b2e13 100644
--- a/drivers/usb/gadget/bcm_udc_otg_phy.c
+++ b/drivers/usb/gadget/bcm_udc_otg_phy.c
@@ -9,7 +9,7 @@
#include <asm/io.h>
#include <asm/arch/sysmap.h>
-#include "s3c_udc_otg_priv.h"
+#include "dwc2_udc_otg_priv.h"
#include "bcm_udc_otg.h"
void otg_phy_init(struct dwc2_udc *dev)
diff --git a/drivers/usb/gadget/s3c_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
similarity index 95%
rename from drivers/usb/gadget/s3c_udc_otg_priv.h
rename to drivers/usb/gadget/dwc2_udc_otg_priv.h
index e3ef2d8..dca7838 100644
--- a/drivers/usb/gadget/s3c_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __S3C_UDC_OTG_PRIV__
-#define __S3C_UDC_OTG_PRIV__
+#ifndef __DWC2_UDC_OTG_PRIV__
+#define __DWC2_UDC_OTG_PRIV__
#include <asm/errno.h>
#include <linux/sizes.h>
@@ -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__ */
diff --git a/drivers/usb/gadget/s3c_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h
similarity index 100%
rename from drivers/usb/gadget/s3c_udc_otg_regs.h
rename to drivers/usb/gadget/dwc2_udc_otg_regs.h
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 9cb6849..0bff63f 100644
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -32,8 +32,8 @@
#include <asm/mach-types.h>
-#include "s3c_udc_otg_regs.h"
-#include "s3c_udc_otg_priv.h"
+#include "dwc2_udc_otg_regs.h"
+#include "dwc2_udc_otg_priv.h"
#include <usb/lin_gadget_compat.h>
/***********************************************************/
diff --git a/drivers/usb/gadget/s3c_udc_otg_phy.c b/drivers/usb/gadget/s3c_udc_otg_phy.c
index a761b43..ab7515b 100644
--- a/drivers/usb/gadget/s3c_udc_otg_phy.c
+++ b/drivers/usb/gadget/s3c_udc_otg_phy.c
@@ -32,8 +32,8 @@
#include <asm/mach-types.h>
-#include "s3c_udc_otg_regs.h"
-#include "s3c_udc_otg_priv.h"
+#include "dwc2_udc_otg_regs.h"
+#include "dwc2_udc_otg_priv.h"
#include <usb/lin_gadget_compat.h>
#include <usb/s3c_udc.h>
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 18/24] usb: s3c-otg: Rename sources to dwc2_*c
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (16 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 17/24] usb: s3c-otg: Rename local headers to dwc2_*h Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 19/24] usb: s3c-otg: Rename remaining macros Marek Vasut
` (7 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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%)
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 6288ecf..dd4df00 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -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
diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
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
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -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
diff --git a/drivers/usb/gadget/s3c_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c
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
--- a/drivers/usb/gadget/s3c_udc_otg_phy.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c
@@ -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
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
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
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 19/24] usb: s3c-otg: Rename remaining macros
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (17 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 18/24] usb: s3c-otg: Rename sources to dwc2_*c Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 20/24] usb: s3c-otg: Tweak the comments Marek Vasut
` (6 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 40a7125..93514a9 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -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, ®->out_endp[EP0_CON].doepctl);
writel(DEPCTL_EPDIS|DEPCTL_SNAK, ®->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, ®->out_endp[i].doepctl);
writel(DEPCTL_EPDIS|DEPCTL_SNAK, ®->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,
®->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, ®->grstctl);
while (readl(®->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, ®->grstctl);
writel(TX_FIFO_FLUSH_ALL | TX_FIFO_FLUSH, ®->grstctl);
while (readl(®->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)*/
diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
index dca7838..ecf7dbf 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -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;
diff --git a/drivers/usb/gadget/dwc2_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h
index 57affcb..78ec90e 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_regs.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_regs.h
@@ -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)
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index fe02c0f..d56d401 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -652,14 +652,14 @@ static int dwc2_queue(struct usb_ep *_ep, struct usb_request *_req,
} else if (ep_is_in(ep)) {
gintsts = readl(®->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(®->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);
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 20/24] usb: s3c-otg: Tweak the comments
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (18 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 19/24] usb: s3c-otg: Rename remaining macros Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 21/24] usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG* Marek Vasut
` (5 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
The driver is actually for the Designware DWC2 controller.
Tweak the comments in the driver to reflect this fact.
Signed-off-by: Marek Vasut <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 93514a9..772d948 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -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
*
diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c
index eedfe37..d3e9840 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_phy.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c
@@ -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
*
diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
index ecf7dbf..96d66b2 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -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+
diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
index d56d401..bce9c30 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
@@ -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
*
diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h
index 345e46c..4c0ff67 100644
--- a/include/usb/s3c_udc.h
+++ b/include/usb/s3c_udc.h
@@ -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+
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 21/24] usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG*
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (19 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 20/24] usb: s3c-otg: Tweak the comments Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 22/24] usb: s3c-otg: Rename struct s3c_plat_otg_data Marek Vasut
` (4 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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(-)
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index dd4df00..c915c79 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -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
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 131f613..a257084 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -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
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index ec1f882..d101a77 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -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
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 2877e19..8f65d7e 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -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
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 35fef2b..7bb62ca 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -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
/*
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 217cfc0..2492f99 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -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
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index b3f65b6..b0bc689 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 22/24] usb: s3c-otg: Rename struct s3c_plat_otg_data
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (20 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 21/24] usb: s3c-otg: Rename USB_GADGET_S3C_UDC_OTG* to USB_GADGET_DWC2_OTG* Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 23/24] usb: s3c-otg: Rename s3c_udc_probe() function Marek Vasut
` (3 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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(-)
diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c
index a1dbc49..10f8f68 100644
--- a/board/altera/arria5-socdk/socfpga.c
+++ b/board/altera/arria5-socdk/socfpga.c
@@ -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,
};
diff --git a/board/altera/cyclone5-socdk/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c
index a1dbc49..10f8f68 100644
--- a/board/altera/cyclone5-socdk/socfpga.c
+++ b/board/altera/cyclone5-socdk/socfpga.c
@@ -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,
};
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 20eb191..e517db3 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -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
};
diff --git a/board/denx/mcvevk/socfpga.c b/board/denx/mcvevk/socfpga.c
index 1a23a7d..f27b64e 100644
--- a/board/denx/mcvevk/socfpga.c
+++ b/board/denx/mcvevk/socfpga.c
@@ -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,
};
diff --git a/board/ebv/socrates/socfpga.c b/board/ebv/socrates/socfpga.c
index a1dbc49..10f8f68 100644
--- a/board/ebv/socrates/socfpga.c
+++ b/board/ebv/socrates/socfpga.c
@@ -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,
};
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index d943d63..2ba556e 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -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,
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 36d493d..58cbb72 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -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,
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index e163e45..3a553c1 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -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,
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index a737749..e52a817 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -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,
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index df46713..747d556 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -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,
diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c
index a1dbc49..10f8f68 100644
--- a/board/terasic/sockit/socfpga.c
+++ b/board/terasic/sockit/socfpga.c
@@ -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,
};
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 772d948..2e2dfe1 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -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;
diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
index 96d66b2..0da549c 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -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];
diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h
index 4c0ff67..01590c0 100644
--- a/include/usb/s3c_udc.h
+++ b/include/usb/s3c_udc.h
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 23/24] usb: s3c-otg: Rename s3c_udc_probe() function
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (21 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 22/24] usb: s3c-otg: Rename struct s3c_plat_otg_data Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 2:38 ` [U-Boot] [PATCH 24/24] usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h Marek Vasut
` (2 subsequent siblings)
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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(-)
diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c
index 10f8f68..e640d8c 100644
--- a/board/altera/arria5-socdk/socfpga.c
+++ b/board/altera/arria5-socdk/socfpga.c
@@ -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)
diff --git a/board/altera/cyclone5-socdk/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c
index 10f8f68..e640d8c 100644
--- a/board/altera/cyclone5-socdk/socfpga.c
+++ b/board/altera/cyclone5-socdk/socfpga.c
@@ -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)
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index e517db3..09397fc 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -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)
diff --git a/board/denx/mcvevk/socfpga.c b/board/denx/mcvevk/socfpga.c
index f27b64e..3870b0b 100644
--- a/board/denx/mcvevk/socfpga.c
+++ b/board/denx/mcvevk/socfpga.c
@@ -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)
diff --git a/board/ebv/socrates/socfpga.c b/board/ebv/socrates/socfpga.c
index 10f8f68..e640d8c 100644
--- a/board/ebv/socrates/socfpga.c
+++ b/board/ebv/socrates/socfpga.c
@@ -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)
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 2ba556e..2725a46 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -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
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 58cbb72..a3ee159 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -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
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 3a553c1..6f711a8 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -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)
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index e52a817..dd7a606 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -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)
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 747d556..0c1b9d8 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -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)
diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c
index 10f8f68..e640d8c 100644
--- a/board/terasic/sockit/socfpga.c
+++ b/board/terasic/sockit/socfpga.c
@@ -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)
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index 2e2dfe1..ad9ed33 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -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;
diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h
index 01590c0..d8aeca6 100644
--- a/include/usb/s3c_udc.h
+++ b/include/usb/s3c_udc.h
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 24/24] usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (22 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 23/24] usb: s3c-otg: Rename s3c_udc_probe() function Marek Vasut
@ 2015-12-04 2:38 ` Marek Vasut
2015-12-04 9:09 ` [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Lukasz Majewski
2015-12-09 9:37 ` Lukasz Majewski
25 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 2:38 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
---
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%)
diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c
index e640d8c..0fbbc34 100644
--- a/board/altera/arria5-socdk/socfpga.c
+++ b/board/altera/arria5-socdk/socfpga.c
@@ -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>
diff --git a/board/altera/cyclone5-socdk/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c
index e640d8c..0fbbc34 100644
--- a/board/altera/cyclone5-socdk/socfpga.c
+++ b/board/altera/cyclone5-socdk/socfpga.c
@@ -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>
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index 09397fc..b3a4a41 100644
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -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
diff --git a/board/denx/mcvevk/socfpga.c b/board/denx/mcvevk/socfpga.c
index 3870b0b..0f93722 100644
--- a/board/denx/mcvevk/socfpga.c
+++ b/board/denx/mcvevk/socfpga.c
@@ -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;
diff --git a/board/ebv/socrates/socfpga.c b/board/ebv/socrates/socfpga.c
index e640d8c..0fbbc34 100644
--- a/board/ebv/socrates/socfpga.c
+++ b/board/ebv/socrates/socfpga.c
@@ -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>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 2725a46..1600568 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -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>
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index a3ee159..b4cb332 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -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"
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 6f711a8..54d01ec 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -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>
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index dd7a606..7b28ae8 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -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;
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 0c1b9d8..c25b486 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -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>
diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c
index e640d8c..0fbbc34 100644
--- a/board/terasic/sockit/socfpga.c
+++ b/board/terasic/sockit/socfpga.c
@@ -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>
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index ad9ed33..ffe2952 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -46,7 +46,7 @@
#define DEBUG_OUT_EP 0
#define DEBUG_IN_EP 0
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
#define EP0_CON 0
#define EP_MASK 0xF
diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c
index d3e9840..e0cbbc0 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_phy.c
+++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c
@@ -36,7 +36,7 @@
#include "dwc2_udc_otg_priv.h"
#include <usb/lin_gadget_compat.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
void otg_phy_init(struct dwc2_udc *dev)
{
diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h
index 0da549c..5e9ad10 100644
--- a/drivers/usb/gadget/dwc2_udc_otg_priv.h
+++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h
@@ -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)
diff --git a/include/usb/s3c_udc.h b/include/usb/dwc2_udc.h
similarity index 78%
rename from include/usb/s3c_udc.h
rename to include/usb/dwc2_udc.h
index d8aeca6..1f3effe 100644
--- a/include/usb/s3c_udc.h
+++ b/include/usb/dwc2_udc.h
@@ -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 */
--
2.1.4
^ permalink raw reply related [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (23 preceding siblings ...)
2015-12-04 2:38 ` [U-Boot] [PATCH 24/24] usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h Marek Vasut
@ 2015-12-04 9:09 ` Lukasz Majewski
2015-12-04 13:38 ` Marek Vasut
2015-12-09 9:37 ` Lukasz Majewski
25 siblings, 1 reply; 40+ messages in thread
From: Lukasz Majewski @ 2015-12-04 9:09 UTC (permalink / raw)
To: u-boot
Hi Marek,
> The driver is for the dwc2 otg block , so rename it accordingly
> finally.
Yeah finally ...
And neither me nor Przemek added to CC....
>
> 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
>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-04 9:09 ` [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Lukasz Majewski
@ 2015-12-04 13:38 ` Marek Vasut
2015-12-04 15:12 ` Lukasz Majewski
0 siblings, 1 reply; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 13:38 UTC (permalink / raw)
To: u-boot
On Friday, December 04, 2015 at 10:09:19 AM, Lukasz Majewski wrote:
> Hi Marek,
Hi!
> > 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 ?
> > 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
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-04 13:38 ` Marek Vasut
@ 2015-12-04 15:12 ` Lukasz Majewski
2015-12-04 15:22 ` Marek Vasut
0 siblings, 1 reply; 40+ messages in thread
From: Lukasz Majewski @ 2015-12-04 15:12 UTC (permalink / raw)
To: u-boot
Hi Marek,
> On Friday, December 04, 2015 at 10:09:19 AM, Lukasz Majewski wrote:
> > Hi Marek,
>
> Hi!
>
> > > 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 ?
Both :-)
Patches looks good. I only need to run them through my testing
monster :-)
Thanks for preparing them.
>
> > > 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
>
> Best regards,
> Marek Vasut
>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-04 15:12 ` Lukasz Majewski
@ 2015-12-04 15:22 ` Marek Vasut
0 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-04 15:22 UTC (permalink / raw)
To: u-boot
On Friday, December 04, 2015 at 04:12:18 PM, Lukasz Majewski wrote:
> Hi Marek,
Hi,
> > On Friday, December 04, 2015 at 10:09:19 AM, Lukasz Majewski wrote:
> > > Hi Marek,
> >
> > Hi!
> >
> > > > 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 ?
>
> Both :-)
You're a greedy one, aren't you ... ;-)
> Patches looks good. I only need to run them through my testing
> monster :-)
Thanks!
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 40+ messages in thread
* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-04 2:37 [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Marek Vasut
` (24 preceding siblings ...)
2015-12-04 9:09 ` [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg Lukasz Majewski
@ 2015-12-09 9:37 ` Lukasz Majewski
2015-12-09 14:15 ` Marek Vasut
25 siblings, 1 reply; 40+ messages in thread
From: Lukasz Majewski @ 2015-12-09 9:37 UTC (permalink / raw)
To: u-boot
Hi Marek,
> 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
>
What is the base sha1 and branch for those patches?
I cannot apply them on u-boot-usb/master (SHA1:
59a38d86de2439c72d72be54958a04bb1b778410)
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-09 9:37 ` Lukasz Majewski
@ 2015-12-09 14:15 ` Marek Vasut
2015-12-09 15:02 ` Lukasz Majewski
0 siblings, 1 reply; 40+ messages in thread
From: Marek Vasut @ 2015-12-09 14:15 UTC (permalink / raw)
To: u-boot
On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski wrote:
> Hi Marek,
>
> > 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
>
> 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.
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-09 14:15 ` Marek Vasut
@ 2015-12-09 15:02 ` Lukasz Majewski
2015-12-09 15:17 ` Marek Vasut
0 siblings, 1 reply; 40+ messages in thread
From: Lukasz Majewski @ 2015-12-09 15:02 UTC (permalink / raw)
To: u-boot
Hi Marek,
> On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski wrote:
> > Hi Marek,
> >
> > > 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
> >
> > 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.
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-09 15:02 ` Lukasz Majewski
@ 2015-12-09 15:17 ` Marek Vasut
2015-12-09 16:06 ` Lukasz Majewski
0 siblings, 1 reply; 40+ messages in thread
From: Marek Vasut @ 2015-12-09 15:17 UTC (permalink / raw)
To: u-boot
On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski wrote:
> Hi Marek,
>
> > On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski wrote:
> > > Hi Marek,
> > >
> > > > 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
> > >
> > > 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.
OK, shall I wait with application then ?
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-09 15:17 ` Marek Vasut
@ 2015-12-09 16:06 ` Lukasz Majewski
2015-12-09 16:22 ` Marek Vasut
0 siblings, 1 reply; 40+ messages in thread
From: Lukasz Majewski @ 2015-12-09 16:06 UTC (permalink / raw)
To: u-boot
Hi Marek,
> On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski wrote:
> > Hi Marek,
> >
> > > On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski
> > > wrote:
> > > > Hi Marek,
> > > >
> > > > > 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
> > > >
> > > > 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.
>
> 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.
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-09 16:06 ` Lukasz Majewski
@ 2015-12-09 16:22 ` Marek Vasut
2015-12-10 16:07 ` Lukasz Majewski
0 siblings, 1 reply; 40+ messages in thread
From: Marek Vasut @ 2015-12-09 16:22 UTC (permalink / raw)
To: u-boot
On Wednesday, December 09, 2015 at 05:06:52 PM, Lukasz Majewski wrote:
> Hi Marek,
>
> > On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski wrote:
> > > Hi Marek,
> > >
> > > > On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz Majewski
> > > >
> > > > wrote:
> > > > > Hi Marek,
> > > > >
> > > > > > 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
> > > > >
> > > > > 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.
> >
> > 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 ;)
> 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 :)
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-09 16:22 ` Marek Vasut
@ 2015-12-10 16:07 ` Lukasz Majewski
2015-12-10 16:51 ` Marek Vasut
0 siblings, 1 reply; 40+ messages in thread
From: Lukasz Majewski @ 2015-12-10 16:07 UTC (permalink / raw)
To: u-boot
Hi Marek,
> On Wednesday, December 09, 2015 at 05:06:52 PM, Lukasz Majewski wrote:
> > Hi Marek,
> >
> > > On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski
> > > wrote:
> > > > Hi Marek,
> > > >
> > > > > On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz
> > > > > Majewski
> > > > >
> > > > > wrote:
> > > > > > Hi Marek,
> > > > > >
> > > > > > > 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
> > > > > >
> > > > > > 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.
> > >
> > > 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 :-)
> >
> > I will grab patches from there for testing.
>
> It's already there since my last email ;)
>
> > 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 :)
>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-10 16:07 ` Lukasz Majewski
@ 2015-12-10 16:51 ` Marek Vasut
2015-12-10 17:08 ` Marek Vasut
0 siblings, 1 reply; 40+ messages in thread
From: Marek Vasut @ 2015-12-10 16:51 UTC (permalink / raw)
To: u-boot
On Thursday, December 10, 2015 at 05:07:53 PM, Lukasz Majewski wrote:
> Hi Marek,
>
> > On Wednesday, December 09, 2015 at 05:06:52 PM, Lukasz Majewski wrote:
> > > Hi Marek,
> > >
> > > > On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski
> > > >
> > > > wrote:
> > > > > Hi Marek,
> > > > >
> > > > > > On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz
> > > > > > Majewski
> > > > > >
> > > > > > wrote:
> > > > > > > Hi Marek,
> > > > > > >
> > > > > > > > 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
> > > > > > >
> > > > > > > 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.
> > > >
> > > > 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 :-)
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>
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-10 16:51 ` Marek Vasut
@ 2015-12-10 17:08 ` Marek Vasut
2015-12-15 14:40 ` Lukasz Majewski
0 siblings, 1 reply; 40+ messages in thread
From: Marek Vasut @ 2015-12-10 17:08 UTC (permalink / raw)
To: u-boot
On Thursday, December 10, 2015 at 05:51:12 PM, Marek Vasut wrote:
> On Thursday, December 10, 2015 at 05:07:53 PM, Lukasz Majewski wrote:
> > Hi Marek,
> >
> > > On Wednesday, December 09, 2015 at 05:06:52 PM, Lukasz Majewski wrote:
> > > > Hi Marek,
> > > >
> > > > > On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz Majewski
> > > > >
> > > > > wrote:
> > > > > > Hi Marek,
> > > > > >
> > > > > > > On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz
> > > > > > > Majewski
> > > > > > >
> > > > > > > wrote:
> > > > > > > > Hi Marek,
> > > > > > > >
> > > > > > > > > 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
> > > > > > > >
> > > > > > > > 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.
> > > > >
> > > > > 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 :-)
>
> 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.
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-10 17:08 ` Marek Vasut
@ 2015-12-15 14:40 ` Lukasz Majewski
2015-12-15 22:50 ` Marek Vasut
0 siblings, 1 reply; 40+ messages in thread
From: Lukasz Majewski @ 2015-12-15 14:40 UTC (permalink / raw)
To: u-boot
Hi Marek,
> On Thursday, December 10, 2015 at 05:51:12 PM, Marek Vasut wrote:
> > On Thursday, December 10, 2015 at 05:07:53 PM, Lukasz Majewski
> > wrote:
> > > Hi Marek,
> > >
> > > > On Wednesday, December 09, 2015 at 05:06:52 PM, Lukasz Majewski
> > > > wrote:
> > > > > Hi Marek,
> > > > >
> > > > > > On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz
> > > > > > Majewski
> > > > > >
> > > > > > wrote:
> > > > > > > Hi Marek,
> > > > > > >
> > > > > > > > On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz
> > > > > > > > Majewski
> > > > > > > >
> > > > > > > > wrote:
> > > > > > > > > Hi Marek,
> > > > > > > > >
> > > > > > > > > > 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
> > > > > > > > >
> > > > > > > > > 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.
> > > > > >
> > > > > > 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 :-)
> >
> > 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 <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
Test HW: Trats (Exynos4210) and Odroid XU3 (Exynos5800)
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 40+ messages in thread* [U-Boot] [PATCH 00/24] usb: s3c-otg: Rename driver to dwc2-otg
2015-12-15 14:40 ` Lukasz Majewski
@ 2015-12-15 22:50 ` Marek Vasut
0 siblings, 0 replies; 40+ messages in thread
From: Marek Vasut @ 2015-12-15 22:50 UTC (permalink / raw)
To: u-boot
On Tuesday, December 15, 2015 at 03:40:33 PM, Lukasz Majewski wrote:
> Hi Marek,
Hi!
> > On Thursday, December 10, 2015 at 05:51:12 PM, Marek Vasut wrote:
> > > On Thursday, December 10, 2015 at 05:07:53 PM, Lukasz Majewski
> > >
> > > wrote:
> > > > Hi Marek,
> > > >
> > > > > On Wednesday, December 09, 2015 at 05:06:52 PM, Lukasz Majewski
> > > > >
> > > > > wrote:
> > > > > > Hi Marek,
> > > > > >
> > > > > > > On Wednesday, December 09, 2015 at 04:02:58 PM, Lukasz
> > > > > > > Majewski
> > > > > > >
> > > > > > > wrote:
> > > > > > > > Hi Marek,
> > > > > > > >
> > > > > > > > > On Wednesday, December 09, 2015 at 10:37:42 AM, Lukasz
> > > > > > > > > Majewski
> > > > > > > > >
> > > > > > > > > wrote:
> > > > > > > > > > Hi Marek,
> > > > > > > > > >
> > > > > > > > > > > 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
> > > > > > > > > >
> > > > > > > > > > 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.
> > > > > > >
> > > > > > > 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 :-)
> > >
> > > 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 <l.majewski@samsung.com>
> Tested-by: Lukasz Majewski <l.majewski@samsung.com>
>
> Test HW: Trats (Exynos4210) and Odroid XU3 (Exynos5800)
OK, applied, thanks!
^ permalink raw reply [flat|nested] 40+ messages in thread