mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 21:24:00 +08:00
Revert "usb: renesas_usbhs: add extcon notifier to set mode for non-otg channel"
This reverts commit 8ada211d03
.
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: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
201af55da8
commit
91b20c5a5b
@ -677,15 +677,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;
|
||||
|
@ -257,7 +257,6 @@ struct usbhs_priv {
|
||||
struct platform_device *pdev;
|
||||
|
||||
struct extcon_dev *edev;
|
||||
struct notifier_block nb;
|
||||
|
||||
spinlock_t lock;
|
||||
|
||||
|
@ -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,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user