|
@@ -24,6 +24,7 @@
|
|
#include <linux/i2c.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/module.h>
|
|
#include <linux/module.h>
|
|
|
|
+#include <linux/platform_device.h>
|
|
#include <linux/regulator/consumer.h>
|
|
#include <linux/regulator/consumer.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/slab.h>
|
|
|
|
|
|
@@ -88,9 +89,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 i2c_board_info board_info;
|
|
struct cht_int33fe_data *data;
|
|
struct cht_int33fe_data *data;
|
|
struct i2c_client *max17047;
|
|
struct i2c_client *max17047;
|
|
@@ -206,7 +207,7 @@ static int cht_int33fe_probe(struct i2c_client *client)
|
|
if (!data->pi3usb30532)
|
|
if (!data->pi3usb30532)
|
|
goto out_unregister_fusb302;
|
|
goto out_unregister_fusb302;
|
|
|
|
|
|
- i2c_set_clientdata(client, data);
|
|
|
|
|
|
+ platform_set_drvdata(pdev, data);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
@@ -224,9 +225,9 @@ out_unregister_max17047:
|
|
return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
|
|
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->pi3usb30532);
|
|
i2c_unregister_device(data->fusb302);
|
|
i2c_unregister_device(data->fusb302);
|
|
@@ -240,29 +241,22 @@ static int cht_int33fe_remove(struct i2c_client *i2c)
|
|
return 0;
|
|
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[] = {
|
|
static const struct acpi_device_id cht_int33fe_acpi_ids[] = {
|
|
{ "INT33FE", },
|
|
{ "INT33FE", },
|
|
{ }
|
|
{ }
|
|
};
|
|
};
|
|
MODULE_DEVICE_TABLE(acpi, cht_int33fe_acpi_ids);
|
|
MODULE_DEVICE_TABLE(acpi, cht_int33fe_acpi_ids);
|
|
|
|
|
|
-static struct i2c_driver cht_int33fe_driver = {
|
|
|
|
|
|
+static struct platform_driver cht_int33fe_driver = {
|
|
.driver = {
|
|
.driver = {
|
|
.name = "Intel Cherry Trail ACPI INT33FE driver",
|
|
.name = "Intel Cherry Trail ACPI INT33FE driver",
|
|
.acpi_match_table = ACPI_PTR(cht_int33fe_acpi_ids),
|
|
.acpi_match_table = ACPI_PTR(cht_int33fe_acpi_ids),
|
|
},
|
|
},
|
|
- .probe_new = cht_int33fe_probe,
|
|
|
|
|
|
+ .probe = cht_int33fe_probe,
|
|
.remove = cht_int33fe_remove,
|
|
.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_DESCRIPTION("Intel Cherry Trail ACPI INT33FE pseudo device driver");
|
|
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
|
|
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
|