Commit 08960b02 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: tegra-bpmp: convert to use new atomic callbacks 



The driver did handle this internally, convert it to use the new
callbacks.

Reviewed-by: default avatarTimo Alho <talho@nvidia.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 89f845a6

drivers/i2c/busses/i2c-tegra-bpmp.c

+20 −5
Original line number Diff line number Diff line
@@ -207,7 +207,8 @@ static int tegra_bpmp_i2c_msg_len_check(struct i2c_msg *msgs, unsigned int num) 


static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c,

				   struct mrq_i2c_request *request,

				   struct mrq_i2c_response *response)

				   struct mrq_i2c_response *response,

				   bool atomic)

{

	struct tegra_bpmp_message msg;

	int err;
@@ -222,7 +223,7 @@ static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c, 
	msg.rx.data = response;

	msg.rx.size = sizeof(*response);



	if (irqs_disabled())

	if (atomic)

		err = tegra_bpmp_transfer_atomic(i2c->bpmp, &msg);

	else

		err = tegra_bpmp_transfer(i2c->bpmp, &msg);
@@ -230,8 +231,9 @@ static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c, 
	return err;

}



static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter,

			       struct i2c_msg *msgs, int num)

static int tegra_bpmp_i2c_xfer_common(struct i2c_adapter *adapter,

				      struct i2c_msg *msgs, int num,

				      bool atomic)

{

	struct tegra_bpmp_i2c *i2c = i2c_get_adapdata(adapter);

	struct mrq_i2c_response response;
@@ -253,7 +255,7 @@ static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter, 
		return err;

	}



	err = tegra_bpmp_i2c_msg_xfer(i2c, &request, &response);

	err = tegra_bpmp_i2c_msg_xfer(i2c, &request, &response, atomic);

	if (err < 0) {

		dev_err(i2c->dev, "failed to transfer message: %d\n", err);

		return err;
@@ -268,6 +270,18 @@ static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter, 
	return num;

}



static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter,

			       struct i2c_msg *msgs, int num)

{

	return tegra_bpmp_i2c_xfer_common(adapter, msgs, num, false);

}



static int tegra_bpmp_i2c_xfer_atomic(struct i2c_adapter *adapter,

				      struct i2c_msg *msgs, int num)

{

	return tegra_bpmp_i2c_xfer_common(adapter, msgs, num, true);

}



static u32 tegra_bpmp_i2c_func(struct i2c_adapter *adapter)

{

	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR |
@@ -276,6 +290,7 @@ static u32 tegra_bpmp_i2c_func(struct i2c_adapter *adapter) 


static const struct i2c_algorithm tegra_bpmp_i2c_algo = {

	.master_xfer = tegra_bpmp_i2c_xfer,

	.master_xfer_atomic = tegra_bpmp_i2c_xfer_atomic,

	.functionality = tegra_bpmp_i2c_func,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE