mirror of https://gitee.com/openkylin/linux.git
- Improve the over-current handling for imx
- Add the HSIC support for imx -----BEGIN PGP SIGNATURE----- iQEwBAABCAAaBQJcF1bIExxwZXRlci5jaGVuQG54cC5jb20ACgkQSFkpgVDWcbv1 Xgf/RIlKRdLOiO0wCJWkmiHRIU/YE0V6QNwhMKCUK2PfAqLI3px/a/uOam7U8ysn 6TvrUYxy/V7yBDCw6bR8bbJeP5gFjZPEnqd4RV6YZzP7Zc6FJ/10cLMWWGfB61JV xqcVzJGjZ/AuU00TDDEeKXnGB4w6iH47x0ywimxlHSEhSUGQEoogopgtlr8JfnWg bVQ9wr1jkUmkDymVFaHzrYSWVIToejGOB2kNRmhGpxKIUq3Mv/X0Vux50+egNpDK ikyVo5oIr1cU0nVlAl2lquoTf6F7gRo2GduY9stw2VR6VxUUvd2cj57bJlhiwqPe 3jRiXjWtZKsWEcSpMhaT8ks+Og== =Q7/x -----END PGP SIGNATURE----- Merge tag 'usb-ci-v4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next Peter writes: - Improve the over-current handling for imx - Add the HSIC support for imx * tag 'usb-ci-v4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb: usb: chipidea: imx: allow to configure oc polarity on i.MX25 usb: chipidea: imx: Warn if oc polarity isn't specified usb: chipidea: imx: support configuring for active low oc signal doc: usb: ci-hdrc-usb2: Add pinctrl properties for HSIC pin groups usb: chipidea: host: override ehci->hub_control usb: chipidea: imx: add HSIC support usb: chipidea: add flag for imx hsic implementation
This commit is contained in:
Greg Kroah-Hartman
commit
4733c0b466
|
|
@ -80,15 +80,19 @@ Optional properties:
|
|||
controller. It's expected that a mux state of 0 indicates device mode and a
|
||||
mux state of 1 indicates host mode.
|
||||
- mux-control-names: Shall be "usb_switch" if mux-controls is specified.
|
||||
- pinctrl-names: Names for optional pin modes in "default", "host", "device"
|
||||
- pinctrl-names: Names for optional pin modes in "default", "host", "device".
|
||||
In case of HSIC-mode, "idle" and "active" pin modes are mandatory. In this
|
||||
case, the "idle" state needs to pull down the data and strobe pin
|
||||
and the "active" state needs to pull up the strobe pin.
|
||||
- pinctrl-n: alternate pin modes
|
||||
|
||||
i.mx specific properties
|
||||
- fsl,usbmisc: phandler of non-core register device, with one
|
||||
argument that indicate usb controller index
|
||||
- disable-over-current: disable over current detect
|
||||
- over-current-active-high: over current signal polarity is high active,
|
||||
typically over current signal polarity is low active.
|
||||
- over-current-active-low: over current signal polarity is active low.
|
||||
- over-current-active-high: over current signal polarity is active high.
|
||||
It's recommended to specify the over current polarity.
|
||||
- external-vbus-divider: enables off-chip resistor divider for Vbus
|
||||
|
||||
Example:
|
||||
|
|
@ -111,3 +115,29 @@ Example:
|
|||
mux-controls = <&usb_switch>;
|
||||
mux-control-names = "usb_switch";
|
||||
};
|
||||
|
||||
Example for HSIC:
|
||||
|
||||
usb@2184400 {
|
||||
compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
|
||||
reg = <0x02184400 0x200>;
|
||||
interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clks IMX6QDL_CLK_USBOH3>;
|
||||
fsl,usbphy = <&usbphynop1>;
|
||||
fsl,usbmisc = <&usbmisc 2>;
|
||||
phy_type = "hsic";
|
||||
dr_mode = "host";
|
||||
ahb-burst-config = <0x0>;
|
||||
tx-burst-size-dword = <0x10>;
|
||||
rx-burst-size-dword = <0x10>;
|
||||
pinctrl-names = "idle", "active";
|
||||
pinctrl-0 = <&pinctrl_usbh2_idle>;
|
||||
pinctrl-1 = <&pinctrl_usbh2_active>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
usbnet: smsc@1 {
|
||||
compatible = "usb424,9730";
|
||||
reg = <1>;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
#include <linux/usb/chipidea.h>
|
||||
#include <linux/usb/of.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/pinctrl/consumer.h>
|
||||
|
||||
#include "ci.h"
|
||||
#include "ci_hdrc_imx.h"
|
||||
|
|
@ -85,6 +86,9 @@ struct ci_hdrc_imx_data {
|
|||
bool supports_runtime_pm;
|
||||
bool override_phy_control;
|
||||
bool in_lpm;
|
||||
struct pinctrl *pinctrl;
|
||||
struct pinctrl_state *pinctrl_hsic_active;
|
||||
struct regulator *hsic_pad_regulator;
|
||||
/* SoC before i.mx6 (except imx23/imx28) needs three clks */
|
||||
bool need_three_clks;
|
||||
struct clk *clk_ipg;
|
||||
|
|
@ -132,11 +136,21 @@ static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev)
|
|||
|
||||
data->dev = &misc_pdev->dev;
|
||||
|
||||
if (of_find_property(np, "disable-over-current", NULL))
|
||||
/*
|
||||
* Check the various over current related properties. If over current
|
||||
* detection is disabled we're not interested in the polarity.
|
||||
*/
|
||||
if (of_find_property(np, "disable-over-current", NULL)) {
|
||||
data->disable_oc = 1;
|
||||
|
||||
if (of_find_property(np, "over-current-active-high", NULL))
|
||||
data->oc_polarity = 1;
|
||||
} else if (of_find_property(np, "over-current-active-high", NULL)) {
|
||||
data->oc_pol_active_low = 0;
|
||||
data->oc_pol_configured = 1;
|
||||
} else if (of_find_property(np, "over-current-active-low", NULL)) {
|
||||
data->oc_pol_active_low = 1;
|
||||
data->oc_pol_configured = 1;
|
||||
} else {
|
||||
dev_warn(dev, "No over current polarity defined\n");
|
||||
}
|
||||
|
||||
if (of_find_property(np, "external-vbus-divider", NULL))
|
||||
data->evdo = 1;
|
||||
|
|
@ -245,19 +259,49 @@ static void imx_disable_unprepare_clks(struct device *dev)
|
|||
}
|
||||
}
|
||||
|
||||
static int ci_hdrc_imx_notify_event(struct ci_hdrc *ci, unsigned int event)
|
||||
{
|
||||
struct device *dev = ci->dev->parent;
|
||||
struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
|
||||
int ret = 0;
|
||||
|
||||
switch (event) {
|
||||
case CI_HDRC_IMX_HSIC_ACTIVE_EVENT:
|
||||
ret = pinctrl_select_state(data->pinctrl,
|
||||
data->pinctrl_hsic_active);
|
||||
if (ret)
|
||||
dev_err(dev, "hsic_active select failed, err=%d\n",
|
||||
ret);
|
||||
break;
|
||||
case CI_HDRC_IMX_HSIC_SUSPEND_EVENT:
|
||||
ret = imx_usbmisc_hsic_set_connect(data->usbmisc_data);
|
||||
if (ret)
|
||||
dev_err(dev,
|
||||
"hsic_set_connect failed, err=%d\n", ret);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ci_hdrc_imx_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct ci_hdrc_imx_data *data;
|
||||
struct ci_hdrc_platform_data pdata = {
|
||||
.name = dev_name(&pdev->dev),
|
||||
.capoffset = DEF_CAPOFFSET,
|
||||
.notify_event = ci_hdrc_imx_notify_event,
|
||||
};
|
||||
int ret;
|
||||
const struct of_device_id *of_id;
|
||||
const struct ci_hdrc_imx_platform_flag *imx_platform_flag;
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct pinctrl_state *pinctrl_hsic_idle;
|
||||
|
||||
of_id = of_match_device(ci_hdrc_imx_dt_ids, &pdev->dev);
|
||||
of_id = of_match_device(ci_hdrc_imx_dt_ids, dev);
|
||||
if (!of_id)
|
||||
return -ENODEV;
|
||||
|
||||
|
|
@ -268,19 +312,73 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
|
|||
return -ENOMEM;
|
||||
|
||||
platform_set_drvdata(pdev, data);
|
||||
data->usbmisc_data = usbmisc_get_init_data(&pdev->dev);
|
||||
data->usbmisc_data = usbmisc_get_init_data(dev);
|
||||
if (IS_ERR(data->usbmisc_data))
|
||||
return PTR_ERR(data->usbmisc_data);
|
||||
|
||||
ret = imx_get_clks(&pdev->dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
if (of_usb_get_phy_mode(dev->of_node) == USBPHY_INTERFACE_MODE_HSIC) {
|
||||
pdata.flags |= CI_HDRC_IMX_IS_HSIC;
|
||||
data->usbmisc_data->hsic = 1;
|
||||
data->pinctrl = devm_pinctrl_get(dev);
|
||||
if (IS_ERR(data->pinctrl)) {
|
||||
dev_err(dev, "pinctrl get failed, err=%ld\n",
|
||||
PTR_ERR(data->pinctrl));
|
||||
return PTR_ERR(data->pinctrl);
|
||||
}
|
||||
|
||||
ret = imx_prepare_enable_clks(&pdev->dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
pinctrl_hsic_idle = pinctrl_lookup_state(data->pinctrl, "idle");
|
||||
if (IS_ERR(pinctrl_hsic_idle)) {
|
||||
dev_err(dev,
|
||||
"pinctrl_hsic_idle lookup failed, err=%ld\n",
|
||||
PTR_ERR(pinctrl_hsic_idle));
|
||||
return PTR_ERR(pinctrl_hsic_idle);
|
||||
}
|
||||
|
||||
data->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "fsl,usbphy", 0);
|
||||
ret = pinctrl_select_state(data->pinctrl, pinctrl_hsic_idle);
|
||||
if (ret) {
|
||||
dev_err(dev, "hsic_idle select failed, err=%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
data->pinctrl_hsic_active = pinctrl_lookup_state(data->pinctrl,
|
||||
"active");
|
||||
if (IS_ERR(data->pinctrl_hsic_active)) {
|
||||
dev_err(dev,
|
||||
"pinctrl_hsic_active lookup failed, err=%ld\n",
|
||||
PTR_ERR(data->pinctrl_hsic_active));
|
||||
return PTR_ERR(data->pinctrl_hsic_active);
|
||||
}
|
||||
|
||||
data->hsic_pad_regulator = devm_regulator_get(dev, "hsic");
|
||||
if (PTR_ERR(data->hsic_pad_regulator) == -EPROBE_DEFER) {
|
||||
return -EPROBE_DEFER;
|
||||
} else if (PTR_ERR(data->hsic_pad_regulator) == -ENODEV) {
|
||||
/* no pad regualator is needed */
|
||||
data->hsic_pad_regulator = NULL;
|
||||
} else if (IS_ERR(data->hsic_pad_regulator)) {
|
||||
dev_err(dev, "Get HSIC pad regulator error: %ld\n",
|
||||
PTR_ERR(data->hsic_pad_regulator));
|
||||
return PTR_ERR(data->hsic_pad_regulator);
|
||||
}
|
||||
|
||||
if (data->hsic_pad_regulator) {
|
||||
ret = regulator_enable(data->hsic_pad_regulator);
|
||||
if (ret) {
|
||||
dev_err(dev,
|
||||
"Failed to enable HSIC pad regulator\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
ret = imx_get_clks(dev);
|
||||
if (ret)
|
||||
goto disable_hsic_regulator;
|
||||
|
||||
ret = imx_prepare_enable_clks(dev);
|
||||
if (ret)
|
||||
goto disable_hsic_regulator;
|
||||
|
||||
data->phy = devm_usb_get_phy_by_phandle(dev, "fsl,usbphy", 0);
|
||||
if (IS_ERR(data->phy)) {
|
||||
ret = PTR_ERR(data->phy);
|
||||
/* Return -EINVAL if no usbphy is available */
|
||||
|
|
@ -305,40 +403,43 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
|
|||
|
||||
ret = imx_usbmisc_init(data->usbmisc_data);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", ret);
|
||||
dev_err(dev, "usbmisc init failed, ret=%d\n", ret);
|
||||
goto err_clk;
|
||||
}
|
||||
|
||||
data->ci_pdev = ci_hdrc_add_device(&pdev->dev,
|
||||
data->ci_pdev = ci_hdrc_add_device(dev,
|
||||
pdev->resource, pdev->num_resources,
|
||||
&pdata);
|
||||
if (IS_ERR(data->ci_pdev)) {
|
||||
ret = PTR_ERR(data->ci_pdev);
|
||||
if (ret != -EPROBE_DEFER)
|
||||
dev_err(&pdev->dev,
|
||||
"ci_hdrc_add_device failed, err=%d\n", ret);
|
||||
dev_err(dev, "ci_hdrc_add_device failed, err=%d\n",
|
||||
ret);
|
||||
goto err_clk;
|
||||
}
|
||||
|
||||
ret = imx_usbmisc_init_post(data->usbmisc_data);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "usbmisc post failed, ret=%d\n", ret);
|
||||
dev_err(dev, "usbmisc post failed, ret=%d\n", ret);
|
||||
goto disable_device;
|
||||
}
|
||||
|
||||
if (data->supports_runtime_pm) {
|
||||
pm_runtime_set_active(&pdev->dev);
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
pm_runtime_set_active(dev);
|
||||
pm_runtime_enable(dev);
|
||||
}
|
||||
|
||||
device_set_wakeup_capable(&pdev->dev, true);
|
||||
device_set_wakeup_capable(dev, true);
|
||||
|
||||
return 0;
|
||||
|
||||
disable_device:
|
||||
ci_hdrc_remove_device(data->ci_pdev);
|
||||
err_clk:
|
||||
imx_disable_unprepare_clks(&pdev->dev);
|
||||
imx_disable_unprepare_clks(dev);
|
||||
disable_hsic_regulator:
|
||||
if (data->hsic_pad_regulator)
|
||||
ret = regulator_disable(data->hsic_pad_regulator);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -355,6 +456,8 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev)
|
|||
if (data->override_phy_control)
|
||||
usb_phy_shutdown(data->phy);
|
||||
imx_disable_unprepare_clks(&pdev->dev);
|
||||
if (data->hsic_pad_regulator)
|
||||
regulator_disable(data->hsic_pad_regulator);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -367,9 +470,16 @@ static void ci_hdrc_imx_shutdown(struct platform_device *pdev)
|
|||
static int __maybe_unused imx_controller_suspend(struct device *dev)
|
||||
{
|
||||
struct ci_hdrc_imx_data *data = dev_get_drvdata(dev);
|
||||
int ret = 0;
|
||||
|
||||
dev_dbg(dev, "at %s\n", __func__);
|
||||
|
||||
ret = imx_usbmisc_hsic_set_clk(data->usbmisc_data, false);
|
||||
if (ret) {
|
||||
dev_err(dev, "usbmisc hsic_set_clk failed, ret=%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
imx_disable_unprepare_clks(dev);
|
||||
data->in_lpm = true;
|
||||
|
||||
|
|
@ -400,8 +510,16 @@ static int __maybe_unused imx_controller_resume(struct device *dev)
|
|||
goto clk_disable;
|
||||
}
|
||||
|
||||
ret = imx_usbmisc_hsic_set_clk(data->usbmisc_data, true);
|
||||
if (ret) {
|
||||
dev_err(dev, "usbmisc hsic_set_clk failed, ret=%d\n", ret);
|
||||
goto hsic_set_clk_fail;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
hsic_set_clk_fail:
|
||||
imx_usbmisc_set_wakeup(data->usbmisc_data, true);
|
||||
clk_disable:
|
||||
imx_disable_unprepare_clks(dev);
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,22 @@ struct imx_usbmisc_data {
|
|||
int index;
|
||||
|
||||
unsigned int disable_oc:1; /* over current detect disabled */
|
||||
unsigned int oc_polarity:1; /* over current polarity if oc enabled */
|
||||
|
||||
/* true if over-current polarity is active low */
|
||||
unsigned int oc_pol_active_low:1;
|
||||
|
||||
/* true if dt specifies polarity */
|
||||
unsigned int oc_pol_configured:1;
|
||||
|
||||
unsigned int evdo:1; /* set external vbus divider option */
|
||||
unsigned int ulpi:1; /* connected to an ULPI phy */
|
||||
unsigned int hsic:1; /* HSIC controlller */
|
||||
};
|
||||
|
||||
int imx_usbmisc_init(struct imx_usbmisc_data *);
|
||||
int imx_usbmisc_init_post(struct imx_usbmisc_data *);
|
||||
int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *, bool);
|
||||
int imx_usbmisc_init(struct imx_usbmisc_data *data);
|
||||
int imx_usbmisc_init_post(struct imx_usbmisc_data *data);
|
||||
int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *data, bool enabled);
|
||||
int imx_usbmisc_hsic_set_connect(struct imx_usbmisc_data *data);
|
||||
int imx_usbmisc_hsic_set_clk(struct imx_usbmisc_data *data, bool on);
|
||||
|
||||
#endif /* __DRIVER_USB_CHIPIDEA_CI_HDRC_IMX_H */
|
||||
|
|
|
|||
|
|
@ -170,6 +170,11 @@ static int host_start(struct ci_hdrc *ci)
|
|||
otg->host = &hcd->self;
|
||||
hcd->self.otg_port = 1;
|
||||
}
|
||||
|
||||
if (ci->platdata->notify_event &&
|
||||
(ci->platdata->flags & CI_HDRC_IMX_IS_HSIC))
|
||||
ci->platdata->notify_event
|
||||
(ci, CI_HDRC_IMX_HSIC_ACTIVE_EVENT);
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
@ -215,9 +220,85 @@ void ci_hdrc_host_destroy(struct ci_hdrc *ci)
|
|||
host_stop(ci);
|
||||
}
|
||||
|
||||
/* The below code is based on tegra ehci driver */
|
||||
static int ci_ehci_hub_control(
|
||||
struct usb_hcd *hcd,
|
||||
u16 typeReq,
|
||||
u16 wValue,
|
||||
u16 wIndex,
|
||||
char *buf,
|
||||
u16 wLength
|
||||
)
|
||||
{
|
||||
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
||||
u32 __iomem *status_reg;
|
||||
u32 temp;
|
||||
unsigned long flags;
|
||||
int retval = 0;
|
||||
struct device *dev = hcd->self.controller;
|
||||
struct ci_hdrc *ci = dev_get_drvdata(dev);
|
||||
|
||||
status_reg = &ehci->regs->port_status[(wIndex & 0xff) - 1];
|
||||
|
||||
spin_lock_irqsave(&ehci->lock, flags);
|
||||
|
||||
if (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_SUSPEND) {
|
||||
temp = ehci_readl(ehci, status_reg);
|
||||
if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) != 0) {
|
||||
retval = -EPIPE;
|
||||
goto done;
|
||||
}
|
||||
|
||||
temp &= ~(PORT_RWC_BITS | PORT_WKCONN_E);
|
||||
temp |= PORT_WKDISC_E | PORT_WKOC_E;
|
||||
ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
|
||||
|
||||
/*
|
||||
* If a transaction is in progress, there may be a delay in
|
||||
* suspending the port. Poll until the port is suspended.
|
||||
*/
|
||||
if (ehci_handshake(ehci, status_reg, PORT_SUSPEND,
|
||||
PORT_SUSPEND, 5000))
|
||||
ehci_err(ehci, "timeout waiting for SUSPEND\n");
|
||||
|
||||
if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) {
|
||||
if (ci->platdata->notify_event)
|
||||
ci->platdata->notify_event(ci,
|
||||
CI_HDRC_IMX_HSIC_SUSPEND_EVENT);
|
||||
|
||||
temp = ehci_readl(ehci, status_reg);
|
||||
temp &= ~(PORT_WKDISC_E | PORT_WKCONN_E);
|
||||
ehci_writel(ehci, temp, status_reg);
|
||||
}
|
||||
|
||||
set_bit((wIndex & 0xff) - 1, &ehci->suspended_ports);
|
||||
goto done;
|
||||
}
|
||||
|
||||
/*
|
||||
* After resume has finished, it needs do some post resume
|
||||
* operation for some SoCs.
|
||||
*/
|
||||
else if (typeReq == ClearPortFeature &&
|
||||
wValue == USB_PORT_FEAT_C_SUSPEND) {
|
||||
/* Make sure the resume has finished, it should be finished */
|
||||
if (ehci_handshake(ehci, status_reg, PORT_RESUME, 0, 25000))
|
||||
ehci_err(ehci, "timeout waiting for resume\n");
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&ehci->lock, flags);
|
||||
|
||||
/* Handle the hub control events here */
|
||||
return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
|
||||
done:
|
||||
spin_unlock_irqrestore(&ehci->lock, flags);
|
||||
return retval;
|
||||
}
|
||||
static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
|
||||
{
|
||||
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
||||
struct device *dev = hcd->self.controller;
|
||||
struct ci_hdrc *ci = dev_get_drvdata(dev);
|
||||
int port;
|
||||
u32 tmp;
|
||||
|
||||
|
|
@ -249,6 +330,16 @@ static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
|
|||
* It needs a short delay between set RS bit and PHCD.
|
||||
*/
|
||||
usleep_range(150, 200);
|
||||
/*
|
||||
* Need to clear WKCN and WKOC for imx HSIC,
|
||||
* otherwise, there will be wakeup event.
|
||||
*/
|
||||
if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) {
|
||||
tmp = ehci_readl(ehci, reg);
|
||||
tmp &= ~(PORT_WKDISC_E | PORT_WKCONN_E);
|
||||
ehci_writel(ehci, tmp, reg);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -281,4 +372,5 @@ void ci_hdrc_host_driver_init(void)
|
|||
ehci_init_driver(&ci_ehci_hc_driver, &ehci_ci_overrides);
|
||||
orig_bus_suspend = ci_ehci_hc_driver.bus_suspend;
|
||||
ci_ehci_hc_driver.bus_suspend = ci_ehci_bus_suspend;
|
||||
ci_ehci_hc_driver.hub_control = ci_ehci_hub_control;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,10 +64,22 @@
|
|||
#define MX6_BM_OVER_CUR_DIS BIT(7)
|
||||
#define MX6_BM_OVER_CUR_POLARITY BIT(8)
|
||||
#define MX6_BM_WAKEUP_ENABLE BIT(10)
|
||||
#define MX6_BM_UTMI_ON_CLOCK BIT(13)
|
||||
#define MX6_BM_ID_WAKEUP BIT(16)
|
||||
#define MX6_BM_VBUS_WAKEUP BIT(17)
|
||||
#define MX6SX_BM_DPDM_WAKEUP_EN BIT(29)
|
||||
#define MX6_BM_WAKEUP_INTR BIT(31)
|
||||
|
||||
#define MX6_USB_HSIC_CTRL_OFFSET 0x10
|
||||
/* Send resume signal without 480Mhz PHY clock */
|
||||
#define MX6SX_BM_HSIC_AUTO_RESUME BIT(23)
|
||||
/* set before portsc.suspendM = 1 */
|
||||
#define MX6_BM_HSIC_DEV_CONN BIT(21)
|
||||
/* HSIC enable */
|
||||
#define MX6_BM_HSIC_EN BIT(12)
|
||||
/* Force HSIC module 480M clock on, even when in Host is in suspend mode */
|
||||
#define MX6_BM_HSIC_CLK_ON BIT(11)
|
||||
|
||||
#define MX6_USB_OTG1_PHY_CTRL 0x18
|
||||
/* For imx6dql, it is host-only controller, for later imx6, it is otg's */
|
||||
#define MX6_USB_OTG2_PHY_CTRL 0x1c
|
||||
|
|
@ -94,6 +106,10 @@ struct usbmisc_ops {
|
|||
int (*post)(struct imx_usbmisc_data *data);
|
||||
/* It's called when we need to enable/disable usb wakeup */
|
||||
int (*set_wakeup)(struct imx_usbmisc_data *data, bool enabled);
|
||||
/* It's called before setting portsc.suspendM */
|
||||
int (*hsic_set_connect)(struct imx_usbmisc_data *data);
|
||||
/* It's called during suspend/resume */
|
||||
int (*hsic_set_clk)(struct imx_usbmisc_data *data, bool enabled);
|
||||
};
|
||||
|
||||
struct imx_usbmisc {
|
||||
|
|
@ -120,6 +136,14 @@ static int usbmisc_imx25_init(struct imx_usbmisc_data *data)
|
|||
val &= ~(MX25_OTG_SIC_MASK | MX25_OTG_PP_BIT);
|
||||
val |= (MX25_EHCI_INTERFACE_DIFF_UNI & MX25_EHCI_INTERFACE_MASK) << MX25_OTG_SIC_SHIFT;
|
||||
val |= (MX25_OTG_PM_BIT | MX25_OTG_OCPOL_BIT);
|
||||
|
||||
/*
|
||||
* If the polarity is not configured assume active high for
|
||||
* historical reasons.
|
||||
*/
|
||||
if (data->oc_pol_configured && data->oc_pol_active_low)
|
||||
val &= ~MX25_OTG_OCPOL_BIT;
|
||||
|
||||
writel(val, usbmisc->base);
|
||||
break;
|
||||
case 1:
|
||||
|
|
@ -129,6 +153,13 @@ static int usbmisc_imx25_init(struct imx_usbmisc_data *data)
|
|||
val |= (MX25_H1_PM_BIT | MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT |
|
||||
MX25_H1_USBTE_BIT | MX25_H1_IPPUE_DOWN_BIT);
|
||||
|
||||
/*
|
||||
* If the polarity is not configured assume active high for
|
||||
* historical reasons.
|
||||
*/
|
||||
if (data->oc_pol_configured && data->oc_pol_active_low)
|
||||
val &= ~MX25_H1_OCPOL_BIT;
|
||||
|
||||
writel(val, usbmisc->base);
|
||||
|
||||
break;
|
||||
|
|
@ -340,11 +371,17 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data)
|
|||
reg = readl(usbmisc->base + data->index * 4);
|
||||
if (data->disable_oc) {
|
||||
reg |= MX6_BM_OVER_CUR_DIS;
|
||||
} else if (data->oc_polarity == 1) {
|
||||
/* High active */
|
||||
reg &= ~(MX6_BM_OVER_CUR_DIS | MX6_BM_OVER_CUR_POLARITY);
|
||||
} else {
|
||||
reg &= ~(MX6_BM_OVER_CUR_DIS);
|
||||
reg &= ~MX6_BM_OVER_CUR_DIS;
|
||||
|
||||
/*
|
||||
* If the polarity is not configured keep it as setup by the
|
||||
* bootloader.
|
||||
*/
|
||||
if (data->oc_pol_configured && data->oc_pol_active_low)
|
||||
reg |= MX6_BM_OVER_CUR_POLARITY;
|
||||
else if (data->oc_pol_configured)
|
||||
reg &= ~MX6_BM_OVER_CUR_POLARITY;
|
||||
}
|
||||
writel(reg, usbmisc->base + data->index * 4);
|
||||
|
||||
|
|
@ -353,6 +390,18 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data)
|
|||
writel(reg | MX6_BM_NON_BURST_SETTING,
|
||||
usbmisc->base + data->index * 4);
|
||||
|
||||
/* For HSIC controller */
|
||||
if (data->hsic) {
|
||||
reg = readl(usbmisc->base + data->index * 4);
|
||||
writel(reg | MX6_BM_UTMI_ON_CLOCK,
|
||||
usbmisc->base + data->index * 4);
|
||||
reg = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET
|
||||
+ (data->index - 2) * 4);
|
||||
reg |= MX6_BM_HSIC_EN | MX6_BM_HSIC_CLK_ON;
|
||||
writel(reg, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET
|
||||
+ (data->index - 2) * 4);
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
||||
|
||||
usbmisc_imx6q_set_wakeup(data, false);
|
||||
|
|
@ -360,6 +409,79 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int usbmisc_imx6_hsic_get_reg_offset(struct imx_usbmisc_data *data)
|
||||
{
|
||||
int offset, ret = 0;
|
||||
|
||||
if (data->index == 2 || data->index == 3) {
|
||||
offset = (data->index - 2) * 4;
|
||||
} else if (data->index == 0) {
|
||||
/*
|
||||
* For SoCs like i.MX7D and later, each USB controller has
|
||||
* its own non-core register region. For SoCs before i.MX7D,
|
||||
* the first two USB controllers are non-HSIC controllers.
|
||||
*/
|
||||
offset = 0;
|
||||
} else {
|
||||
dev_err(data->dev, "index is error for usbmisc\n");
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
return ret ? ret : offset;
|
||||
}
|
||||
|
||||
static int usbmisc_imx6_hsic_set_connect(struct imx_usbmisc_data *data)
|
||||
{
|
||||
unsigned long flags;
|
||||
u32 val;
|
||||
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
||||
int offset;
|
||||
|
||||
spin_lock_irqsave(&usbmisc->lock, flags);
|
||||
offset = usbmisc_imx6_hsic_get_reg_offset(data);
|
||||
if (offset < 0) {
|
||||
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
||||
return offset;
|
||||
}
|
||||
|
||||
val = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + offset);
|
||||
if (!(val & MX6_BM_HSIC_DEV_CONN))
|
||||
writel(val | MX6_BM_HSIC_DEV_CONN,
|
||||
usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + offset);
|
||||
|
||||
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int usbmisc_imx6_hsic_set_clk(struct imx_usbmisc_data *data, bool on)
|
||||
{
|
||||
unsigned long flags;
|
||||
u32 val;
|
||||
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
|
||||
int offset;
|
||||
|
||||
spin_lock_irqsave(&usbmisc->lock, flags);
|
||||
offset = usbmisc_imx6_hsic_get_reg_offset(data);
|
||||
if (offset < 0) {
|
||||
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
||||
return offset;
|
||||
}
|
||||
|
||||
val = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + offset);
|
||||
val |= MX6_BM_HSIC_EN | MX6_BM_HSIC_CLK_ON;
|
||||
if (on)
|
||||
val |= MX6_BM_HSIC_CLK_ON;
|
||||
else
|
||||
val &= ~MX6_BM_HSIC_CLK_ON;
|
||||
|
||||
writel(val, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET + offset);
|
||||
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int usbmisc_imx6sx_init(struct imx_usbmisc_data *data)
|
||||
{
|
||||
void __iomem *reg = NULL;
|
||||
|
|
@ -385,6 +507,13 @@ static int usbmisc_imx6sx_init(struct imx_usbmisc_data *data)
|
|||
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
||||
}
|
||||
|
||||
/* For HSIC controller */
|
||||
if (data->hsic) {
|
||||
val = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET);
|
||||
val |= MX6SX_BM_HSIC_AUTO_RESUME;
|
||||
writel(val, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -444,9 +573,17 @@ static int usbmisc_imx7d_init(struct imx_usbmisc_data *data)
|
|||
reg = readl(usbmisc->base);
|
||||
if (data->disable_oc) {
|
||||
reg |= MX6_BM_OVER_CUR_DIS;
|
||||
} else if (data->oc_polarity == 1) {
|
||||
/* High active */
|
||||
reg &= ~(MX6_BM_OVER_CUR_DIS | MX6_BM_OVER_CUR_POLARITY);
|
||||
} else {
|
||||
reg &= ~MX6_BM_OVER_CUR_DIS;
|
||||
|
||||
/*
|
||||
* If the polarity is not configured keep it as setup by the
|
||||
* bootloader.
|
||||
*/
|
||||
if (data->oc_pol_configured && data->oc_pol_active_low)
|
||||
reg |= MX6_BM_OVER_CUR_POLARITY;
|
||||
else if (data->oc_pol_configured)
|
||||
reg &= ~MX6_BM_OVER_CUR_POLARITY;
|
||||
}
|
||||
writel(reg, usbmisc->base);
|
||||
|
||||
|
|
@ -454,6 +591,7 @@ static int usbmisc_imx7d_init(struct imx_usbmisc_data *data)
|
|||
reg &= ~MX7D_USB_VBUS_WAKEUP_SOURCE_MASK;
|
||||
writel(reg | MX7D_USB_VBUS_WAKEUP_SOURCE_BVALID,
|
||||
usbmisc->base + MX7D_USBNC_USB_CTRL2);
|
||||
|
||||
spin_unlock_irqrestore(&usbmisc->lock, flags);
|
||||
|
||||
usbmisc_imx7d_set_wakeup(data, false);
|
||||
|
|
@ -481,6 +619,8 @@ static const struct usbmisc_ops imx53_usbmisc_ops = {
|
|||
static const struct usbmisc_ops imx6q_usbmisc_ops = {
|
||||
.set_wakeup = usbmisc_imx6q_set_wakeup,
|
||||
.init = usbmisc_imx6q_init,
|
||||
.hsic_set_connect = usbmisc_imx6_hsic_set_connect,
|
||||
.hsic_set_clk = usbmisc_imx6_hsic_set_clk,
|
||||
};
|
||||
|
||||
static const struct usbmisc_ops vf610_usbmisc_ops = {
|
||||
|
|
@ -490,6 +630,8 @@ static const struct usbmisc_ops vf610_usbmisc_ops = {
|
|||
static const struct usbmisc_ops imx6sx_usbmisc_ops = {
|
||||
.set_wakeup = usbmisc_imx6q_set_wakeup,
|
||||
.init = usbmisc_imx6sx_init,
|
||||
.hsic_set_connect = usbmisc_imx6_hsic_set_connect,
|
||||
.hsic_set_clk = usbmisc_imx6_hsic_set_clk,
|
||||
};
|
||||
|
||||
static const struct usbmisc_ops imx7d_usbmisc_ops = {
|
||||
|
|
@ -546,6 +688,33 @@ int imx_usbmisc_set_wakeup(struct imx_usbmisc_data *data, bool enabled)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(imx_usbmisc_set_wakeup);
|
||||
|
||||
int imx_usbmisc_hsic_set_connect(struct imx_usbmisc_data *data)
|
||||
{
|
||||
struct imx_usbmisc *usbmisc;
|
||||
|
||||
if (!data)
|
||||
return 0;
|
||||
|
||||
usbmisc = dev_get_drvdata(data->dev);
|
||||
if (!usbmisc->ops->hsic_set_connect || !data->hsic)
|
||||
return 0;
|
||||
return usbmisc->ops->hsic_set_connect(data);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(imx_usbmisc_hsic_set_connect);
|
||||
|
||||
int imx_usbmisc_hsic_set_clk(struct imx_usbmisc_data *data, bool on)
|
||||
{
|
||||
struct imx_usbmisc *usbmisc;
|
||||
|
||||
if (!data)
|
||||
return 0;
|
||||
|
||||
usbmisc = dev_get_drvdata(data->dev);
|
||||
if (!usbmisc->ops->hsic_set_clk || !data->hsic)
|
||||
return 0;
|
||||
return usbmisc->ops->hsic_set_clk(data, on);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(imx_usbmisc_hsic_set_clk);
|
||||
static const struct of_device_id usbmisc_imx_dt_ids[] = {
|
||||
{
|
||||
.compatible = "fsl,imx25-usbmisc",
|
||||
|
|
|
|||
|
|
@ -60,9 +60,12 @@ struct ci_hdrc_platform_data {
|
|||
#define CI_HDRC_OVERRIDE_RX_BURST BIT(11)
|
||||
#define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12) /* Glue layer manages phy */
|
||||
#define CI_HDRC_REQUIRES_ALIGNED_DMA BIT(13)
|
||||
#define CI_HDRC_IMX_IS_HSIC BIT(14)
|
||||
enum usb_dr_mode dr_mode;
|
||||
#define CI_HDRC_CONTROLLER_RESET_EVENT 0
|
||||
#define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
|
||||
#define CI_HDRC_IMX_HSIC_ACTIVE_EVENT 2
|
||||
#define CI_HDRC_IMX_HSIC_SUSPEND_EVENT 3
|
||||
int (*notify_event) (struct ci_hdrc *ci, unsigned event);
|
||||
struct regulator *reg_vbus;
|
||||
struct usb_otg_caps ci_otg_caps;
|
||||
|
|
|
|||
Loading…
Reference in New Issue