Rockchip: USB: added usb phy control to support fastboot

In current fastboot frame, both full and high speed use 'fs_ep_in', but fs_ep_in.wMaxPacketSize is configurated 64 bytes as default,

I do not understand why high speed TX max packet size is also set as 64 bytes,

so I changed the condition from '!=' to '>' as a
workaround.

Signed-off-by Frank Wang <[email protected]>

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

(quoted diff) +0 -0

b/drivers/usb/gadget/s3c_udc_otg.c index 7a2d1e7..b2d3988 100644

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

@@ -556,8 +556,8 @@ static int s3c_ep_enable(struct usb_ep *_ep,
 	}
 
 	/* hardware _could_ do smaller, but driver doesn't */
-	if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK
-	     && le16_to_cpu(get_unaligned(&desc->wMaxPacketSize)) !=
+	if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK &&
+	     le16_to_cpu(get_unaligned(&desc->wMaxPacketSize)) >
 	     ep_maxpacket(ep))
 || !get_unaligned(&desc->wMaxPacketSize)) { 
 		debug("%s: bad %s maxpacket\n", __func__, _ep->name);

In current fastboot frame, both full and high speed use 'fs_ep_in', but fs_ep_in.wMaxPacketSize is configurated 64 bytes as default,

I do not understand why high speed TX max packet size is also set as 64 bytes,

so I changed the condition from '!=' to '>' as a workaround.

Signed-off-by Frank Wang <[email protected]>

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

(quoted diff) +0 -0

b/drivers/usb/gadget/s3c_udc_otg.c index 7a2d1e7..b2d3988 100644

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

@@ -556,8 +556,8 @@ static int s3c_ep_enable(struct usb_ep *_ep,
 	}
 
 	/* hardware _could_ do smaller, but driver doesn't */
-	if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK
-	     && le16_to_cpu(get_unaligned(&desc->wMaxPacketSize)) !=
+	if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK &&
+	     le16_to_cpu(get_unaligned(&desc->wMaxPacketSize)) >
 	     ep_maxpacket(ep))
 || !get_unaligned(&desc->wMaxPacketSize)) {
 		debug("%s: bad %s maxpacket\n", __func__, _ep->name);

Used s3c usb otg device driver frame and added USB PHY handle function.

Signed-off-by Frank Wang <[email protected]>

---
 board/evb_rk3036/evb_rk3036/evb_rk3036.c |   27 ++++++++++++++++++++++
 drivers/usb/gadget/Makefile              |    1 +
 drivers/usb/gadget/rk_udc_otg_phy.c      |   36
++++++++++++++++++++++++++++++ include/configs/rk3036_common.h          | 
 19 ++++++++++++++++
 4 files changed, 83 insertions(+)
 create mode 100644 drivers/usb/gadget/rk_udc_otg_phy.c

(quoted diff) +0 -0

b/board/evb_rk3036/evb_rk3036/evb_rk3036.c index 52d45e5..16e1d1a 100644

board/evb_rk3036/evb_rk3036/evb_rk3036.c +5 -0

@@ -9,6 +9,11 @@
 #include <common.h>
 #include <dm.h>
 
+#ifdef CONFIG_USB_GADGET
+#include <usb.h>
+#include <usb/s3c_udc.h>
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 void get_ddr_config(struct rk3036_ddr_config *config)

board/evb_rk3036/evb_rk3036/evb_rk3036.c +17 -0

+static struct s3c_plat_otg_data rk_otg_data = {
+	.regs_phy	= RKIO_GRF_PHYS,
+	.regs_otg	= RKIO_USBOTG_BASE
+};
+
+int board_usb_init(int index, enum usb_init_type init)
+{
+	debug("%s: performing s3c_udc_probe\n", __func__);
+	return s3c_udc_probe(&rk_otg_data);
+}
+
+int board_usb_cleanup(int index, enum usb_init_type init)
+{
+	debug("%s\n", __func__);
+	return 0;
+}
+#endif

drivers/usb/gadget/Makefile +1 -0

index 6288ecf..4374236 100644
@@ -13,6 +13,7 @@ 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_RK_UDC_OTG_PHY) += rk_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_FOTG210) += fotg210.o

(quoted diff) +0 -0

b/drivers/usb/gadget/rk_udc_otg_phy.c new file mode 100644 index 0000000..ddf4718

drivers/usb/gadget/rk_udc_otg_phy.c new file +36 -0

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <config.h>
+#include <common.h>
+#include <asm/io.h>
+
+#include <usb/s3c_udc.h>
+
+/* UOC control */
+#define GRF_UOC0_CON5				0x017c
+#define GRF_UOC1_CON4				0x0190
+
+void otg_phy_init(struct s3c_udc *dev)
+{
+	/* Disable usb-uart bypass */
+	writel(0x34000000, (dev->pdata->regs_phy + GRF_UOC0_CON5));
+
+	/* Phy PLL recovering */
+	writel(0x00030001, (dev->pdata->regs_phy + GRF_UOC0_CON5));
+	mdelay(10);
+	writel(0x00030002, (dev->pdata->regs_phy + GRF_UOC0_CON5));
+	mdelay(500);
+}
+
+void otg_phy_off(struct s3c_udc *dev)
+{
+	/* usbphy0 bypass disable and otg enable */
+	writel(0x34000000, (dev->pdata->regs_phy + GRF_UOC0_CON5));
+
+	/* usb phy enter suspend */
+	writel(0x007f0055, (dev->pdata->regs_phy + GRF_UOC0_CON5));
+}

(quoted diff) +0 -0

b/include/configs/rk3036_common.h index 34c8f35..8344d6c 100644

include/configs/rk3036_common.h +5 -0

@@ -59,6 +59,25 @@
 #define CONFIG_PARTITION_UUIDS
 #define CONFIG_CMD_PART
 
+/* FASTBOOT */
+#define CONFIG_CMD_FASTBOOT
+#define CONFIG_USB_GADGET
+#define CONFIG_USB_GADGET_DOWNLOAD
+#define CONFIG_USB_GADGET_DUALSPEED

include/configs/rk3036_common.h +4 -0

+#define CONFIG_G_DNL_MANUFACTURER		"Rockchip"
+#define CONFIG_G_DNL_VENDOR_NUM		0x2207
+#define CONFIG_G_DNL_PRODUCT_NUM		0x0006
+
 /* RAW SD card / eMMC locations. */
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	256
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(128 << 10)

This series adds support for fastboot related to USB.

[PATCH 1/2] fixed max packet size check error for ep_in in high speed condition

[PATCH 2/2] add usb phy control to support fastboot for rk3036

Tested on RK3036 SDK board, it works Okay.

Quoted 8 lines · Frank Wang

This series adds support for fastboot related to USB.

[PATCH 1/2] fixed max packet size check error for ep_in in high speed condition

[PATCH 2/2] add usb phy control to support fastboot for rk3036

Tested on RK3036 SDK board, it works Okay.

I submitted a series [1] about a day ago which renames the s3c driver to dwc2. You should update your series based on that. To make things easier, just wait a bit until this lands in u-boot-usb .

Sorry for the hassle.

[1] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/243401

Hi Frank,

Quoted 14 lines · Marek Vasut

Quoted 8 lines · Frank Wang

This series adds support for fastboot related to USB.

[PATCH 1/2] fixed max packet size check error for ep_in in high speed condition

[PATCH 2/2] add usb phy control to support fastboot for rk3036

Tested on RK3036 SDK board, it works Okay.

I submitted a series [1] about a day ago which renames the s3c driver to dwc2. You should update your series based on that. To make things easier, just wait a bit until this lands in u-boot-usb .

Quoted 3 lines

Sorry for the hassle.

[1] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/243401

Are you planning to respin this series? I'd like to apply it for -next.

Quoted 19 lines · Simon Glass

Hi Frank,

Quoted 16 lines · Marek Vasut

Quoted 8 lines · Frank Wang

This series adds support for fastboot related to USB.

[PATCH 1/2] fixed max packet size check error for ep_in in high speed condition

[PATCH 2/2] add usb phy control to support fastboot for rk3036

Tested on RK3036 SDK board, it works Okay.

I submitted a series [1] about a day ago which renames the s3c driver to dwc2. You should update your series based on that. To make things easier, just wait a bit until this lands in u-boot-usb .

Sorry for the hassle.

Quoted 3 lines

Quoted 1 line

[1] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/243401

Are you planning to respin this series? I'd like to apply it for -next.

Are you now picking USB patches too ? ;-) S3C was recently renamed it dwc2, so you might want to respin the series anyway. In this case, it's a simple matter of s/s3c/dwc2/g .

Hi Marek,

Quoted 22 lines · Marek Vasut

Quoted 21 lines · Simon Glass

Hi Frank,

Quoted 17 lines · Marek Vasut

Quoted 8 lines · Frank Wang

This series adds support for fastboot related to USB.

[PATCH 1/2] fixed max packet size check error for ep_in in high speed condition

[PATCH 2/2] add usb phy control to support fastboot for rk3036

Tested on RK3036 SDK board, it works Okay.

I submitted a series [1] about a day ago which renames the s3c driver to dwc2. You should update your series based on that. To make things easier, just wait a bit until this lands in u-boot-usb .

Sorry for the hassle.

[1] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/243401

Quoted 5 lines

Quoted 1 line

Are you planning to respin this series? I'd like to apply it for -next.

Are you now picking USB patches too ? ;-) S3C was recently renamed it dwc2, so you might want to respin the series anyway. In this case, it's a simple matter of s/s3c/dwc2/g .

Not really, it is just that it appeared in my patchwork queue. I'm happy for you to pick it up.

Quoted 27 lines · Simon Glass

Hi Marek,

Quoted 24 lines · Marek Vasut

Quoted 22 lines · Simon Glass

Hi Frank,

Quoted 10 lines · Marek Vasut

Quoted 8 lines · Frank Wang

This series adds support for fastboot related to USB.

[PATCH 1/2] fixed max packet size check error for ep_in in high speed condition

[PATCH 2/2] add usb phy control to support fastboot for rk3036

Tested on RK3036 SDK board, it works Okay.

Quoted 7 lines

I submitted a series [1] about a day ago which renames the s3c driver to dwc2. You should update your series based on that. To make things easier, just wait a bit until this lands in u-boot-usb .

Sorry for the hassle.

[1] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/243401

Are you planning to respin this series? I'd like to apply it for -next.

Quoted 6 lines

Quoted 3 lines

Are you now picking USB patches too ? ;-) S3C was recently renamed it dwc2, so you might want to respin the series anyway. In this case, it's a simple matter of s/s3c/dwc2/g .

Not really, it is just that it appeared in my patchwork queue. I'm happy for you to pick it up.

Looks like the patchwork distribution doesn't work quite well ;-)

Quoted 35 lines · Marek Vasut

Quoted 34 lines · Simon Glass

Hi Marek,

Quoted 30 lines · Marek Vasut

Quoted 18 lines · Simon Glass

Hi Frank,

Quoted 15 lines · Marek Vasut

Quoted 8 lines · Frank Wang

This series adds support for fastboot related to USB.

[PATCH 1/2] fixed max packet size check error for ep_in in high speed condition

[PATCH 2/2] add usb phy control to support fastboot for rk3036

Tested on RK3036 SDK board, it works Okay.

I submitted a series [1] about a day ago which renames the s3c driver to dwc2. You should update your series based on that. To make things easier, just wait a bit until this lands in u-boot-usb .

Quoted 7 lines

Quoted 4 lines

Sorry for the hassle.

[1]
http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/243401

Are you planning to respin this series? I'd like to apply it for -next.

Are you now picking USB patches too ? ;-) S3C was recently renamed it dwc2, so you might want to respin the series anyway. In this case, it's a simple matter of s/s3c/dwc2/g .

Quoted 4 lines

Quoted 2 lines

Not really, it is just that it appeared in my patchwork queue. I'm happy for you to pick it up.

Looks like the patchwork distribution doesn't work quite well ;-)

It works better when everyone looks at it more often, yes ;). I usually delegate things that don't look to be "core" but rather "soc" changes to the SoC custodian in question.