Merge branch 'for-next/usb'
This commit is contained in:
commit
0831642edc
|
@ -33,6 +33,7 @@ struct imx_chipidea {
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
enum imx_usb_mode mode;
|
enum imx_usb_mode mode;
|
||||||
int portno;
|
int portno;
|
||||||
|
enum usb_phy_interface phymode;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int imx_chipidea_port_init(void *drvdata)
|
static int imx_chipidea_port_init(void *drvdata)
|
||||||
|
@ -80,7 +81,6 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci)
|
||||||
{
|
{
|
||||||
struct of_phandle_args out_args;
|
struct of_phandle_args out_args;
|
||||||
enum usb_dr_mode mode;
|
enum usb_dr_mode mode;
|
||||||
enum usb_phy_interface phymode;
|
|
||||||
|
|
||||||
if (of_parse_phandle_with_args(ci->dev->device_node, "fsl,usbmisc",
|
if (of_parse_phandle_with_args(ci->dev->device_node, "fsl,usbmisc",
|
||||||
"#index-cells", 0, &out_args))
|
"#index-cells", 0, &out_args))
|
||||||
|
@ -101,8 +101,8 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
phymode = of_usb_get_phy_mode(ci->dev->device_node, NULL);
|
ci->phymode = of_usb_get_phy_mode(ci->dev->device_node, NULL);
|
||||||
switch (phymode) {
|
switch (ci->phymode) {
|
||||||
case USBPHY_INTERFACE_MODE_UTMI:
|
case USBPHY_INTERFACE_MODE_UTMI:
|
||||||
ci->flags = MXC_EHCI_MODE_UTMI_8BIT;
|
ci->flags = MXC_EHCI_MODE_UTMI_8BIT;
|
||||||
break;
|
break;
|
||||||
|
@ -119,8 +119,7 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci)
|
||||||
ci->flags = MXC_EHCI_MODE_HSIC;
|
ci->flags = MXC_EHCI_MODE_HSIC;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_err(ci->dev, "no or invalid phy mode setting\n");
|
dev_dbg(ci->dev, "no phy_type setting. Relying on reset default\n");
|
||||||
return -EINVAL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (of_find_property(ci->dev->device_node,
|
if (of_find_property(ci->dev->device_node,
|
||||||
|
@ -168,10 +167,12 @@ static int imx_chipidea_probe(struct device_d *dev)
|
||||||
if ((ci->flags & MXC_EHCI_PORTSC_MASK) == MXC_EHCI_MODE_HSIC)
|
if ((ci->flags & MXC_EHCI_PORTSC_MASK) == MXC_EHCI_MODE_HSIC)
|
||||||
imx_chipidea_port_init(ci);
|
imx_chipidea_port_init(ci);
|
||||||
|
|
||||||
portsc = readl(base + 0x184);
|
if (ci->phymode != USBPHY_INTERFACE_MODE_UNKNOWN) {
|
||||||
portsc &= ~MXC_EHCI_PORTSC_MASK;
|
portsc = readl(base + 0x184);
|
||||||
portsc |= ci->flags & MXC_EHCI_PORTSC_MASK;
|
portsc &= ~MXC_EHCI_PORTSC_MASK;
|
||||||
writel(portsc, base + 0x184);
|
portsc |= ci->flags & MXC_EHCI_PORTSC_MASK;
|
||||||
|
writel(portsc, base + 0x184);
|
||||||
|
}
|
||||||
|
|
||||||
ci->data.hccr = base + 0x100;
|
ci->data.hccr = base + 0x100;
|
||||||
ci->data.hcor = base + 0x140;
|
ci->data.hcor = base + 0x140;
|
||||||
|
|
|
@ -219,14 +219,9 @@ int usb_register_host(struct usb_host *);
|
||||||
|
|
||||||
int usb_host_detect(struct usb_host *host, int force);
|
int usb_host_detect(struct usb_host *host, int force);
|
||||||
|
|
||||||
/* Defines */
|
|
||||||
#define USB_UHCI_VEND_ID 0x8086
|
|
||||||
#define USB_UHCI_DEV_ID 0x7112
|
|
||||||
|
|
||||||
int usb_set_protocol(struct usb_device *dev, int ifnum, int protocol);
|
int usb_set_protocol(struct usb_device *dev, int ifnum, int protocol);
|
||||||
int usb_set_idle(struct usb_device *dev, int ifnum, int duration,
|
int usb_set_idle(struct usb_device *dev, int ifnum, int duration,
|
||||||
int report_id);
|
int report_id);
|
||||||
struct usb_device *usb_get_dev_index(int index);
|
|
||||||
int usb_control_msg(struct usb_device *dev, unsigned int pipe,
|
int usb_control_msg(struct usb_device *dev, unsigned int pipe,
|
||||||
unsigned char request, unsigned char requesttype,
|
unsigned char request, unsigned char requesttype,
|
||||||
unsigned short value, unsigned short index,
|
unsigned short value, unsigned short index,
|
||||||
|
|
Loading…
Reference in New Issue