Commit 4018aa9b authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Felipe Balbi
Browse files

Revert "usb: renesas_usbhs: add extcon notifier to set mode for non-otg channel" 



This reverts commit 8ada211d.

R-Car D3 can use OTG mode in fact. So, the commit doesn't need anymore.
In other words, like other R-Car Gen3 SoCs, R-Car D3 can change the mode
by using the phy-rcar-gen3-usb2 driver.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent bf3854aa

drivers/usb/renesas_usbhs/common.c

+0 −9
Original line number Diff line number Diff line
@@ -591,15 +591,6 @@ static int usbhs_probe(struct platform_device *pdev) 
		break;

	case USBHS_TYPE_RCAR_GEN3_WITH_PLL:

		priv->pfunc = usbhs_rcar3_with_pll_ops;

		if (!IS_ERR_OR_NULL(priv->edev)) {

			priv->nb.notifier_call = priv->pfunc.notifier;

			ret = devm_extcon_register_notifier(&pdev->dev,

							    priv->edev,

							    EXTCON_USB_HOST,

							    &priv->nb);

			if (ret < 0)

				dev_err(&pdev->dev, "no notifier registered\n");

		}

		break;

	case USBHS_TYPE_RZA1:

		priv->pfunc = usbhs_rza1_ops;

drivers/usb/renesas_usbhs/common.h

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ struct usbhs_priv { 
	struct platform_device *pdev;



	struct extcon_dev *edev;

	struct notifier_block nb;



	spinlock_t		lock;

drivers/usb/renesas_usbhs/rcar3.c

+0 −11
Original line number Diff line number Diff line
@@ -112,16 +112,6 @@ static int usbhs_rcar3_get_id(struct platform_device *pdev) 
	return USBHS_GADGET;

}



static int usbhs_rcar3_notifier(struct notifier_block *nb, unsigned long event,

				void *data)

{

	struct usbhs_priv *priv = container_of(nb, struct usbhs_priv, nb);



	usbhs_rcar3_set_usbsel(priv, !!event);



	return NOTIFY_DONE;

}



const struct renesas_usbhs_platform_callback usbhs_rcar3_ops = {

	.power_ctrl = usbhs_rcar3_power_ctrl,

	.get_id = usbhs_rcar3_get_id,
@@ -130,5 +120,4 @@ const struct renesas_usbhs_platform_callback usbhs_rcar3_ops = { 
const struct renesas_usbhs_platform_callback usbhs_rcar3_with_pll_ops = {

	.power_ctrl = usbhs_rcar3_power_and_pll_ctrl,

	.get_id = usbhs_rcar3_get_id,

	.notifier = usbhs_rcar3_notifier,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE