Merge tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform...
[sfrench/cifs-2.6.git] / drivers / platform / x86 / intel_cht_int33fe.c
index 6531a0c3cc0dd6e79a4fb1ed7b380b8d0206b17f..464fe93657b53e03268eabb2f41f5cdd0583d96e 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
@@ -31,7 +32,7 @@ struct cht_int33fe_data {
        struct i2c_client *fusb302;
        struct i2c_client *pi3usb30532;
        /* Contain a list-head must be per device */
-       struct device_connection connections[3];
+       struct device_connection connections[5];
 };
 
 /*
@@ -85,9 +86,9 @@ static const struct property_entry fusb302_props[] = {
        { }
 };
 
-static int cht_int33fe_probe(struct i2c_client *client)
+static int cht_int33fe_probe(struct platform_device *pdev)
 {
-       struct device *dev = &client->dev;
+       struct device *dev = &pdev->dev;
        struct i2c_board_info board_info;
        struct cht_int33fe_data *data;
        struct i2c_client *max17047;
@@ -171,19 +172,20 @@ static int cht_int33fe_probe(struct i2c_client *client)
                        return -EPROBE_DEFER; /* Wait for i2c-adapter to load */
        }
 
-       data->connections[0].endpoint[0] = "i2c-fusb302";
+       data->connections[0].endpoint[0] = "port0";
        data->connections[0].endpoint[1] = "i2c-pi3usb30532";
        data->connections[0].id = "typec-switch";
-       data->connections[1].endpoint[0] = "i2c-fusb302";
+       data->connections[1].endpoint[0] = "port0";
        data->connections[1].endpoint[1] = "i2c-pi3usb30532";
        data->connections[1].id = "typec-mux";
-       data->connections[2].endpoint[0] = "i2c-fusb302";
-       data->connections[2].endpoint[1] = "intel_xhci_usb_sw-role-switch";
-       data->connections[2].id = "usb-role-switch";
+       data->connections[2].endpoint[0] = "port0";
+       data->connections[2].endpoint[1] = "i2c-pi3usb30532";
+       data->connections[2].id = "idff01m01";
+       data->connections[3].endpoint[0] = "i2c-fusb302";
+       data->connections[3].endpoint[1] = "intel_xhci_usb_sw-role-switch";
+       data->connections[3].id = "usb-role-switch";
 
-       device_connection_add(&data->connections[0]);
-       device_connection_add(&data->connections[1]);
-       device_connection_add(&data->connections[2]);
+       device_connections_add(data->connections);
 
        memset(&board_info, 0, sizeof(board_info));
        strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
@@ -203,7 +205,7 @@ static int cht_int33fe_probe(struct i2c_client *client)
        if (!data->pi3usb30532)
                goto out_unregister_fusb302;
 
-       i2c_set_clientdata(client, data);
+       platform_set_drvdata(pdev, data);
 
        return 0;
 
@@ -214,52 +216,41 @@ out_unregister_max17047:
        if (data->max17047)
                i2c_unregister_device(data->max17047);
 
-       device_connection_remove(&data->connections[2]);
-       device_connection_remove(&data->connections[1]);
-       device_connection_remove(&data->connections[0]);
+       device_connections_remove(data->connections);
 
        return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
 }
 
-static int cht_int33fe_remove(struct i2c_client *i2c)
+static int cht_int33fe_remove(struct platform_device *pdev)
 {
-       struct cht_int33fe_data *data = i2c_get_clientdata(i2c);
+       struct cht_int33fe_data *data = platform_get_drvdata(pdev);
 
        i2c_unregister_device(data->pi3usb30532);
        i2c_unregister_device(data->fusb302);
        if (data->max17047)
                i2c_unregister_device(data->max17047);
 
-       device_connection_remove(&data->connections[2]);
-       device_connection_remove(&data->connections[1]);
-       device_connection_remove(&data->connections[0]);
+       device_connections_remove(data->connections);
 
        return 0;
 }
 
-static const struct i2c_device_id cht_int33fe_i2c_id[] = {
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, cht_int33fe_i2c_id);
-
 static const struct acpi_device_id cht_int33fe_acpi_ids[] = {
        { "INT33FE", },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, cht_int33fe_acpi_ids);
 
-static struct i2c_driver cht_int33fe_driver = {
+static struct platform_driver cht_int33fe_driver = {
        .driver = {
                .name = "Intel Cherry Trail ACPI INT33FE driver",
                .acpi_match_table = ACPI_PTR(cht_int33fe_acpi_ids),
        },
-       .probe_new = cht_int33fe_probe,
+       .probe = cht_int33fe_probe,
        .remove = cht_int33fe_remove,
-       .id_table = cht_int33fe_i2c_id,
-       .disable_i2c_core_irq_mapping = true,
 };
 
-module_i2c_driver(cht_int33fe_driver);
+module_platform_driver(cht_int33fe_driver);
 
 MODULE_DESCRIPTION("Intel Cherry Trail ACPI INT33FE pseudo device driver");
 MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");