Commit 8a863a60 authored by Nikolaus Voss's avatar Nikolaus Voss Committed by Greg Kroah-Hartman
Browse files

usb: typec: tps6598x: handle block writes separately with plain-I2C adapters 



Commit 1a2f474d handles block _reads_ separately with plain-I2C
adapters, but the problem described with regmap-i2c not handling
SMBus block transfers (i.e. read and writes) correctly also exists
with writes.

As workaround, this patch adds a block write function the same way
1a2f474d adds a block read function.

Fixes: 1a2f474d ("usb: typec: tps6598x: handle block reads separately with plain-I2C adapters")
Fixes: 0a4c005b ("usb: typec: driver for TI TPS6598x USB Power Delivery controllers")
Signed-off-by: default avatarNikolaus Voss <nikolaus.voss@loewensteinmedical.de>
Cc: stable <stable@vger.kernel.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8fde481e

drivers/usb/typec/tps6598x.c

+20 −6
Original line number Diff line number Diff line
@@ -126,6 +126,20 @@ tps6598x_block_read(struct tps6598x *tps, u8 reg, void *val, size_t len) 
	return 0;

}



static int tps6598x_block_write(struct tps6598x *tps, u8 reg,

				void *val, size_t len)

{

	u8 data[TPS_MAX_LEN + 1];



	if (!tps->i2c_protocol)

		return regmap_raw_write(tps->regmap, reg, val, len);



	data[0] = len;

	memcpy(&data[1], val, len);



	return regmap_raw_write(tps->regmap, reg, data, sizeof(data));

}



static inline int tps6598x_read16(struct tps6598x *tps, u8 reg, u16 *val)

{

	return tps6598x_block_read(tps, reg, val, sizeof(u16));
@@ -143,23 +157,23 @@ static inline int tps6598x_read64(struct tps6598x *tps, u8 reg, u64 *val) 


static inline int tps6598x_write16(struct tps6598x *tps, u8 reg, u16 val)

{

	return regmap_raw_write(tps->regmap, reg, &val, sizeof(u16));

	return tps6598x_block_write(tps, reg, &val, sizeof(u16));

}



static inline int tps6598x_write32(struct tps6598x *tps, u8 reg, u32 val)

{

	return regmap_raw_write(tps->regmap, reg, &val, sizeof(u32));

	return tps6598x_block_write(tps, reg, &val, sizeof(u32));

}



static inline int tps6598x_write64(struct tps6598x *tps, u8 reg, u64 val)

{

	return regmap_raw_write(tps->regmap, reg, &val, sizeof(u64));

	return tps6598x_block_write(tps, reg, &val, sizeof(u64));

}



static inline int

tps6598x_write_4cc(struct tps6598x *tps, u8 reg, const char *val)

{

	return regmap_raw_write(tps->regmap, reg, &val, sizeof(u32));

	return tps6598x_block_write(tps, reg, &val, sizeof(u32));

}



static int tps6598x_read_partner_identity(struct tps6598x *tps)
@@ -245,7 +259,7 @@ static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd, 
		return -EBUSY;



	if (in_len) {

		ret = regmap_raw_write(tps->regmap, TPS_REG_DATA1,

		ret = tps6598x_block_write(tps, TPS_REG_DATA1,

					   in_data, in_len);

		if (ret)

			return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE