Hi, On 23-05-18 16:37, Heikki Krogerus wrote:
Trying to determine the USB port type with this mux is very difficult. To simplify the situation, always allowing user control, even if the port is USB Type-C port.Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com> --- .../usb/roles/intel-xhci-usb-role-switch.c | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/usb/roles/intel-xhci-usb-role-switch.c b/drivers/usb/roles/intel-xhci-usb-role-switch.c index 30b07ea3a3c6..3f14153d753f 100644 --- a/drivers/usb/roles/intel-xhci-usb-role-switch.c +++ b/drivers/usb/roles/intel-xhci-usb-role-switch.c @@ -39,20 +39,6 @@ struct intel_xhci_usb_data { void __iomem *base; };-struct intel_xhci_acpi_match {- const char *hid; - int hrv; -}; - -/* - * ACPI IDs for PMICs which do not support separate data and power role - * detection (USB ACA detection for micro USB OTG), we allow userspace to - * change the role manually on these. - */ -static const struct intel_xhci_acpi_match allow_userspace_ctrl_ids[] = { - { "INT33F4", 3 }, /* X-Powers AXP288 PMIC */ -}; - static int intel_xhci_usb_set_role(struct device *dev, enum usb_role role) { struct intel_xhci_usb_data *data = dev_get_drvdata(dev); @@ -139,6 +125,7 @@ static enum usb_role intel_xhci_usb_get_role(struct device *dev) static struct usb_role_switch_desc sw_desc = { .set = intel_xhci_usb_set_role, .get = intel_xhci_usb_get_role, + .allow_userspace_control = true, };static int intel_xhci_usb_probe(struct platform_device *pdev)
I hate to be pedantic here, but the sw_desc can and should be made const now, with that fixed the entire series is: Reviewed-by: Hans de Goede <hdego...@redhat.com> Regards, Hans
@@ -146,7 +133,6 @@ static int intel_xhci_usb_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct intel_xhci_usb_data *data; struct resource *res; - int i;data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);if (!data) @@ -159,11 +145,6 @@ static int intel_xhci_usb_probe(struct platform_device *pdev) if (!data->base) return -ENOMEM;- for (i = 0; i < ARRAY_SIZE(allow_userspace_ctrl_ids); i++)- if (acpi_dev_present(allow_userspace_ctrl_ids[i].hid, "1", - allow_userspace_ctrl_ids[i].hrv)) - sw_desc.allow_userspace_control = true; - platform_set_drvdata(pdev, data);data->role_sw = usb_role_switch_register(dev, &sw_desc);
-- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
