i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework
Subsystems (2)
PATCH 1/1 i2c, zynq: convert zynq i2c driver to new multibus/multiadapter framework
- add zync i2c driver to new multibus/multiadpater support
- adapted all config files, which uses this driver
--- README | 5 +++++ drivers/i2c/Makefile | 2 +- drivers/i2c/zynq_i2c.c | 29 ++++++++++++++++------------- include/configs/zynq.h | 8 ++++---- 4 files changed, 26 insertions(+), 18 deletions(-)
README +5 -0
@@ -2064,6 +2064,11 @@ CBFS (Coreboot Filesystem) support - CONFIG_SYS_OMAP24_I2C_SPEED4 speed channel 4 - CONFIG_SYS_OMAP24_I2C_SLAVE4 slave addr channel 4 + - drivers/i2c/zynq_i2c.c + - activate this driver with CONFIG_SYS_I2C_ZYNQ + - set CONFIG_SYS_I2C_ZYNQ_SPEED for speed setting + - set CONFIG_SYS_I2C_ZYNQ_SLAVE for slave addr + additional defines: CONFIG_SYS_NUM_I2C_BUSES
drivers/i2c/Makefile +1 -1
@@ -28,4 +28,4 @@ obj-$(CONFIG_SYS_I2C_RCAR) += rcar_i2c.o obj-$(CONFIG_SYS_I2C_SH) += sh_i2c.o obj-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o obj-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o -obj-$(CONFIG_ZYNQ_I2C) += zynq_i2c.o +obj-$(CONFIG_SYS_I2C_ZYNQ) += zynq_i2c.o
drivers/i2c/zynq_i2c.c +16 -13
@@ -74,7 +74,8 @@ static struct zynq_i2c_registers *zynq_i2c = (struct zynq_i2c_registers *)ZYNQ_I2C_BASE ;/* I2C init called by cmd_i2c when doing 'i2c reset'. */ -void i2c_init (int requested_speed,int slaveadd) +static void zynq_i2c_init (struct i2c_adapter *adap,int requested_speed, +int slaveadd) {/* 111MHz / ( (3 * 17) * 22 ) = ~100KHz */ writel((16 << ZYNQ_I2C_CONTROL_DIV_B_SHIFT) |
@@ -151,7 +152,7 @@ static u32 zynq_i2c_wait(u32 mask)* I2C probe called by cmd_i2c when doing 'i2c probe'. * Begin read, nak data byte, end. */ -int i2c_probe (u8 dev) +static int zynq_i2c_probe (struct i2c_adapter *adap,u8 dev) {/* Attempt to read a byte */ setbits_le32(&zynq_i2c->control, ZYNQ_I2C_CONTROL_CLR_FIFO |
@@ -170,7 +171,8 @@ int i2c_probe(u8 dev)* I2C read called by cmd_i2c when doing 'i2c read' and by cmd_eeprom.c * Begin write, send address byte(s), begin read, receive data bytes, end. */ -int i2c_read (u8 dev,uint addr,int alen,u8 *data,int length) +static int zynq_i2c_read (struct i2c_adapter *adap,u8 dev,uint addr, +int alen,u8 *data,int length) {u32 status;u32 i =0 ;
@@ -235,7 +237,8 @@ int i2c_read(u8 dev, uint addr, int alen, u8 *data, int length)* I2C write called by cmd_i2c when doing 'i2c write' and by cmd_eeprom.c * Begin write, send address byte(s), send data bytes, end. */ -int i2c_write (u8 dev,uint addr,int alen,u8 *data,int length) +static int zynq_i2c_write (struct i2c_adapter *adap,u8 dev,uint addr, +int alen,u8 *data,int length) {u8 *cur_data = data;
@@ -275,16 +278,16 @@ int i2c_write(u8 dev, uint addr, int alen, u8 *data, int length)return 0 ; } -int i2c_set_bus_num (unsigned int bus) +static unsigned int zynq_i2c_set_bus_speed (struct i2c_adapter *adap, +unsigned int speed) { -/* Only support bus 0 */ -if (bus >0 ) -return -1 ; -return 0 ; -} +if (speed !=1000000 ) +return -EINVAL ; -unsigned int i2c_get_bus_num (void ) -{ -/* Only support bus 0 */ return 0 ; } + +U_BOOT_I2C_ADAP_COMPLETE (zynq_0, zynq_i2c_init, zynq_i2c_probe, zynq_i2c_read, + zynq_i2c_write, zynq_i2c_set_bus_speed, +CONFIG_SYS_I2C_ZYNQ_SPEED ,CONFIG_SYS_I2C_ZYNQ_SLAVE , +0 )
include/configs/zynq.h +4 -4
@@ -60,10 +60,10 @@/* I2C */ #if defined(CONFIG_ZYNQ_I2C0 ) || defined(CONFIG_ZYNQ_I2C1 )# define CONFIG_CMD_I2C -# define CONFIG_ZYNQ_I2C -# define CONFIG_HARD_I2C -# define CONFIG_SYS_I2C_SPEED 100000 -# define CONFIG_SYS_I2C_SLAVE 1 +# define CONFIG_SYS_I2C +# define CONFIG_SYS_I2C_ZYNQ +# define CONFIG_SYS_I2C_ZYNQ_SPEED 100000 +# define CONFIG_SYS_I2C_ZYNQ_SLAVE 1#endif #if defined(CONFIG_ZYNQ_DCC )
Signature · 1 line
1.8.3.1
PATCH 1/1 i2c, omap1510: remove i2c driver
remove omap1510 i2c driver, as there is no board which uses it
--- drivers/i2c/Makefile | 1 - drivers/i2c/omap1510_i2c.c | 277 --------------------------------------------- 2 files changed, 278 deletions(-) delete mode 100644 drivers/i2c/omap1510_i2c.c
drivers/i2c/Makefile +0 -1
@@ -11,7 +11,6 @@ obj-$(CONFIG_DW_I2C) += designware_i2c.o obj-$(CONFIG_I2C_MVTWSI) += mvtwsi.o obj-$(CONFIG_I2C_MV) += mv_i2c.o obj-$(CONFIG_I2C_MXS) += mxs_i2c.o -obj-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o obj-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o obj-$(CONFIG_DRIVER_S3C24X0_I2C) += s3c24x0_i2c.o obj-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
drivers/i2c/omap1510_i2c.c deleted +0 -277
277 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 1/1 i2c, omap1510: remove i2c driver
Quoted 5 lines · Heiko Schocher
remove omap1510 i2c driver, as there is no board which uses it
Signed-off-by Heiko Schocher <[email protected]>Cc Tom Rini <[email protected]>Cc Wolfgang Denk <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131108/e1dd5966/attachment.pgp>
[U-Boot] i2c, omap1510: remove i2c driver
In reply to Heiko SchocherHello Heiko,
Am 08.11.2013 09:38, schrieb Heiko Schocher:
Quoted 7 lines
remove omap1510 i2c driver, as there is no board which uses it
Signed-off-by Heiko Schocher<[email protected]>Cc Tom Rini<[email protected]>Cc Wolfgang Denk<[email protected]>Acked-by Tom Rini<[email protected]>
Quoted 5 lines
---
drivers/i2c/Makefile| 1 -drivers/i2c/omap1510_i2c.c | 277 --------------------------------------------- 2 files changed, 278 deletions(-)delete mode 100644
drivers/i2c/omap1510_i2c.c
Applied to u-boot-i2c.git
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Hello Heiko,
Am 08.11.2013 09:38, schrieb Heiko Schocher:
Quoted 7 lines
- add zync i2c driver to new multibus/multiadpater support
- adapted all config files, which uses this driverSigned-off-by Heiko Schocher<[email protected]>Cc Joe Hershberger<[email protected]>Cc Michal Simek<[email protected]>
Quoted 6 lines
---
README | 5 +++++drivers/i2c/Makefile | 2 +- drivers/i2c/zynq_i2c.c | 29 ++++++++++++++++------------- include/configs/zynq.h | 8 ++++---- 4 files changed, 26 insertions(+), 18 deletions(-)
Applied to u-boot-i2c.git
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany