Commit 1490d157 authored by Hans de Goede's avatar Hans de Goede Committed by Chanwoo Choi

extcon: axp288: Remove usb_phy notification code

The usb_phy based intel-usb-phy code never got merged into the
mainline kernel, so the devm_usb_get_phy() call will always fail,
blocking the driver from loading.

Since new drivers should use the generic-phy framework, not the
old-style usb_phy stuff, keeping this around is not useful.

Therefor this patch removes the usb_phy notification bits, which together
with the patch to remove the platform_data dependency, makes this driver
actually successfully probe on systems with an axp288 pmic.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 76884241
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/usb/phy.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/extcon.h> #include <linux/extcon.h>
#include <linux/regmap.h> #include <linux/regmap.h>
...@@ -116,7 +115,6 @@ struct axp288_extcon_info { ...@@ -116,7 +115,6 @@ struct axp288_extcon_info {
int irq[EXTCON_IRQ_END]; int irq[EXTCON_IRQ_END];
struct extcon_dev *edev; struct extcon_dev *edev;
struct notifier_block extcon_nb; struct notifier_block extcon_nb;
struct usb_phy *otg;
}; };
/* Power up/down reason string array */ /* Power up/down reason string array */
...@@ -220,9 +218,6 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) ...@@ -220,9 +218,6 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
gpiod_set_value(info->gpio_mux_cntl, gpiod_set_value(info->gpio_mux_cntl,
vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC
: EXTCON_GPIO_MUX_SEL_PMIC); : EXTCON_GPIO_MUX_SEL_PMIC);
atomic_notifier_call_chain(&info->otg->notifier,
vbus_attach ? USB_EVENT_VBUS : USB_EVENT_NONE, NULL);
} }
if (notify_charger) if (notify_charger)
...@@ -303,13 +298,6 @@ static int axp288_extcon_probe(struct platform_device *pdev) ...@@ -303,13 +298,6 @@ static int axp288_extcon_probe(struct platform_device *pdev)
return ret; return ret;
} }
/* Get otg transceiver phy */
info->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
if (IS_ERR(info->otg)) {
dev_err(&pdev->dev, "failed to get otg transceiver\n");
return PTR_ERR(info->otg);
}
/* Set up gpio control for USB Mux */ /* Set up gpio control for USB Mux */
if (info->gpio_mux_cntl) { if (info->gpio_mux_cntl) {
gpio = desc_to_gpio(info->gpio_mux_cntl); gpio = desc_to_gpio(info->gpio_mux_cntl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment