Commit 0c3f3a83 authored by Easwar Hariharan's avatar Easwar Hariharan Committed by Thomas Zimmermann
Browse files

drm/gma500: 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.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarEaswar Hariharan <eahariha@linux.microsoft.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240711052734.1273652-3-eahariha@linux.microsoft.com
parent 61671d85

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
			dev->dev, "I2C bus registration failed.\n");

		goto err_encoder_cleanup;

	}

	gma_encoder->i2c_bus->slave_addr = 0x2C;

	gma_encoder->i2c_bus->target_addr = 0x2C;

	dev_priv->lvds_i2c_bus = gma_encoder->i2c_bus;



	/*

drivers/gpu/drm/gma500/intel_bios.c

+11 −11
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include "psb_intel_drv.h"

#include "psb_intel_reg.h"



#define	SLAVE_ADDR1	0x70

#define	SLAVE_ADDR2	0x72

#define	TARGET_ADDR1	0x70

#define	TARGET_ADDR2	0x72



static void *find_section(struct bdb_header *bdb, int section_id)

{
@@ -357,10 +357,10 @@ parse_sdvo_device_mapping(struct drm_psb_private *dev_priv, 
			/* skip the device block if device type is invalid */

			continue;

		}

		if (p_child->slave_addr != SLAVE_ADDR1 &&

			p_child->slave_addr != SLAVE_ADDR2) {

		if (p_child->target_addr != TARGET_ADDR1 &&

			p_child->target_addr != TARGET_ADDR2) {

			/*

			 * If the slave address is neither 0x70 nor 0x72,

			 * If the target address is neither 0x70 nor 0x72,

			 * it is not a SDVO device. Skip it.

			 */

			continue;
@@ -371,22 +371,22 @@ parse_sdvo_device_mapping(struct drm_psb_private *dev_priv, 
			DRM_DEBUG_KMS("Incorrect SDVO port. Skip it\n");

			continue;

		}

		DRM_DEBUG_KMS("the SDVO device with slave addr %2x is found on"

		DRM_DEBUG_KMS("the SDVO device with target addr %2x is found on"

				" %s port\n",

				p_child->slave_addr,

				p_child->target_addr,

				(p_child->dvo_port == DEVICE_PORT_DVOB) ?

					"SDVOB" : "SDVOC");

		p_mapping = &(dev_priv->sdvo_mappings[p_child->dvo_port - 1]);

		if (!p_mapping->initialized) {

			p_mapping->dvo_port = p_child->dvo_port;

			p_mapping->slave_addr = p_child->slave_addr;

			p_mapping->target_addr = p_child->target_addr;

			p_mapping->dvo_wiring = p_child->dvo_wiring;

			p_mapping->ddc_pin = p_child->ddc_pin;

			p_mapping->i2c_pin = p_child->i2c_pin;

			p_mapping->initialized = 1;

			DRM_DEBUG_KMS("SDVO device: dvo=%x, addr=%x, wiring=%d, ddc_pin=%d, i2c_pin=%d\n",

				      p_mapping->dvo_port,

				      p_mapping->slave_addr,

				      p_mapping->target_addr,

				      p_mapping->dvo_wiring,

				      p_mapping->ddc_pin,

				      p_mapping->i2c_pin);
@@ -394,10 +394,10 @@ parse_sdvo_device_mapping(struct drm_psb_private *dev_priv, 
			DRM_DEBUG_KMS("Maybe one SDVO port is shared by "

					 "two SDVO device.\n");

		}

		if (p_child->slave2_addr) {

		if (p_child->target2_addr) {

			/* Maybe this is a SDVO device with multiple inputs */

			/* And the mapping info is not added */

			DRM_DEBUG_KMS("there exists the slave2_addr. Maybe this"

			DRM_DEBUG_KMS("there exists the target2_addr. Maybe this"

				" is a SDVO device with multiple inputs.\n");

		}

		count++;

drivers/gpu/drm/gma500/intel_bios.h

+2 −2
Original line number Diff line number Diff line
@@ -186,13 +186,13 @@ struct child_device_config { 
	u16 addin_offset;

	u8  dvo_port; /* See Device_PORT_* above */

	u8  i2c_pin;

	u8  slave_addr;

	u8  target_addr;

	u8  ddc_pin;

	u16 edid_ptr;

	u8  dvo_cfg; /* See DEVICE_CFG_* above */

	u8  dvo2_port;

	u8  i2c2_pin;

	u8  slave2_addr;

	u8  target2_addr;

	u8  ddc2_pin;

	u8  capabilities;

	u8  dvo_wiring;/* See DEVICE_WIRE_* above */

drivers/gpu/drm/gma500/intel_gmbus.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ gmbus_xfer(struct i2c_adapter *adapter, 
clear_err:

	/* Toggle the Software Clear Interrupt bit. This has the effect

	 * of resetting the GMBUS controller and so clearing the

	 * BUS_ERROR raised by the slave's NAK.

	 * BUS_ERROR raised by the target's NAK.

	 */

	GMBUS_REG_WRITE(GMBUS1 + reg_offset, GMBUS_SW_CLR_INT);

	GMBUS_REG_WRITE(GMBUS1 + reg_offset, 0);

drivers/gpu/drm/gma500/psb_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ struct psb_intel_opregion { 
struct sdvo_device_mapping {

	u8 initialized;

	u8 dvo_port;

	u8 slave_addr;

	u8 target_addr;

	u8 dvo_wiring;

	u8 i2c_pin;

	u8 i2c_speed;