Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0983e2ab authored by Frank Wang's avatar Frank Wang Committed by Kishon Vijay Abraham I
Browse files

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: default avatarFrank Wang <frank.wang@rock-chips.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent c7527e07

drivers/phy/rockchip/phy-rockchip-inno-usb2.c

+50 −13
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ struct rockchip_usb2phy_cfg { 
 * @vbus_attached: otg device vbus status.

 * @bvalid_irq: IRQ number assigned for vbus valid rise 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.

 * @chg_work: charge detect work.

 * @otg_sm_work: OTG state machine work.
@@ -189,6 +191,7 @@ struct rockchip_usb2phy_port { 
	bool		vbus_attached;

	int		bvalid_irq;

	int		ls_irq;

	int		otg_mux_irq;

	struct mutex	mutex;

	struct		delayed_work chg_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;

}



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,

					   struct rockchip_usb2phy_port *rport,

					   struct device_node *child_np)
@@ -1010,6 +1024,25 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, 
	rport->utmi_avalid =

		of_property_read_bool(child_np, "rockchip,utmi-avalid");



	/*

	 * Some SoCs use one interrupt with otg-id/otg-bvalid/linestate

	 * interrupts muxed together, so probe the otg-mux interrupt first,

	 * if not found, then look for the regular interrupts one by one.

	 */

	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");
@@ -1017,14 +1050,18 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, 
			goto out;

		}



	ret = devm_request_threaded_irq(rphy->dev, rport->bvalid_irq, NULL,

		ret = devm_request_threaded_irq(rphy->dev, rport->bvalid_irq,

						NULL,

						rockchip_usb2phy_bvalid_irq,

						IRQF_ONESHOT,

					"rockchip_usb2phy_bvalid", rport);

						"rockchip_usb2phy_bvalid",

						rport);

		if (ret) {

		dev_err(rphy->dev, "failed to request otg-bvalid irq handle\n");

			dev_err(rphy->dev,

				"failed to request otg-bvalid irq handle\n");

			goto out;

		}

	}



	if (!IS_ERR(rphy->edev)) {

		rport->event_nb.notifier_call = rockchip_otg_event;