From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
To: Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Wolfram Sang <wsa@the-dreams.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>,
Serge Semin <fancer.lancer@gmail.com>,
Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Rob Herring <robh+dt@kernel.org>, <linux-mips@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-i2c@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v5 07/11] i2c: designware: Discard Cherry Trail model flag
Date: Wed, 27 May 2020 18:30:42 +0300 [thread overview]
Message-ID: <20200527153046.6172-8-Sergey.Semin@baikalelectronics.ru> (raw)
In-Reply-To: <20200527153046.6172-1-Sergey.Semin@baikalelectronics.ru>
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>
Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: devicetree@vger.kernel.org
---
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
next prev parent reply other threads:[~2020-05-27 15:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 15:30 [PATCH v5 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin
2020-05-27 15:30 ` [PATCH v5 01/11] dt-bindings: i2c: Convert DW I2C binding to DT schema Serge Semin
2020-05-27 15:30 ` [PATCH v5 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example Serge Semin
2020-05-27 15:33 ` Serge Semin
2020-05-29 18:13 ` Rob Herring
2020-05-29 18:22 ` Serge Semin
2020-05-29 18:42 ` Andy Shevchenko
2020-05-29 18:45 ` Serge Semin
2020-05-29 18:58 ` Serge Semin
2020-06-08 23:46 ` Rob Herring
2020-05-27 15:30 ` [PATCH v5 03/11] dt-bindings: i2c: dw: Add Baikal-T1 SoC I2C controller Serge Semin
2020-05-27 15:35 ` Serge Semin
2020-05-27 15:30 ` [PATCH v5 04/11] i2c: designware: Use `-y` to build multi-object modules Serge Semin
2020-05-27 15:30 ` [PATCH v5 05/11] i2c: designware: slave: Set DW I2C core module dependency Serge Semin
2020-05-27 15:30 ` [PATCH v5 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency Serge Semin
2020-05-27 15:55 ` Andy Shevchenko
2020-05-27 16:05 ` Serge Semin
2020-05-27 16:44 ` Andy Shevchenko
2020-05-27 15:30 ` Serge Semin [this message]
2020-05-27 15:57 ` [PATCH v5 07/11] i2c: designware: Discard Cherry Trail model flag Andy Shevchenko
2020-05-27 16:07 ` Serge Semin
2020-05-27 15:30 ` [PATCH v5 08/11] i2c: designware: Convert driver to using regmap API Serge Semin
2020-05-27 16:03 ` Andy Shevchenko
2020-05-27 16:09 ` Serge Semin
2020-05-27 15:30 ` [PATCH v5 09/11] i2c: designware: Retrieve quirk flags as early as possible Serge Semin
2020-05-27 15:30 ` [PATCH v5 10/11] i2c: designware: Move reg-space remapping into a dedicated function Serge Semin
2020-05-27 15:30 ` [PATCH v5 11/11] i2c: designware: Add Baikal-T1 System I2C support Serge Semin
2020-05-27 16:05 ` Andy Shevchenko
2020-05-27 16:10 ` Serge Semin
2020-05-27 16:08 ` [PATCH v5 00/11] i2c: designeware: " Andy Shevchenko
2020-05-27 16:15 ` Serge Semin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200527153046.6172-8-Sergey.Semin@baikalelectronics.ru \
--to=sergey.semin@baikalelectronics.ru \
--cc=Alexey.Malahov@baikalelectronics.ru \
--cc=andriy.shevchenko@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=fancer.lancer@gmail.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=robh+dt@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).