Skip to contentSkip to conversation

i2c: pxa: migrate to i2c-core-slave APIs

PATCH Applied Patrick Williams 3 participants 6 messages Oct 1, 2019 – Nov 11, 2019 I2C subsystem host drivers

lore
Share & tools
lore
#0 lore raw

cover i2c: pxa: migrate to i2c-core-slave APIs

i2c-pxa has its own i2c slave APIs rather than using the i2c-core APIs. There are no in-tree drivers currently using this custom slave API set.

Migrate the i2c-pxa driver from its own i2c slave APIs to the i2c-core slave APIs so that in-tree slave devices can be used with the i2c-pxa hardware (ex. i2c-slave-eeprom).

Patrick Williams (2):
i2c: pxa: migrate to new i2c_slave APIs
i2c: pxa: remove unused i2c-slave APIs

 drivers/i2c/busses/Kconfig            |  1 +
 drivers/i2c/busses/i2c-pxa.c          | 75 +++++++++++++++++++++------
 include/linux/i2c-pxa.h               | 18 -------
 include/linux/platform_data/i2c-pxa.h |  4 --
 4 files changed, 61 insertions(+), 37 deletions(-)
 delete mode 100644 include/linux/i2c-pxa.h
Signature · 1 line
2.17.2 (Apple Git-113)
#1 lore raw

PATCH 1/2 i2c: pxa: migrate to new i2c_slave APIs

The i2c subsystem was enhanced circa 2015 to support operating as an i2c-slave device. Prior to that, the i2c-pxa driver supported an i2c-slave but had its own APIs. There are no existing in-kernel drivers or platforms that utilize the i2c-pxa APIs.

Migrate the i2c-pxa driver to the general i2c-slave APIs so that existing drivers, such as the i2c-slave-eeprom, can be used.

This has been tested with a Marvell EspressoBin, using i2c-pxa and i2c-slave-eeprom, acting as a slave, and a RaspeberryPi 3, using the at24 driver, acting as a master.

---
 drivers/i2c/busses/Kconfig   |  1 +
 drivers/i2c/busses/i2c-pxa.c | 74 +++++++++++++++++++++++++++++-------
 2 files changed, 61 insertions(+), 14 deletions(-)
drivers/i2c/busses/Kconfig +1 -0
index 146ce40d8e0a..d0c79ac9ffdb 100644
@@ -874,6 +874,7 @@ config I2C_PXA_PCI
 config I2C_PXA_SLAVE
 	bool "Intel PXA2XX I2C Slave comms support"
 	depends on I2C_PXA && !X86_32
+	select I2C_SLAVE
 	help
 	  Support I2C slave mode communications on the PXA I2C bus.  This
 	  is necessary for systems where the PXA may be a target on the
drivers/i2c/busses/i2c-pxa.c +60 -14

132 lines not on this page · raw message

Signature · 1 line
2.17.2 (Apple Git-113)
#2 lore raw

Re: [PATCH 1/2] i2c: pxa: migrate to new i2c_slave APIs

Quoted 11 lines · Patrick Williams

The i2c subsystem was enhanced circa 2015 to support operating as an i2c-slave device. Prior to that, the i2c-pxa driver supported an i2c-slave but had its own APIs. There are no existing in-kernel drivers or platforms that utilize the i2c-pxa APIs.

Migrate the i2c-pxa driver to the general i2c-slave APIs so that existing drivers, such as the i2c-slave-eeprom, can be used.

This has been tested with a Marvell EspressoBin, using i2c-pxa and i2c-slave-eeprom, acting as a slave, and a RaspeberryPi 3, using the at24 driver, acting as a master.

There are quite a few people in the Cc list. I'm not sure they all are interested in this. I deliberately dropped few names, sorry, if I was mistaken.

drivers/i2c/busses/i2c-pxa.c static void i2c_pxa_slave_start(struct pxa_i2c *i2c, u32 isr) · line 586

Quoted 10 lines
drivers/i2c/busses/i2c-pxa.c +10 -0
+		if (isr & ISR_RWM) {
+			u8 byte = 0;
+
+			i2c_slave_event(i2c->slave, I2C_SLAVE_READ_REQUESTED,
+					&byte);
+			writel(byte, _IDBR(i2c));
+		} else {
+			i2c_slave_event(i2c->slave, I2C_SLAVE_WRITE_REQUESTED,
+					NULL);
+		}

Hmm... Perhaps

		u8 byte = 0;

		i2c_slave_event(i2c->slave, I2C_SLAVE_READ_REQUESTED, &byte);
		if (isr & ISR_RWM)
			writel(byte, _IDBR(i2c));
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw

