i2c: designware: Discard Cherry Trail model flag (c615f5c6) · Commits · 戴 / test

A PM workaround activated by the flag MODEL_CHERRYTRAIL has been removed since commit ("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>

drivers/i2c/busses/i2c-designware-core.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

drivers/i2c/busses/i2c-designware-pcidrv.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,6 @@ static struct dw_pci_controller dw_pci_controllers[] = {
		},
		[cherrytrail] = {
		.bus_num = -1,
		.flags = MODEL_CHERRYTRAIL,
		.scl_sda_cfg = &byt_config,
		},
		[elkhartlake] = {

drivers/i2c/busses/i2c-designware-platdrv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = {
		{ "INT3432", 0 },
		{ "INT3433", 0 },
		{ "80860F41", ACCESS_NO_IRQ_SUSPEND },
		{ "808622C1", ACCESS_NO_IRQ_SUSPEND \| MODEL_CHERRYTRAIL },
		{ "808622C1", ACCESS_NO_IRQ_SUSPEND },
		{ "AMD0010", ACCESS_INTR_MASK },
		{ "AMDI0010", ACCESS_INTR_MASK },
		{ "AMDI0510", 0 },

Admin message