From: pierre-yves.mordret@st.com (Pierre-Yves MORDRET)
To: linux-arm-kernel@lists.infradead.org
Subject: [RESEND PATCH v1 1/6] i2c: i2c-stm32f7: Add 10-bit address support
Date: Mon, 12 Mar 2018 11:53:38 +0100 [thread overview]
Message-ID: <1520852023-27083-2-git-send-email-pierre-yves.mordret@st.com> (raw)
In-Reply-To: <1520852023-27083-1-git-send-email-pierre-yves.mordret@st.com>
This patch adds support for 10-bit device address for STM32F7 I2C
Signed-off-by: M'boumba Cedric Madianga <cedric.madianga@gmail.com>
Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
---
Version history:
v1:
* Initial
---
---
drivers/i2c/busses/i2c-stm32f7.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index fdad107..8e56df0 100644
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -65,7 +65,12 @@
#define STM32F7_I2C_CR2_NACK BIT(15)
#define STM32F7_I2C_CR2_STOP BIT(14)
#define STM32F7_I2C_CR2_START BIT(13)
+#define STM32F7_I2C_CR2_HEAD10R BIT(12)
+#define STM32F7_I2C_CR2_ADD10 BIT(11)
#define STM32F7_I2C_CR2_RD_WRN BIT(10)
+#define STM32F7_I2C_CR2_SADD10_MASK GENMASK(9, 0)
+#define STM32F7_I2C_CR2_SADD10(n) (((n) & \
+ STM32F7_I2C_CR2_SADD10_MASK))
#define STM32F7_I2C_CR2_SADD7_MASK GENMASK(7, 1)
#define STM32F7_I2C_CR2_SADD7(n) (((n) & 0x7f) << 1)
@@ -176,14 +181,14 @@ struct stm32f7_i2c_timings {
/**
* struct stm32f7_i2c_msg - client specific data
- * @addr: 8-bit slave addr, including r/w bit
+ * @addr: 8-bit or 10-bit slave addr, including r/w bit
* @count: number of bytes to be transferred
* @buf: data buffer
* @result: result of the transfer
* @stop: last I2C msg to be sent, i.e. STOP to be generated
*/
struct stm32f7_i2c_msg {
- u8 addr;
+ u16 addr;
u32 count;
u8 *buf;
int result;
@@ -629,8 +634,15 @@ static void stm32f7_i2c_xfer_msg(struct stm32f7_i2c_dev *i2c_dev,
cr2 |= STM32F7_I2C_CR2_RD_WRN;
/* Set slave address */
- cr2 &= ~STM32F7_I2C_CR2_SADD7_MASK;
- cr2 |= STM32F7_I2C_CR2_SADD7(f7_msg->addr);
+ cr2 &= ~(STM32F7_I2C_CR2_HEAD10R | STM32F7_I2C_CR2_ADD10);
+ if (msg->flags & I2C_M_TEN) {
+ cr2 &= ~STM32F7_I2C_CR2_SADD10_MASK;
+ cr2 |= STM32F7_I2C_CR2_SADD10(f7_msg->addr);
+ cr2 |= STM32F7_I2C_CR2_ADD10;
+ } else {
+ cr2 &= ~STM32F7_I2C_CR2_SADD7_MASK;
+ cr2 |= STM32F7_I2C_CR2_SADD7(f7_msg->addr);
+ }
/* Set nb bytes to transfer and reload if needed */
cr2 &= ~(STM32F7_I2C_CR2_NBYTES_MASK | STM32F7_I2C_CR2_RELOAD);
@@ -798,7 +810,7 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap,
static u32 stm32f7_i2c_func(struct i2c_adapter *adap)
{
- return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
}
static struct i2c_algorithm stm32f7_i2c_algo = {
--
2.7.4
next prev parent reply other threads:[~2018-03-12 10:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 10:53 [RESEND PATCH v1 0/6] Add different features for I2C Pierre-Yves MORDRET
2018-03-12 10:53 ` Pierre-Yves MORDRET [this message]
2018-03-12 10:53 ` [RESEND PATCH v1 2/6] i2c: i2c-stm32f7: Add slave support Pierre-Yves MORDRET
2018-03-17 20:51 ` Wolfram Sang
2018-03-19 8:41 ` Pierre Yves MORDRET
2018-03-20 9:52 ` Wolfram Sang
2018-03-20 10:17 ` Pierre Yves MORDRET
2018-03-21 10:47 ` Pierre Yves MORDRET
2018-03-12 10:53 ` [RESEND PATCH v1 3/6] i2c: i2c-stm32f7: Add initial SMBus protocols support Pierre-Yves MORDRET
2018-03-13 12:52 ` kbuild test robot
2018-03-13 12:52 ` [PATCH] i2c: i2c-stm32f7: fix semicolon.cocci warnings kbuild test robot
2018-03-12 10:53 ` [RESEND PATCH v1 4/6] i2c: i2c-stm32: Add generic DMA API Pierre-Yves MORDRET
2018-03-12 10:53 ` [RESEND PATCH v1 5/6] i2c: i2c-stm32f7: Add DMA support Pierre-Yves MORDRET
2018-03-14 9:06 ` kbuild test robot
2018-03-12 10:53 ` [RESEND PATCH v1 6/6] i2c: i2c-stm32f7: Implement I2C recovery mechanism Pierre-Yves MORDRET
2018-03-17 20:47 ` Wolfram Sang
2018-03-19 8:51 ` Pierre Yves MORDRET
2018-03-20 9:31 ` Pierre Yves MORDRET
2018-03-20 9:42 ` Wolfram Sang
2018-03-20 9:45 ` Pierre Yves MORDRET
2018-03-19 9:36 ` Phil Reid
2018-03-19 16:25 ` Pierre Yves MORDRET
-- strict thread matches above, loose matches on Subject: below --
2018-02-27 9:48 [RESEND PATCH v1 0/6] Add different features for I2C Pierre-Yves MORDRET
2018-02-27 9:48 ` [RESEND PATCH v1 1/6] i2c: i2c-stm32f7: Add 10-bit address support Pierre-Yves MORDRET
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=1520852023-27083-2-git-send-email-pierre-yves.mordret@st.com \
--to=pierre-yves.mordret@st.com \
--cc=linux-arm-kernel@lists.infradead.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).