Commit bc3ca4d9 authored by Easwar Hariharan's avatar Easwar Hariharan Committed by Andi Shyti
Browse files

drm/i915: Make I2C terminology more inclusive 



I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave"
with more appropriate terms. Inspired by Wolfram's series to fix drivers/i2c/,
fix the terminology for users of I2C_ALGOBIT bitbanging interface, now that
the approved verbiage exists in the specification.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarZhi Wang <zhiwang@kernel.org>
Signed-off-by: default avatarEaswar Hariharan <eahariha@linux.microsoft.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240711052734.1273652-4-eahariha@linux.microsoft.com
parent f6f22012

drivers/gpu/drm/i915/display/dvo_ch7017.c

+7 −7
Original line number Diff line number Diff line
@@ -170,13 +170,13 @@ static bool ch7017_read(struct intel_dvo_device *dvo, u8 addr, u8 *val) 
{

	struct i2c_msg msgs[] = {

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = 0,

			.len = 1,

			.buf = &addr,

		},

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD,

			.len = 1,

			.buf = val,
@@ -189,7 +189,7 @@ static bool ch7017_write(struct intel_dvo_device *dvo, u8 addr, u8 val) 
{

	u8 buf[2] = { addr, val };

	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 2,

		.buf = buf,
@@ -197,7 +197,7 @@ static bool ch7017_write(struct intel_dvo_device *dvo, u8 addr, u8 val) 
	return i2c_transfer(dvo->i2c_bus, &msg, 1) == 1;

}



/** Probes for a CH7017 on the given bus and slave address. */

/** Probes for a CH7017 on the given bus and target address. */

static bool ch7017_init(struct intel_dvo_device *dvo,

			struct i2c_adapter *adapter)

{
@@ -227,13 +227,13 @@ static bool ch7017_init(struct intel_dvo_device *dvo, 
		break;

	default:

		DRM_DEBUG_KMS("ch701x not detected, got %d: from %s "

			      "slave %d.\n",

			      val, adapter->name, dvo->slave_addr);

			      "target %d.\n",

			      val, adapter->name, dvo->target_addr);

		goto fail;

	}



	DRM_DEBUG_KMS("%s detected on %s, addr %d\n",

		      str, adapter->name, dvo->slave_addr);

		      str, adapter->name, dvo->target_addr);

	return true;



fail:

drivers/gpu/drm/i915/display/dvo_ch7xxx.c

+9 −9
Original line number Diff line number Diff line
@@ -153,13 +153,13 @@ static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 


	struct i2c_msg msgs[] = {

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = 0,

			.len = 1,

			.buf = out_buf,

		},

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD,

			.len = 1,

			.buf = in_buf,
@@ -176,7 +176,7 @@ static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 


	if (!ch7xxx->quiet) {

		DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}

	return false;

}
@@ -188,7 +188,7 @@ static bool ch7xxx_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 
	struct i2c_adapter *adapter = dvo->i2c_bus;

	u8 out_buf[2];

	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 2,

		.buf = out_buf,
@@ -202,7 +202,7 @@ static bool ch7xxx_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 


	if (!ch7xxx->quiet) {

		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}



	return false;
@@ -229,8 +229,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, 


	name = ch7xxx_get_id(vendor);

	if (!name) {

		DRM_DEBUG_KMS("ch7xxx not detected; got VID 0x%02x from %s slave %d.\n",

			      vendor, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("ch7xxx not detected; got VID 0x%02x from %s target %d.\n",

			      vendor, adapter->name, dvo->target_addr);

		goto out;

	}
@@ -240,8 +240,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, 


	devid = ch7xxx_get_did(device);

	if (!devid) {

		DRM_DEBUG_KMS("ch7xxx not detected; got DID 0x%02x from %s slave %d.\n",

			      device, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("ch7xxx not detected; got DID 0x%02x from %s target %d.\n",

			      device, adapter->name, dvo->target_addr);

		goto out;

	}

drivers/gpu/drm/i915/display/dvo_ivch.c

+8 −8
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, u16 *data) 


	struct i2c_msg msgs[] = {

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD,

			.len = 0,

		},
@@ -209,7 +209,7 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, u16 *data) 
			.buf = out_buf,

		},

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD | I2C_M_NOSTART,

			.len = 2,

			.buf = in_buf,
@@ -226,7 +226,7 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, u16 *data) 
	if (!priv->quiet) {

		DRM_DEBUG_KMS("Unable to read register 0x%02x from "

				"%s:%02x.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}

	return false;

}
@@ -238,7 +238,7 @@ static bool ivch_write(struct intel_dvo_device *dvo, int addr, u16 data) 
	struct i2c_adapter *adapter = dvo->i2c_bus;

	u8 out_buf[3];

	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 3,

		.buf = out_buf,
@@ -253,13 +253,13 @@ static bool ivch_write(struct intel_dvo_device *dvo, int addr, u16 data) 


	if (!priv->quiet) {

		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}



	return false;

}



