From b4d5cf0bc8f9d39c0674c87c610d95d3445a3434 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 4 Dec 2015 00:57:58 +0100 Subject: usb: s3c-otg: Rename struct s3c_udc to dwc2_udc 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 --- include/usb/s3c_udc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/usb') diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h index 7f49a4e2d5c..f6c3a8693c4 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); -- cgit v1.3.1 From 2c12ff039ca6e36c8c2025befcda3d91fbf47dcd Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 4 Dec 2015 01:36:36 +0100 Subject: usb: s3c-otg: Split private bits from s3c_udc.h 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 --- 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 + drivers/usb/gadget/s3c_udc_otg_priv.h | 102 ++++++++++++++++++++++++++++++++++ include/usb/s3c_udc.h | 94 +------------------------------ 5 files changed, 108 insertions(+), 92 deletions(-) create mode 100644 drivers/usb/gadget/s3c_udc_otg_priv.h (limited to 'include/usb') diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c index 936247e94af..c58388c639e 100644 --- a/drivers/usb/gadget/bcm_udc_otg_phy.c +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c @@ -9,7 +9,7 @@ #include #include -#include +#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 00d03f32cd2..99c6a1b1a76 100644 --- a/drivers/usb/gadget/s3c_udc_otg.c +++ b/drivers/usb/gadget/s3c_udc_otg.c @@ -33,6 +33,7 @@ #include #include "s3c_udc_otg_regs.h" +#include "s3c_udc_otg_priv.h" #include /***********************************************************/ diff --git a/drivers/usb/gadget/s3c_udc_otg_phy.c b/drivers/usb/gadget/s3c_udc_otg_phy.c index ffc930c9110..169f8e4dbbf 100644 --- a/drivers/usb/gadget/s3c_udc_otg_phy.c +++ b/drivers/usb/gadget/s3c_udc_otg_phy.c @@ -33,6 +33,7 @@ #include #include "s3c_udc_otg_regs.h" +#include "s3c_udc_otg_priv.h" #include #include diff --git a/drivers/usb/gadget/s3c_udc_otg_priv.h b/drivers/usb/gadget/s3c_udc_otg_priv.h new file mode 100644 index 00000000000..567fb4e263f --- /dev/null +++ b/drivers/usb/gadget/s3c_udc_otg_priv.h @@ -0,0 +1,102 @@ +/* + * Samsung S3C on-chip full/high speed USB device controllers + * Copyright (C) 2005 for Samsung Electronics + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __S3C_UDC_OTG_PRIV__ +#define __S3C_UDC_OTG_PRIV__ + +#include +#include +#include +#include +#include +#include +#include + +/*-------------------------------------------------------------------------*/ +/* 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); + +#endif /* __S3C_UDC_OTG_PRIV__ */ diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h index f6c3a8693c4..67c3e9112dd 100644 --- a/include/usb/s3c_udc.h +++ b/include/usb/s3c_udc.h @@ -9,99 +9,8 @@ #ifndef __S3C_USB_GADGET #define __S3C_USB_GADGET -#include -#include -#include -#include -#include -#include - #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 +19,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 -- cgit v1.3.1 From 193979e2fe7cf75cb7434341562b1da7153750f7 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 4 Dec 2015 02:21:41 +0100 Subject: usb: s3c-otg: Zap useless externs The extern statements are useless, remove them. Also remove the extern ... controller, which is completely useless. Signed-off-by: Marek Vasut --- drivers/usb/gadget/s3c_udc_otg_priv.h | 6 ++---- include/usb/s3c_udc.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'include/usb') diff --git a/drivers/usb/gadget/s3c_udc_otg_priv.h b/drivers/usb/gadget/s3c_udc_otg_priv.h index cc107040466..fb3a019e031 100644 --- a/drivers/usb/gadget/s3c_udc_otg_priv.h +++ b/drivers/usb/gadget/s3c_udc_otg_priv.h @@ -88,13 +88,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 67c3e9112dd..20af6299290 100644 --- a/include/usb/s3c_udc.h +++ b/include/usb/s3c_udc.h @@ -20,6 +20,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 -- cgit v1.3.1 From e179cedd09325f6e83107d6f437600de0fc81553 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 4 Dec 2015 02:55:37 +0100 Subject: usb: s3c-otg: Tweak the comments The driver is actually for the Designware DWC2 controller. Tweak the comments in the driver to reflect this fact. Signed-off-by: Marek Vasut --- 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(-) (limited to 'include/usb') diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 93514a993a8..772d9481d32 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 eedfe37dd17..d3e9840585f 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 5126a9d8eb0..36428826317 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 d56d401c8e5..bce9c30ef61 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 20af6299290..497248dbeec 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+ -- cgit v1.3.1 From c0982871df3ea6af1658cbf0f2fe38938b1780c7 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 4 Dec 2015 02:23:29 +0100 Subject: usb: s3c-otg: Rename struct s3c_plat_otg_data 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 --- 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(-) (limited to 'include/usb') diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c index a1dbc492c98..10f8f683388 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 a1dbc492c98..10f8f683388 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 20eb19142a9..e517db3a3bc 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 1a23a7d88c8..f27b64e80e3 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 a1dbc492c98..10f8f683388 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 d943d63eca0..2ba556ef33b 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 36d493d514d..58cbb72e412 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 e163e45a587..3a553c110b3 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 a7377497e5d..e52a8173ca6 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 df4671394f6..747d556dd3e 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 a1dbc492c98..10f8f683388 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 772d9481d32..2e2dfe121ab 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 36428826317..c5e9dc29d82 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_priv.h +++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h @@ -78,7 +78,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 497248dbeec..3e83f7c56ed 100644 --- a/include/usb/s3c_udc.h +++ b/include/usb/s3c_udc.h @@ -11,7 +11,7 @@ #define PHY0_SLEEP (1 << 5) -struct s3c_plat_otg_data { +struct dwc2_plat_otg_data { int (*phy_control)(int on); unsigned int regs_phy; unsigned int regs_otg; @@ -20,6 +20,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 -- cgit v1.3.1 From a4bb9b3636fe6dfd1cadaf34c42f4fb3b1ebe46c Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 4 Dec 2015 02:26:33 +0100 Subject: usb: s3c-otg: Rename s3c_udc_probe() function 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 --- 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(-) (limited to 'include/usb') diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c index 10f8f683388..e640d8cccf8 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 10f8f683388..e640d8cccf8 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 e517db3a3bc..09397fc55ba 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 f27b64e80e3..3870b0b2afe 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 10f8f683388..e640d8cccf8 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 2ba556ef33b..2725a468585 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 58cbb72e412..a3ee159d3e2 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 3a553c110b3..6f711a8c64b 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 e52a8173ca6..dd7a6068385 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 747d556dd3e..0c1b9d820a6 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 10f8f683388..e640d8cccf8 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 2e2dfe121ab..ad9ed33a655 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 3e83f7c56ed..9bc1aad9a7d 100644 --- a/include/usb/s3c_udc.h +++ b/include/usb/s3c_udc.h @@ -20,6 +20,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 -- cgit v1.3.1 From 5d5716eebccaa9b9ab977b7d5a9fae2abb7a8829 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 4 Dec 2015 02:51:20 +0100 Subject: usb: s3c-otg: Rename usb/s3c_udc.h to usb/dwc2_udc.h The driver is actually for the Designware DWC2 controller. This patch renames the global s3c_udc.h header to dwc2_udc.h. The rename is done automatically: $ sed -i "s/s3c_udc\.h/dwc2_udc.h/g" \ `git grep "s3c_udc\.h" | cut -d : -f 1` Signed-off-by: Marek Vasut --- board/altera/arria5-socdk/socfpga.c | 2 +- board/altera/cyclone5-socdk/socfpga.c | 2 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 2 +- board/denx/mcvevk/socfpga.c | 2 +- board/ebv/socrates/socfpga.c | 2 +- board/samsung/goni/goni.c | 2 +- board/samsung/odroid/odroid.c | 2 +- board/samsung/trats/trats.c | 2 +- board/samsung/trats2/trats2.c | 2 +- board/samsung/universal_c210/universal.c | 2 +- board/terasic/sockit/socfpga.c | 2 +- drivers/usb/gadget/dwc2_udc_otg.c | 2 +- drivers/usb/gadget/dwc2_udc_otg_phy.c | 2 +- drivers/usb/gadget/dwc2_udc_otg_priv.h | 2 +- include/usb/dwc2_udc.h | 25 +++++++++++++++++++++++++ include/usb/s3c_udc.h | 25 ------------------------- 16 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 include/usb/dwc2_udc.h delete mode 100644 include/usb/s3c_udc.h (limited to 'include/usb') diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c index e640d8cccf8..0fbbc3456ca 100644 --- a/board/altera/arria5-socdk/socfpga.c +++ b/board/altera/arria5-socdk/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/board/altera/cyclone5-socdk/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c index e640d8cccf8..0fbbc3456ca 100644 --- a/board/altera/cyclone5-socdk/socfpga.c +++ b/board/altera/cyclone5-socdk/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c index 09397fc55ba..b3a4a4144d6 100644 --- a/board/broadcom/bcm28155_ap/bcm28155_ap.c +++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #define SECWATCHDOG_SDOGCR_OFFSET 0x00000000 diff --git a/board/denx/mcvevk/socfpga.c b/board/denx/mcvevk/socfpga.c index 3870b0b2afe..0f93722dfbd 100644 --- a/board/denx/mcvevk/socfpga.c +++ b/board/denx/mcvevk/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/ebv/socrates/socfpga.c b/board/ebv/socrates/socfpga.c index e640d8cccf8..0fbbc3456ca 100644 --- a/board/ebv/socrates/socfpga.c +++ b/board/ebv/socrates/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 2725a468585..1600568193a 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index a3ee159d3e2..b4cb33240e1 100644 --- a/board/samsung/odroid/odroid.c +++ b/board/samsung/odroid/odroid.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include "setup.h" diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 6f711a8c64b..54d01ec439a 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index dd7a6068385..7b28ae8cc72 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 0c1b9d820a6..c25b486f4a9 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c index e640d8cccf8..0fbbc3456ca 100644 --- a/board/terasic/sockit/socfpga.c +++ b/board/terasic/sockit/socfpga.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index ad9ed33a655..ffe2952f56b 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -46,7 +46,7 @@ #define DEBUG_OUT_EP 0 #define DEBUG_IN_EP 0 -#include +#include #define EP0_CON 0 #define EP_MASK 0xF diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c index d3e9840585f..e0cbbc07579 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_phy.c +++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c @@ -36,7 +36,7 @@ #include "dwc2_udc_otg_priv.h" #include -#include +#include void otg_phy_init(struct dwc2_udc *dev) { diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h index c5e9dc29d82..b2c1fc41053 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_priv.h +++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include /*-------------------------------------------------------------------------*/ /* DMA bounce buffer size, 16K is enough even for mass storage */ diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h new file mode 100644 index 00000000000..302e9a35a23 --- /dev/null +++ b/include/usb/dwc2_udc.h @@ -0,0 +1,25 @@ +/* + * drivers/usb/gadget/dwc2_udc.h + * Designware DWC2 on-chip full/high speed USB device controllers + * Copyright (C) 2005 for Samsung Electronics + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __DWC2_USB_GADGET +#define __DWC2_USB_GADGET + +#define PHY0_SLEEP (1 << 5) + +struct dwc2_plat_otg_data { + int (*phy_control)(int on); + unsigned int regs_phy; + unsigned int regs_otg; + unsigned int usb_phy_ctrl; + unsigned int usb_flags; + unsigned int usb_gusbcfg; +}; + +int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata); + +#endif /* __DWC2_USB_GADGET */ diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h deleted file mode 100644 index 9bc1aad9a7d..00000000000 --- a/include/usb/s3c_udc.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * drivers/usb/gadget/s3c_udc.h - * Designware DWC2 on-chip full/high speed USB device controllers - * Copyright (C) 2005 for Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __S3C_USB_GADGET -#define __S3C_USB_GADGET - -#define PHY0_SLEEP (1 << 5) - -struct dwc2_plat_otg_data { - int (*phy_control)(int on); - unsigned int regs_phy; - unsigned int regs_otg; - unsigned int usb_phy_ctrl; - unsigned int usb_flags; - unsigned int usb_gusbcfg; -}; - -int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata); - -#endif -- cgit v1.3.1