usb: xhci-mtk: make IPPC register optional
Make IPPC register optional to support host side of dual-role mode, due to it is moved into common glue layer for simplification. Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
77100acca9
commit
065d48cf40
|
@ -94,6 +94,9 @@ static int xhci_mtk_host_enable(struct xhci_hcd_mtk *mtk)
|
||||||
int ret;
|
int ret;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if (!mtk->has_ippc)
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* power on host ip */
|
/* power on host ip */
|
||||||
value = readl(&ippc->ip_pw_ctr1);
|
value = readl(&ippc->ip_pw_ctr1);
|
||||||
value &= ~CTRL1_IP_HOST_PDN;
|
value &= ~CTRL1_IP_HOST_PDN;
|
||||||
|
@ -139,6 +142,9 @@ static int xhci_mtk_host_disable(struct xhci_hcd_mtk *mtk)
|
||||||
int ret;
|
int ret;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if (!mtk->has_ippc)
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* power down all u3 ports */
|
/* power down all u3 ports */
|
||||||
for (i = 0; i < mtk->num_u3_ports; i++) {
|
for (i = 0; i < mtk->num_u3_ports; i++) {
|
||||||
value = readl(&ippc->u3_ctrl_p[i]);
|
value = readl(&ippc->u3_ctrl_p[i]);
|
||||||
|
@ -173,6 +179,9 @@ static int xhci_mtk_ssusb_config(struct xhci_hcd_mtk *mtk)
|
||||||
struct mu3c_ippc_regs __iomem *ippc = mtk->ippc_regs;
|
struct mu3c_ippc_regs __iomem *ippc = mtk->ippc_regs;
|
||||||
u32 value;
|
u32 value;
|
||||||
|
|
||||||
|
if (!mtk->has_ippc)
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* reset whole ip */
|
/* reset whole ip */
|
||||||
value = readl(&ippc->ip_pw_ctr0);
|
value = readl(&ippc->ip_pw_ctr0);
|
||||||
value |= CTRL0_IP_SW_RST;
|
value |= CTRL0_IP_SW_RST;
|
||||||
|
@ -475,6 +484,7 @@ static void xhci_mtk_quirks(struct device *dev, struct xhci_hcd *xhci)
|
||||||
/* called during probe() after chip reset completes */
|
/* called during probe() after chip reset completes */
|
||||||
static int xhci_mtk_setup(struct usb_hcd *hcd)
|
static int xhci_mtk_setup(struct usb_hcd *hcd)
|
||||||
{
|
{
|
||||||
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
||||||
struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);
|
struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -482,12 +492,21 @@ static int xhci_mtk_setup(struct usb_hcd *hcd)
|
||||||
ret = xhci_mtk_ssusb_config(mtk);
|
ret = xhci_mtk_ssusb_config(mtk);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = xhci_gen_setup(hcd, xhci_mtk_quirks);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
if (usb_hcd_is_primary_hcd(hcd)) {
|
||||||
|
mtk->num_u3_ports = xhci->num_usb3_ports;
|
||||||
|
mtk->num_u2_ports = xhci->num_usb2_ports;
|
||||||
ret = xhci_mtk_sch_init(mtk);
|
ret = xhci_mtk_sch_init(mtk);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return xhci_gen_setup(hcd, xhci_mtk_quirks);
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int xhci_mtk_probe(struct platform_device *pdev)
|
static int xhci_mtk_probe(struct platform_device *pdev)
|
||||||
|
@ -586,7 +605,7 @@ static int xhci_mtk_probe(struct platform_device *pdev)
|
||||||
mtk->hcd = platform_get_drvdata(pdev);
|
mtk->hcd = platform_get_drvdata(pdev);
|
||||||
platform_set_drvdata(pdev, mtk);
|
platform_set_drvdata(pdev, mtk);
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac");
|
||||||
hcd->regs = devm_ioremap_resource(dev, res);
|
hcd->regs = devm_ioremap_resource(dev, res);
|
||||||
if (IS_ERR(hcd->regs)) {
|
if (IS_ERR(hcd->regs)) {
|
||||||
ret = PTR_ERR(hcd->regs);
|
ret = PTR_ERR(hcd->regs);
|
||||||
|
@ -595,11 +614,16 @@ static int xhci_mtk_probe(struct platform_device *pdev)
|
||||||
hcd->rsrc_start = res->start;
|
hcd->rsrc_start = res->start;
|
||||||
hcd->rsrc_len = resource_size(res);
|
hcd->rsrc_len = resource_size(res);
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ippc");
|
||||||
mtk->ippc_regs = devm_ioremap_resource(dev, res);
|
if (res) { /* ippc register is optional */
|
||||||
if (IS_ERR(mtk->ippc_regs)) {
|
mtk->ippc_regs = devm_ioremap_resource(dev, res);
|
||||||
ret = PTR_ERR(mtk->ippc_regs);
|
if (IS_ERR(mtk->ippc_regs)) {
|
||||||
goto put_usb2_hcd;
|
ret = PTR_ERR(mtk->ippc_regs);
|
||||||
|
goto put_usb2_hcd;
|
||||||
|
}
|
||||||
|
mtk->has_ippc = true;
|
||||||
|
} else {
|
||||||
|
mtk->has_ippc = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (phy_num = 0; phy_num < mtk->num_phys; phy_num++) {
|
for (phy_num = 0; phy_num < mtk->num_phys; phy_num++) {
|
||||||
|
|
|
@ -118,6 +118,7 @@ struct xhci_hcd_mtk {
|
||||||
struct usb_hcd *hcd;
|
struct usb_hcd *hcd;
|
||||||
struct mu3h_sch_bw_info *sch_array;
|
struct mu3h_sch_bw_info *sch_array;
|
||||||
struct mu3c_ippc_regs __iomem *ippc_regs;
|
struct mu3c_ippc_regs __iomem *ippc_regs;
|
||||||
|
bool has_ippc;
|
||||||
int num_u2_ports;
|
int num_u2_ports;
|
||||||
int num_u3_ports;
|
int num_u3_ports;
|
||||||
struct regulator *vusb33;
|
struct regulator *vusb33;
|
||||||
|
|
Loading…
Reference in New Issue