UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

phy: rockchip-inno-usb2: add support for otg-mux interrupt 

The otg-id/otg-bvalid/linestate interrupts are multiplexed together
in otg-port on some Rockchip SoC (e.g RV1108), this patch add support
for it.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
Frank Wang 2017-08-11 16:07:49 +08:00 committed by Kishon Vijay Abraham I
parent c7527e07f0
commit 0983e2abc8
1 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/phy/rockchip/phy-rockchip-inno-usb2.c
View File

@ -172,6 +172,8 @@ struct rockchip_usb2phy_cfg {
* @vbus_attached: otg device vbus status. * @vbus_attached: otg device vbus status.
* @bvalid_irq: IRQ number assigned for vbus valid rise detection. * @bvalid_irq: IRQ number assigned for vbus valid rise detection.
* @ls_irq: IRQ number assigned for linestate detection. * @ls_irq: IRQ number assigned for linestate detection.
* @otg_mux_irq: IRQ number which multiplex otg-id/otg-bvalid/linestate
* irqs to one irq in otg-port.
* @mutex: for register updating in sm_work. * @mutex: for register updating in sm_work.
* @chg_work: charge detect work. * @chg_work: charge detect work.
* @otg_sm_work: OTG state machine work. * @otg_sm_work: OTG state machine work.
@ -189,6 +191,7 @@ struct rockchip_usb2phy_port {
bool vbus_attached; bool vbus_attached;
int bvalid_irq; int bvalid_irq;
int ls_irq; int ls_irq;
int otg_mux_irq;
struct mutex mutex; struct mutex mutex;
struct delayed_work chg_work; struct delayed_work chg_work;
struct delayed_work otg_sm_work; struct delayed_work otg_sm_work;
@ -934,6 +937,17 @@ static irqreturn_t rockchip_usb2phy_bvalid_irq(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t rockchip_usb2phy_otg_mux_irq(int irq, void *data)
{
struct rockchip_usb2phy_port *rport = data;
struct rockchip_usb2phy *rphy = dev_get_drvdata(rport->phy->dev.parent);
if (property_enabled(rphy->grf, &rport->port_cfg->bvalid_det_st))
return rockchip_usb2phy_bvalid_irq(irq, data);
else
return IRQ_NONE;
}
static int rockchip_usb2phy_host_port_init(struct rockchip_usb2phy *rphy, static int rockchip_usb2phy_host_port_init(struct rockchip_usb2phy *rphy,
struct rockchip_usb2phy_port *rport, struct rockchip_usb2phy_port *rport,
struct device_node *child_np) struct device_node *child_np)
@ -1010,20 +1024,43 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
rport->utmi_avalid = rport->utmi_avalid =
of_property_read_bool(child_np, "rockchip,utmi-avalid"); of_property_read_bool(child_np, "rockchip,utmi-avalid");
rport->bvalid_irq = of_irq_get_byname(child_np, "otg-bvalid"); /*
if (rport->bvalid_irq < 0) { * Some SoCs use one interrupt with otg-id/otg-bvalid/linestate
dev_err(rphy->dev, "no vbus valid irq provided\n"); * interrupts muxed together, so probe the otg-mux interrupt first,
ret = rport->bvalid_irq; * if not found, then look for the regular interrupts one by one.
goto out; */
} rport->otg_mux_irq = of_irq_get_byname(child_np, "otg-mux");
if (rport->otg_mux_irq > 0) {
ret = devm_request_threaded_irq(rphy->dev, rport->otg_mux_irq,
NULL,
rockchip_usb2phy_otg_mux_irq,
IRQF_ONESHOT,
"rockchip_usb2phy_otg",
rport);
if (ret) {
dev_err(rphy->dev,
"failed to request otg-mux irq handle\n");
goto out;
}
} else {
rport->bvalid_irq = of_irq_get_byname(child_np, "otg-bvalid");
if (rport->bvalid_irq < 0) {
dev_err(rphy->dev, "no vbus valid irq provided\n");
ret = rport->bvalid_irq;
goto out;
}
ret = devm_request_threaded_irq(rphy->dev, rport->bvalid_irq, NULL, ret = devm_request_threaded_irq(rphy->dev, rport->bvalid_irq,
rockchip_usb2phy_bvalid_irq, NULL,
IRQF_ONESHOT, rockchip_usb2phy_bvalid_irq,
"rockchip_usb2phy_bvalid", rport); IRQF_ONESHOT,
if (ret) { "rockchip_usb2phy_bvalid",
dev_err(rphy->dev, "failed to request otg-bvalid irq handle\n"); rport);
goto out; if (ret) {
dev_err(rphy->dev,
"failed to request otg-bvalid irq handle\n");
goto out;
}
} }
if (!IS_ERR(rphy->edev)) { if (!IS_ERR(rphy->edev)) {