Re: [PATCH 1/2] i2c: pxa: migrate to new i2c_slave APIs

Thanks for the review Andy.

Quoted 5 lines · Andy Shevchenko

On Tue, Oct 01, 2019 at 10:59:59AM -0500, Patrick Williams wrote:
There are quite a few people in the Cc list. I'm not sure they all are interested in this. I deliberately dropped few names, sorry, if I was mistaken.

Agree it was kind of a big list. Just chose what was given to me by get_maintainer.pl. It seems like there isn't a direct identified maintainer of this file.

Quoted 14 lines

drivers/i2c/busses/i2c-pxa.c static void i2c_pxa_slave_start(struct pxa_i2c *i2c, u32 isr) · line 586

Quoted 11 lines
drivers/i2c/busses/i2c-pxa.c +10 -0
+		if (isr & ISR_RWM) {
+			u8 byte = 0;
+
+			i2c_slave_event(i2c->slave, I2C_SLAVE_READ_REQUESTED,
+					&byte);
+			writel(byte, _IDBR(i2c));
+		} else {
+			i2c_slave_event(i2c->slave, I2C_SLAVE_WRITE_REQUESTED,
+					NULL);
+		}

Hmm... Perhaps

Quoted 6 lines
		u8 byte = 0;

		i2c_slave_event(i2c->slave, I2C_SLAVE_READ_REQUESTED, &byte);
		if (isr & ISR_RWM)
			writel(byte, _IDBR(i2c));

The two different paths also require READ_REQUEST vs WRITE_REQUESTED. I could do a ternary there but it seemed more obvious to just unroll the logic.

Signature · 1 line
- Patrick
Applied
#4 lore raw

Re: [PATCH 1/2] i2c: pxa: migrate to new i2c_slave APIs

In reply to Patrick Williams
Quoted 5 lines · Patrick Williams

The i2c subsystem was enhanced circa 2015 to support operating as an i2c-slave device. Prior to that, the i2c-pxa driver supported an i2c-slave but had its own APIs. There are no existing in-kernel drivers or platforms that utilize the i2c-pxa APIs.

Quoted 8 lines

Migrate the i2c-pxa driver to the general i2c-slave APIs so that existing drivers, such as the i2c-slave-eeprom, can be used.

This has been tested with a Marvell EspressoBin, using i2c-pxa and i2c-slave-eeprom, acting as a slave, and a RaspeberryPi 3, using the at24 driver, acting as a master.

Awesome! This was so needed but I always wondered if PXA was still around...

Applied to for-next, thanks!

#5 lore raw

PATCH 2/2 i2c: pxa: remove unused i2c-slave APIs

In reply to Patrick Williams

With the i2c-pxa driver migrated to the standard i2c-slave APIs, the custom APIs and structures are no longer needed or used. Remove them.

---
 drivers/i2c/busses/i2c-pxa.c          |  1 -
 include/linux/i2c-pxa.h               | 18 ------------------
 include/linux/platform_data/i2c-pxa.h |  4 ----
 3 files changed, 23 deletions(-)
 delete mode 100644 include/linux/i2c-pxa.h
drivers/i2c/busses/i2c-pxa.c +0 -1
index c811646e809f..466e4f681d7a 100644
@@ -25,7 +25,6 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
-#include <linux/i2c-pxa.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
include/linux/i2c-pxa.h deleted +0 -18
deleted file mode 100644
index a897e2b507b6..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _LINUX_I2C_ALGO_PXA_H
-#define _LINUX_I2C_ALGO_PXA_H
-
-typedef enum i2c_slave_event_e {
-	I2C_SLAVE_EVENT_START_READ,
-	I2C_SLAVE_EVENT_START_WRITE,
-	I2C_SLAVE_EVENT_STOP
-} i2c_slave_event_t;
-
-struct i2c_slave_client {
-	void *data;
-	void (*event)(void *ptr, i2c_slave_event_t event);
-	int  (*read) (void *ptr);
-	void (*write)(void *ptr, unsigned int val);
-};
-
-#endif /* _LINUX_I2C_ALGO_PXA_H */
include/linux/platform_data/i2c-pxa.h +0 -4
index cb290092599c..6a9b28399b39 100644
@@ -55,11 +55,7 @@
  */
 #define I2C_ISR_INIT	0x7FF  /* status register init */
 
-struct i2c_slave_client;
-
 struct i2c_pxa_platform_data {
-	unsigned int		slave_addr;
-	struct i2c_slave_client	*slave;
 	unsigned int		class;
 	unsigned int		use_pio :1;
 	unsigned int		fast_mode :1;
Signature · 1 line
2.17.2 (Apple Git-113)