extcon: axp288: Remove the build-in connection description

Getting handle to the USB role switch by first finding its
software fwnode.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20191008122600.22340-3-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index 415afaf479e7c732aaadc5bd2d398f3a5678e1ec..a7f216191493095b8766aa35e95023a63debd235 100644 (file)
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -322,6 +322,25 @@ static void axp288_put_role_sw(void *data)
        usb_role_switch_put(info->role_sw);
 }
 
+static int axp288_extcon_find_role_sw(struct axp288_extcon_info *info)
+{
+       const struct software_node *swnode;
+       struct fwnode_handle *fwnode;
+
+       if (!x86_match_cpu(cherry_trail_cpu_ids))
+               return 0;
+
+       swnode = software_node_find_by_name(NULL, "intel-xhci-usb-sw");
+       if (!swnode)
+               return -EPROBE_DEFER;
+
+       fwnode = software_node_fwnode(swnode);
+       info->role_sw = usb_role_switch_find_by_fwnode(fwnode);
+       fwnode_handle_put(fwnode);
+
+       return info->role_sw ? 0 : -EPROBE_DEFER;
+}
+
 static int axp288_extcon_probe(struct platform_device *pdev)
 {
        struct axp288_extcon_info *info;
@@ -343,9 +362,10 @@ static int axp288_extcon_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, info);
 
-       info->role_sw = usb_role_switch_get(dev);
-       if (IS_ERR(info->role_sw))
-               return PTR_ERR(info->role_sw);
+       ret = axp288_extcon_find_role_sw(info);
+       if (ret)
+               return ret;
+
        if (info->role_sw) {
                ret = devm_add_action_or_reset(dev, axp288_put_role_sw, info);
                if (ret)
@@ -440,26 +460,14 @@ static struct platform_driver axp288_extcon_driver = {
        },
 };
 
-static struct device_connection axp288_extcon_role_sw_conn = {
-       .endpoint[0] = "axp288_extcon",
-       .endpoint[1] = "intel_xhci_usb_sw-role-switch",
-       .id = "usb-role-switch",
-};
-
 static int __init axp288_extcon_init(void)
 {
-       if (x86_match_cpu(cherry_trail_cpu_ids))
-               device_connection_add(&axp288_extcon_role_sw_conn);
-
        return platform_driver_register(&axp288_extcon_driver);
 }
 module_init(axp288_extcon_init);
 
 static void __exit axp288_extcon_exit(void)
 {
-       if (x86_match_cpu(cherry_trail_cpu_ids))
-               device_connection_remove(&axp288_extcon_role_sw_conn);
-
        platform_driver_unregister(&axp288_extcon_driver);
 }
 module_exit(axp288_extcon_exit);