From: Yicong Yang <yangyicong@hisilicon.com>
To: <wsa@kernel.org>, <andriy.shevchenko@linux.intel.com>,
<linux-i2c@vger.kernel.org>, <Sergey.Semin@baikalelectronics.ru>,
<linux-kernel@vger.kernel.org>
Cc: <digetx@gmail.com>, <treding@nvidia.com>,
<jarkko.nikula@linux.intel.com>, <rmk+kernel@armlinux.org.uk>,
<song.bao.hua@hisilicon.com>, <john.garry@huawei.com>,
<mika.westerberg@linux.intel.com>, <yangyicong@hisilicon.com>,
<prime.zeng@huawei.com>, <linuxarm@huawei.com>
Subject: [PATCH v7 5/5] i2c: designware: Switch over to i2c_freq_mode_string()
Date: Thu, 8 Apr 2021 19:17:21 +0800 [thread overview]
Message-ID: <1617880641-664-6-git-send-email-yangyicong@hisilicon.com> (raw)
In-Reply-To: <1617880641-664-1-git-send-email-yangyicong@hisilicon.com>
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Use generic i2c_freq_mode_string() helper to print chosen bus speed.
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
drivers/i2c/busses/i2c-designware-master.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index dd27b9d..b64c4c8 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -35,10 +35,10 @@ static void i2c_dw_configure_fifo_master(struct dw_i2c_dev *dev)
static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev)
{
- const char *mode_str, *fp_str = "";
u32 comp_param1;
u32 sda_falling_time, scl_falling_time;
struct i2c_timings *t = &dev->timings;
+ const char *fp_str = "";
u32 ic_clk;
int ret;
@@ -153,22 +153,10 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev)
ret = i2c_dw_set_sda_hold(dev);
if (ret)
- goto out;
-
- switch (dev->master_cfg & DW_IC_CON_SPEED_MASK) {
- case DW_IC_CON_SPEED_STD:
- mode_str = "Standard Mode";
- break;
- case DW_IC_CON_SPEED_HIGH:
- mode_str = "High Speed Mode";
- break;
- default:
- mode_str = "Fast Mode";
- }
- dev_dbg(dev->dev, "Bus speed: %s%s\n", mode_str, fp_str);
+ return ret;
-out:
- return ret;
+ dev_dbg(dev->dev, "Bus speed: %s\n", i2c_freq_mode_string(t->bus_freq_hz));
+ return 0;
}
/**
--
2.8.1
prev parent reply other threads:[~2021-04-08 11:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 11:17 [PATCH v7 0/5] Add support for HiSilicon I2C controller Yicong Yang
2021-04-08 11:17 ` [PATCH v7 1/5] i2c: core: add managed function for adding i2c adapters Yicong Yang
2021-04-08 11:17 ` [PATCH v7 2/5] i2c: core: add api to provide frequency mode strings Yicong Yang
2021-04-08 20:55 ` Wolfram Sang
2021-04-09 10:36 ` Andy Shevchenko
2021-04-09 11:37 ` Wolfram Sang
2021-04-09 11:40 ` Andy Shevchenko
2021-04-09 13:49 ` Yicong Yang
2021-04-08 11:17 ` [PATCH v7 3/5] i2c: add support for HiSilicon I2C controller Yicong Yang
2021-04-08 11:17 ` [PATCH v7 4/5] MAINTAINERS: Add maintainer for HiSilicon I2C driver Yicong Yang
2021-04-08 20:57 ` Wolfram Sang
2021-04-08 11:17 ` Yicong Yang [this message]
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=1617880641-664-6-git-send-email-yangyicong@hisilicon.com \
--to=yangyicong@hisilicon.com \
--cc=Sergey.Semin@baikalelectronics.ru \
--cc=andriy.shevchenko@linux.intel.com \
--cc=digetx@gmail.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=john.garry@huawei.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mika.westerberg@linux.intel.com \
--cc=prime.zeng@huawei.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=song.bao.hua@hisilicon.com \
--cc=treding@nvidia.com \
--cc=wsa@kernel.org \
/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).