diff options
author | Hans de Goede <hdegoede@redhat.com> | 2016-12-18 19:13:07 -0500 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2017-01-08 20:04:10 -0500 |
commit | 1490d157e0759b12913cc0d3b734a03bbcb8cb61 (patch) | |
tree | 17acde51307bbcf02b4d11ba13d59d0aca6c9869 /drivers/extcon/extcon-axp288.c | |
parent | 768842413997c3c946a716427b78cc308a4fdae0 (diff) |
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: Hans de Goede <hdegoede@redhat.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon/extcon-axp288.c')
-rw-r--r-- | drivers/extcon/extcon-axp288.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c index a84fab87e201..3d5e84ea489d 100644 --- a/drivers/extcon/extcon-axp288.c +++ b/drivers/extcon/extcon-axp288.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
23 | #include <linux/property.h> | 23 | #include <linux/property.h> |
24 | #include <linux/usb/phy.h> | ||
25 | #include <linux/notifier.h> | 24 | #include <linux/notifier.h> |
26 | #include <linux/extcon.h> | 25 | #include <linux/extcon.h> |
27 | #include <linux/regmap.h> | 26 | #include <linux/regmap.h> |
@@ -116,7 +115,6 @@ struct axp288_extcon_info { | |||
116 | int irq[EXTCON_IRQ_END]; | 115 | int irq[EXTCON_IRQ_END]; |
117 | struct extcon_dev *edev; | 116 | struct extcon_dev *edev; |
118 | struct notifier_block extcon_nb; | 117 | struct notifier_block extcon_nb; |
119 | struct usb_phy *otg; | ||
120 | }; | 118 | }; |
121 | 119 | ||
122 | /* Power up/down reason string array */ | 120 | /* Power up/down reason string array */ |
@@ -220,9 +218,6 @@ notify_otg: | |||
220 | gpiod_set_value(info->gpio_mux_cntl, | 218 | gpiod_set_value(info->gpio_mux_cntl, |
221 | vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC | 219 | vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC |
222 | : EXTCON_GPIO_MUX_SEL_PMIC); | 220 | : EXTCON_GPIO_MUX_SEL_PMIC); |
223 | |||
224 | atomic_notifier_call_chain(&info->otg->notifier, | ||
225 | vbus_attach ? USB_EVENT_VBUS : USB_EVENT_NONE, NULL); | ||
226 | } | 221 | } |
227 | 222 | ||
228 | if (notify_charger) | 223 | if (notify_charger) |
@@ -303,13 +298,6 @@ static int axp288_extcon_probe(struct platform_device *pdev) | |||
303 | return ret; | 298 | return ret; |
304 | } | 299 | } |
305 | 300 | ||
306 | /* Get otg transceiver phy */ | ||
307 | info->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); | ||
308 | if (IS_ERR(info->otg)) { | ||
309 | dev_err(&pdev->dev, "failed to get otg transceiver\n"); | ||
310 | return PTR_ERR(info->otg); | ||
311 | } | ||
312 | |||
313 | /* Set up gpio control for USB Mux */ | 301 | /* Set up gpio control for USB Mux */ |
314 | if (info->gpio_mux_cntl) { | 302 | if (info->gpio_mux_cntl) { |
315 | gpio = desc_to_gpio(info->gpio_mux_cntl); | 303 | gpio = desc_to_gpio(info->gpio_mux_cntl); |