usb: dwc3: revert OTG changes for Intel Merrifield
Subsystems (2)
cover usb: dwc3: revert OTG changes for Intel Merrifield
It's late in the cycle, that's why I send these reverts, so we will have a full new cycle for testing a better solution if any.
So this is just a proactive move if we have no solution in the nearest days.
Andy Shevchenko (2):
Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG
-> peripheral if extcon is present""
Revert "usb: dwc3: Don't switch OTG -> peripheral if extcon is
present"
drivers/usb/dwc3/core.c | 50 +---------------------------------------- drivers/usb/dwc3/drd.c | 50 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 49 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/2 Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present""
This reverts commit 8bd6b8c4b1009d7d2662138d6bdc6fe58a9274c5.
Prerequisite revert for the reverting the original patch.
--- drivers/usb/dwc3/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.c +7 -2
@@ -1684,8 +1684,13 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc)* This device property is for kernel internal use only and * is expected to be set by the glue code. */ -if (device_property_read_string (dev,"linux,extcon-name" , &name) ==0 ) -return extcon_get_extcon_dev (name); +if (device_property_read_string (dev,"linux,extcon-name" , &name) ==0 ) { + edev =extcon_get_extcon_dev (name); +if (!edev) +return ERR_PTR (-EPROBE_DEFER ); + +return edev; + }/* * Try to get an extcon device from the USB PHY controller's "port"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerRe: [PATCH v1 1/2] Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present""
Quoted 3 lines · Andy Shevchenko
This reverts commit
8bd6b8c4b1009d7d2662138d6bdc6fe58a9274c5.Prerequisite revert for the reverting the original patch.
What "original patch"?
Quoted 2 lines
Signed-off-by Andy Shevchenko <[email protected]>
What commit does this fix? Stable trees?
you know better, I can't take this as-is...
thanks,
greg k-h
PATCH 2/2 Revert "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
In reply to Andy ShevchenkoThis reverts commit 0f01017191384e3962fa31520a9fd9846c3d352f.
As pointed out by Ferry this breaks Dual Role support on Intel Merrifield platforms.
--- drivers/usb/dwc3/core.c | 55 +---------------------------------------- drivers/usb/dwc3/drd.c | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 54 deletions(-)
drivers/usb/dwc3/core.c +1 -54
@@ -23,7 +23,6 @@#include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/of.h> -#include <linux/of_graph.h> #include <linux/acpi.h> #include <linux/pinctrl/consumer.h> #include <linux/reset.h>
@@ -86,7 +85,7 @@ static int dwc3_get_dr_mode(struct dwc3 *dwc)* mode. If the controller supports DRD but the dr_mode is not * specified or set to OTG, then set the mode to peripheral. */ -if (mode ==USB_DR_MODE_OTG && !dwc->edev && +if (mode ==USB_DR_MODE_OTG && (!IS_ENABLED (CONFIG_USB_ROLE_SWITCH ) || !device_property_read_bool (dwc->dev,"usb-role-switch" )) && !DWC3_VER_IS_PRIOR(DWC3, 330A))
@@ -1668,51 +1667,6 @@ static void dwc3_check_params(struct dwc3 *dwc) } } -static struct extcon_dev *dwc3_get_extcon (struct dwc3 *dwc) -{ -struct device *dev = dwc->dev; -struct device_node *np_phy; -struct extcon_dev *edev =NULL ; -const char *name; - -if (device_property_read_bool (dev,"extcon" )) -return extcon_get_edev_by_phandle (dev,0 ); - -/* -* Device tree platforms should get extcon via phandle. -* On ACPI platforms, we get the name from a device property. -* This device property is for kernel internal use only and -* is expected to be set by the glue code. -*/ -if (device_property_read_string (dev,"linux,extcon-name" , &name) ==0 ) { - edev =extcon_get_extcon_dev (name); -if (!edev) -return ERR_PTR (-EPROBE_DEFER ); - -return edev; - } - -/* -* Try to get an extcon device from the USB PHY controller's "port" -* node. Check if it has the "port" node first, to avoid printing the -* error message from underlying code, as it's a valid case: extcon -* device (and "port" node) may be missing in case of "usb-role-switch" -* or OTG mode. -*/ - np_phy =of_parse_phandle (dev->of_node,"phys" ,0 ); -if (of_graph_is_present (np_phy)) { -struct device_node *np_conn; - - np_conn =of_graph_get_remote_node (np_phy,-1 ,-1 ); -if (np_conn) - edev =extcon_find_edev_by_node (np_conn); -of_node_put (np_conn); - } -of_node_put (np_phy); - -return edev; -} -static int dwc3_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -1848,13 +1802,6 @@ static int dwc3_probe(struct platform_device *pdev) goto err2; } - dwc->edev =dwc3_get_extcon (dwc); -if (IS_ERR (dwc->edev)) { - ret =PTR_ERR (dwc->edev); -dev_err_probe (dwc->dev, ret,"failed to get extcon\n" ); - goto err3; - } - ret =dwc3_get_dr_mode (dwc);if (ret) goto err3;
drivers/usb/dwc3/drd.c +50 -0
68 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerRe: [PATCH v1 2/2] Revert "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
Quoted 7 lines · Andy Shevchenko
This reverts commit
0f01017191384e3962fa31520a9fd9846c3d352f.As pointed out by Ferry this breaks Dual Role support on Intel Merrifield platforms.
Reported-by Ferry Toth <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>
{sigh}
greg k-h
Hi
Op 23-09-2022 om 18:30 schreef Andy Shevchenko:
Quoted 7 lines
It's late in the cycle, that's why I send these reverts, so we will have a full new cycle for testing a better solution if any.
So this is just a proactive move if we have no solution in the nearest days.
Andy Shevchenko (2):
Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG
Quoted 8 lines
-> peripheral if extcon is present""Revert "usb: dwc3: Don't switch OTG -> peripheral if extcon is
present"drivers/usb/dwc3/core.c | 50 +---------------------------------------- drivers/usb/dwc3/drd.c | 50 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 49 deletions(-)
For the series:
Greg Kroah-Hartman
maintainerQuoted 2 lines · Andy Shevchenko
It's late in the cycle, that's why I send these reverts, so we will have a full new cycle for testing a better solution if any.
Wait, you need these into what release? 6.1-rc1?
The commits you are referencing are in 5.19, right? Not 6.0-rc.
Quoted 1 line
So this is just a proactive move if we have no solution in the nearest days.
How will I know this?
confused,
greg k-h