Commit c615f5c6 authored by Serge Semin's avatar Serge Semin Committed by Wolfram Sang

i2c: designware: Discard Cherry Trail model flag

A PM workaround activated by the flag MODEL_CHERRYTRAIL has been removed
since commit 9cbeeca0 ("i2c: designware: Remove Cherry Trail PMIC I2C
bus pm_disabled workaround"), but the flag most likely by mistake has been
left in the Dw I2C drivers. Let's remove it. Since MODEL_MSCC_OCELOT is
the only model-flag left, redefine it to be 0x100 so setting a very first
bit in the MODEL_MASK bits range.
Signed-off-by: default avatarSerge Semin <Sergey.Semin@baikalelectronics.ru>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent c2549011
...@@ -289,8 +289,7 @@ struct dw_i2c_dev { ...@@ -289,8 +289,7 @@ struct dw_i2c_dev {
#define ACCESS_INTR_MASK 0x00000004 #define ACCESS_INTR_MASK 0x00000004
#define ACCESS_NO_IRQ_SUSPEND 0x00000008 #define ACCESS_NO_IRQ_SUSPEND 0x00000008
#define MODEL_CHERRYTRAIL 0x00000100 #define MODEL_MSCC_OCELOT 0x00000100
#define MODEL_MSCC_OCELOT 0x00000200
#define MODEL_MASK 0x00000f00 #define MODEL_MASK 0x00000f00
u32 dw_readl(struct dw_i2c_dev *dev, int offset); u32 dw_readl(struct dw_i2c_dev *dev, int offset);
......
...@@ -149,7 +149,6 @@ static struct dw_pci_controller dw_pci_controllers[] = { ...@@ -149,7 +149,6 @@ static struct dw_pci_controller dw_pci_controllers[] = {
}, },
[cherrytrail] = { [cherrytrail] = {
.bus_num = -1, .bus_num = -1,
.flags = MODEL_CHERRYTRAIL,
.scl_sda_cfg = &byt_config, .scl_sda_cfg = &byt_config,
}, },
[elkhartlake] = { [elkhartlake] = {
......
...@@ -44,7 +44,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = { ...@@ -44,7 +44,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = {
{ "INT3432", 0 }, { "INT3432", 0 },
{ "INT3433", 0 }, { "INT3433", 0 },
{ "80860F41", ACCESS_NO_IRQ_SUSPEND }, { "80860F41", ACCESS_NO_IRQ_SUSPEND },
{ "808622C1", ACCESS_NO_IRQ_SUSPEND | MODEL_CHERRYTRAIL }, { "808622C1", ACCESS_NO_IRQ_SUSPEND },
{ "AMD0010", ACCESS_INTR_MASK }, { "AMD0010", ACCESS_INTR_MASK },
{ "AMDI0010", ACCESS_INTR_MASK }, { "AMDI0010", ACCESS_INTR_MASK },
{ "AMDI0510", 0 }, { "AMDI0510", 0 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment