diff options
| author | Serge Semin <Sergey.Semin@baikalelectronics.ru> | 2020-05-28 12:33:17 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2020-05-30 11:33:54 +0200 |
| commit | c615f5c65f622fb62df17d58485f46a544d6e07a (patch) | |
| tree | 63b006d36a0f5e2f4c527235e65e80d00d0a5f88 /drivers/i2c/busses/i2c-designware-core.h | |
| parent | c2549011db2cd520b1d4ffb85a790a4ba22a80d1 (diff) | |
| download | linux-c615f5c65f622fb62df17d58485f46a544d6e07a.tar.gz linux-c615f5c65f622fb62df17d58485f46a544d6e07a.tar.bz2 linux-c615f5c65f622fb62df17d58485f46a544d6e07a.zip | |
i2c: designware: Discard Cherry Trail model flag
A PM workaround activated by the flag MODEL_CHERRYTRAIL has been removed
since commit 9cbeeca05049 ("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: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-core.h')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 150de5e5c31b..b9ef9b0deef0 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -289,8 +289,7 @@ struct dw_i2c_dev { #define ACCESS_INTR_MASK 0x00000004 #define ACCESS_NO_IRQ_SUSPEND 0x00000008 -#define MODEL_CHERRYTRAIL 0x00000100 -#define MODEL_MSCC_OCELOT 0x00000200 +#define MODEL_MSCC_OCELOT 0x00000100 #define MODEL_MASK 0x00000f00 u32 dw_readl(struct dw_i2c_dev *dev, int offset); |