diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-03-22 11:32:44 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-03-22 11:32:44 +0300 |
| commit | a528fab6cc66acdccb48552a79300bc1fbda6b5b (patch) | |
| tree | d9c30f537766e5a648262008b7e1ab9bf5739e19 /drivers/i2c/busses/i2c-designware-platdrv.c | |
| parent | 97da3854c526d3a6ee05c849c96e48d21527606c (diff) | |
| parent | 264ec1a8221c60f9ccf13f58ac597da21235132d (diff) | |
| download | linux-a528fab6cc66acdccb48552a79300bc1fbda6b5b.tar.xz | |
Merge tag 'topic/designware-baytrail-2017-03-02' of git://anongit.freedesktop.org/git/drm-intel into i2c/for-next
Pull immutable branch as a common base for further development:
"Baytrail PMIC vs. PMU race fixes from Hans de Goede
This time the right version (v4), with the compile fix."
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-platdrv.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-platdrv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 79c4b4ea0539..d8665098dce9 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -113,7 +113,7 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev); if (id && id->driver_data) - dev->accessor_flags |= (u32)id->driver_data; + dev->flags |= (u32)id->driver_data; return 0; } @@ -124,7 +124,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = { { "INT3432", 0 }, { "INT3433", 0 }, { "80860F41", 0 }, - { "808622C1", 0 }, + { "808622C1", MODEL_CHERRYTRAIL }, { "AMD0010", ACCESS_INTR_MASK }, { "AMDI0010", ACCESS_INTR_MASK }, { "AMDI0510", 0 }, @@ -248,7 +248,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) goto exit_reset; } - r = i2c_dw_eval_lock_support(dev); + r = i2c_dw_probe_lock_support(dev); if (r) goto exit_reset; @@ -327,6 +327,8 @@ static int dw_i2c_plat_remove(struct platform_device *pdev) if (!IS_ERR_OR_NULL(dev->rst)) reset_control_assert(dev->rst); + i2c_dw_remove_lock_support(dev); + return 0; } |