android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: dwc2: gadget: Add new core parameter for low speed

Browse Source 
Added new core param for low speed, which can be used only when SNPSID
is equal to DWC2_CORE_FS_IOT. When LS mode is enabled, we are
restricting ep types and providing to upper layer only INTR and CTRL
endpoints.

Signed-off-by: Vardan Mikayelyan <mvardan@synopsys.com>
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Vardan Mikayelyan
2016-11-14 19:17:03 -08:00
committed by Felipe Balbi
parent 552d940f0b
commit 38e9002b85
4 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/dwc2/core.h
View File

@ -467,6 +467,7 @@ struct dwc2_core_params {
int speed; int speed;
#define DWC2_SPEED_PARAM_HIGH 0 #define DWC2_SPEED_PARAM_HIGH 0
#define DWC2_SPEED_PARAM_FULL 1 #define DWC2_SPEED_PARAM_FULL 1
#define DWC2_SPEED_PARAM_LOW 2
int enable_dynamic_fifo; int enable_dynamic_fifo;
int en_multiple_tx_fifo; int en_multiple_tx_fifo;

27
drivers/usb/dwc2/gadget.c
View File

@ -3175,7 +3175,8 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
GUSBCFG_HNPCAP); GUSBCFG_HNPCAP);
if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS && if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS &&
hsotg->params.speed == DWC2_SPEED_PARAM_FULL) { (hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
hsotg->params.speed == DWC2_SPEED_PARAM_LOW)) {
/* FS/LS Dedicated Transceiver Interface */ /* FS/LS Dedicated Transceiver Interface */
usbcfg |= GUSBCFG_PHYSEL; usbcfg |= GUSBCFG_PHYSEL;
} else { } else {
@ -3192,14 +3193,21 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
__orr32(hsotg->regs + DCTL, DCTL_SFTDISCON); __orr32(hsotg->regs + DCTL, DCTL_SFTDISCON);
dcfg |= DCFG_EPMISCNT(1); dcfg |= DCFG_EPMISCNT(1);
if (hsotg->params.speed == DWC2_SPEED_PARAM_FULL) {
switch (hsotg->params.speed) {
case DWC2_SPEED_PARAM_LOW:
dcfg |= DCFG_DEVSPD_LS;
break;
case DWC2_SPEED_PARAM_FULL:
if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS) if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS)
dcfg |= DCFG_DEVSPD_FS48; dcfg |= DCFG_DEVSPD_FS48;
else else
dcfg |= DCFG_DEVSPD_FS; dcfg |= DCFG_DEVSPD_FS;
} else { break;
default:
dcfg |= DCFG_DEVSPD_HS; dcfg |= DCFG_DEVSPD_HS;
} }
dwc2_writel(dcfg, hsotg->regs + DCFG); dwc2_writel(dcfg, hsotg->regs + DCFG);
/* Clear any pending OTG interrupts */ /* Clear any pending OTG interrupts */
@ -4388,14 +4396,21 @@ static void dwc2_hsotg_initep(struct dwc2_hsotg *hsotg,
hs_ep->parent = hsotg; hs_ep->parent = hsotg;
hs_ep->ep.name = hs_ep->name; hs_ep->ep.name = hs_ep->name;
usb_ep_set_maxpacket_limit(&hs_ep->ep, epnum ? 1024 : EP0_MPS_LIMIT);
if (hsotg->params.speed == DWC2_SPEED_PARAM_LOW)
usb_ep_set_maxpacket_limit(&hs_ep->ep, 8);
else
usb_ep_set_maxpacket_limit(&hs_ep->ep,
epnum ? 1024 : EP0_MPS_LIMIT);
hs_ep->ep.ops = &dwc2_hsotg_ep_ops; hs_ep->ep.ops = &dwc2_hsotg_ep_ops;
if (epnum == 0) { if (epnum == 0) {
hs_ep->ep.caps.type_control = true; hs_ep->ep.caps.type_control = true;
} else { } else {
hs_ep->ep.caps.type_iso = true; if (hsotg->params.speed != DWC2_SPEED_PARAM_LOW) {
hs_ep->ep.caps.type_bulk = true; hs_ep->ep.caps.type_iso = true;
hs_ep->ep.caps.type_bulk = true;
}
hs_ep->ep.caps.type_int = true; hs_ep->ep.caps.type_int = true;
} }

8
drivers/usb/dwc2/hcd.c
View File

@ -230,9 +230,10 @@ static int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
u32 usbcfg; u32 usbcfg;
int retval = 0; int retval = 0;
if (hsotg->params.speed == DWC2_SPEED_PARAM_FULL && if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
hsotg->params.speed == DWC2_SPEED_PARAM_LOW) &&
hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS) { hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS) {
/* If FS mode with FS PHY */ /* If FS/LS mode with FS/LS PHY */
retval = dwc2_fs_phy_init(hsotg, select_phy); retval = dwc2_fs_phy_init(hsotg, select_phy);
if (retval) if (retval)
return retval; return retval;
@ -2277,7 +2278,8 @@ static void dwc2_core_host_init(struct dwc2_hsotg *hsotg)
/* Initialize Host Configuration Register */ /* Initialize Host Configuration Register */
dwc2_init_fs_ls_pclk_sel(hsotg); dwc2_init_fs_ls_pclk_sel(hsotg);
if (hsotg->params.speed == DWC2_SPEED_PARAM_FULL) { if (hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
hsotg->params.speed == DWC2_SPEED_PARAM_LOW) {
hcfg = dwc2_readl(hsotg->regs + HCFG); hcfg = dwc2_readl(hsotg->regs + HCFG);
hcfg |= HCFG_FSLSSUPP; hcfg |= HCFG_FSLSSUPP;
dwc2_writel(hcfg, hsotg->regs + HCFG); dwc2_writel(hcfg, hsotg->regs + HCFG);

8
drivers/usb/dwc2/params.c
View File

@ -742,14 +742,18 @@ static void dwc2_set_param_speed(struct dwc2_hsotg *hsotg, int val)
{ {
int valid = 1; int valid = 1;
if (DWC2_OUT_OF_BOUNDS(val, 0, 1)) { if (DWC2_OUT_OF_BOUNDS(val, 0, 2)) {
if (val >= 0) { if (val >= 0) {
dev_err(hsotg->dev, "Wrong value for speed parameter\n"); dev_err(hsotg->dev, "Wrong value for speed parameter\n");
dev_err(hsotg->dev, "max_speed parameter must be 0 or 1\n"); dev_err(hsotg->dev, "max_speed parameter must be 0, 1, or 2\n");
} }
valid = 0; valid = 0;
} }
if (dwc2_is_hs_iot(hsotg) &&
val == DWC2_SPEED_PARAM_LOW)
valid = 0;
if (val == DWC2_SPEED_PARAM_HIGH && if (val == DWC2_SPEED_PARAM_HIGH &&
dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS) dwc2_get_param_phy_type(hsotg) == DWC2_PHY_TYPE_PARAM_FS)
valid = 0; valid = 0;