/* Probes the given bus and slave address for an ivch */

/* Probes the given bus and target address for an ivch */

static bool ivch_init(struct intel_dvo_device *dvo,

		      struct i2c_adapter *adapter)

{
@@ -283,10 +283,10 @@ static bool ivch_init(struct intel_dvo_device *dvo, 
	 * very unique, check that the value in the base address field matches

	 * the address it's responding on.

	 */

	if ((temp & VR00_BASE_ADDRESS_MASK) != dvo->slave_addr) {

	if ((temp & VR00_BASE_ADDRESS_MASK) != dvo->target_addr) {

		DRM_DEBUG_KMS("ivch detect failed due to address mismatch "

			  "(%d vs %d)\n",

			  (temp & VR00_BASE_ADDRESS_MASK), dvo->slave_addr);

			  (temp & VR00_BASE_ADDRESS_MASK), dvo->target_addr);

		goto out;

	}

drivers/gpu/drm/i915/display/dvo_ns2501.c

+9 −9
Original line number Diff line number Diff line
@@ -398,13 +398,13 @@ static bool ns2501_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 


	struct i2c_msg msgs[] = {

		{

		 .addr = dvo->slave_addr,

		 .addr = dvo->target_addr,

		 .flags = 0,

		 .len = 1,

		 .buf = out_buf,

		 },

		{

		 .addr = dvo->slave_addr,

		 .addr = dvo->target_addr,

		 .flags = I2C_M_RD,

		 .len = 1,

		 .buf = in_buf,
@@ -422,7 +422,7 @@ static bool ns2501_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 
	if (!ns->quiet) {

		DRM_DEBUG_KMS

		    ("Unable to read register 0x%02x from %s:0x%02x.\n", addr,

		     adapter->name, dvo->slave_addr);

		     adapter->name, dvo->target_addr);

	}



	return false;
@@ -441,7 +441,7 @@ static bool ns2501_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 
	u8 out_buf[2];



	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 2,

		.buf = out_buf,
@@ -456,7 +456,7 @@ static bool ns2501_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 


	if (!ns->quiet) {

		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d\n",

			      addr, adapter->name, dvo->slave_addr);

			      addr, adapter->name, dvo->target_addr);

	}



	return false;
@@ -487,8 +487,8 @@ static bool ns2501_init(struct intel_dvo_device *dvo, 
		goto out;



	if (ch != (NS2501_VID & 0xff)) {

		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Slave %d.\n",

			      ch, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Target %d.\n",

			      ch, adapter->name, dvo->target_addr);

		goto out;

	}
@@ -496,8 +496,8 @@ static bool ns2501_init(struct intel_dvo_device *dvo, 
		goto out;



	if (ch != (NS2501_DID & 0xff)) {

		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Slave %d.\n",

			      ch, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Target %d.\n",

			      ch, adapter->name, dvo->target_addr);

		goto out;

	}

	ns->quiet = false;

drivers/gpu/drm/i915/display/dvo_sil164.c

+9 −9
Original line number Diff line number Diff line
@@ -79,13 +79,13 @@ static bool sil164_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 


	struct i2c_msg msgs[] = {

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = 0,

			.len = 1,

			.buf = out_buf,

		},

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD,

			.len = 1,

			.buf = in_buf,
@@ -102,7 +102,7 @@ static bool sil164_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 


	if (!sil->quiet) {

		DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}

	return false;

}
@@ -113,7 +113,7 @@ static bool sil164_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 
	struct i2c_adapter *adapter = dvo->i2c_bus;

	u8 out_buf[2];

	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 2,

		.buf = out_buf,
@@ -127,7 +127,7 @@ static bool sil164_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 


	if (!sil->quiet) {

		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}



	return false;
@@ -153,8 +153,8 @@ static bool sil164_init(struct intel_dvo_device *dvo, 
		goto out;



	if (ch != (SIL164_VID & 0xff)) {

		DRM_DEBUG_KMS("sil164 not detected got %d: from %s Slave %d.\n",

			  ch, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("sil164 not detected got %d: from %s Target %d.\n",

			  ch, adapter->name, dvo->target_addr);

		goto out;

	}
@@ -162,8 +162,8 @@ static bool sil164_init(struct intel_dvo_device *dvo, 
		goto out;



	if (ch != (SIL164_DID & 0xff)) {

		DRM_DEBUG_KMS("sil164 not detected got %d: from %s Slave %d.\n",

			  ch, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("sil164 not detected got %d: from %s Target %d.\n",

			  ch, adapter->name, dvo->target_addr);

		goto out;

	}

	sil->quiet = false;