On Thu, May 28, 2020 at 12:33:17PM +0300, Serge Semin wrote:
> 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.Reviewed-by: Andy Shevchenko <[email protected]> Conditionally, in case Wolfram and Jarkko are fine with shuffling model defines, which I consider an unneeded churn. > Signed-off-by: Serge Semin <[email protected]> > Acked-by: Jarkko Nikula <[email protected]> > Cc: Alexey Malahov <[email protected]> > Cc: Thomas Bogendoerfer <[email protected]> > Cc: Rob Herring <[email protected]> > Cc: [email protected] > Cc: [email protected] > > --- > > Changelog v3: > - Since MSCC and Baikal-T1 will be a part of the platform driver code, we > have to preserve the MODEL_MASK macro to use it to filter the model > flags during the IP-specific quirks activation. > --- > drivers/i2c/busses/i2c-designware-core.h | 3 +-- > drivers/i2c/busses/i2c-designware-pcidrv.c | 1 - > drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- > 3 files changed, 2 insertions(+), 4 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); > diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c > b/drivers/i2c/busses/i2c-designware-pcidrv.c > index 11a5e4751eab..947c096f86e3 100644 > --- a/drivers/i2c/busses/i2c-designware-pcidrv.c > +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c > @@ -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] = { > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c > b/drivers/i2c/busses/i2c-designware-platdrv.c > index f6d2c96e35ce..ca057aa9eac4 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -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 }, > -- > 2.26.2 > -- With Best Regards, Andy Shevchenko
