Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 988c7015 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: rename GMBUS_PORT_* macros as GMBUS_PIN_* 



The specs refer to pin pairs. Start moving towards using pin rather than
port all around to avoid confusion. No functional changes.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dbe4646d

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -3067,7 +3067,7 @@ extern int intel_setup_gmbus(struct drm_device *dev); 
extern void intel_teardown_gmbus(struct drm_device *dev);

static inline bool intel_gmbus_is_port_valid(unsigned port)

{

	return (port >= GMBUS_PORT_SSC && port <= GMBUS_PORT_DPD);

	return (port >= GMBUS_PIN_SSC && port <= GMBUS_PIN_DPD);

}



extern struct i2c_adapter *intel_gmbus_get_adapter(

drivers/gpu/drm/i915/i915_reg.h

+10 −10
Original line number Diff line number Diff line
@@ -1788,16 +1788,16 @@ enum skl_disp_power_wells { 
#define   GMBUS_RATE_400KHZ	(2<<8) /* reserved on Pineview */

#define   GMBUS_RATE_1MHZ	(3<<8) /* reserved on Pineview */

#define   GMBUS_HOLD_EXT	(1<<7) /* 300ns hold time, rsvd on Pineview */

#define   GMBUS_PORT_DISABLED	0

#define   GMBUS_PORT_SSC	1

#define   GMBUS_PORT_VGADDC	2

#define   GMBUS_PORT_PANEL	3

#define   GMBUS_PORT_DPD_CHV	3 /* HDMID_CHV */

#define   GMBUS_PORT_DPC	4 /* HDMIC */

#define   GMBUS_PORT_DPB	5 /* SDVO, HDMIB */

#define   GMBUS_PORT_DPD	6 /* HDMID */

#define   GMBUS_PORT_RESERVED	7 /* 7 reserved */

#define   GMBUS_NUM_PORTS	(GMBUS_PORT_DPD - GMBUS_PORT_SSC + 1)

#define   GMBUS_PIN_DISABLED	0

#define   GMBUS_PIN_SSC		1

#define   GMBUS_PIN_VGADDC	2

#define   GMBUS_PIN_PANEL	3

#define   GMBUS_PIN_DPD_CHV	3 /* HDMID_CHV */

#define   GMBUS_PIN_DPC		4 /* HDMIC */

#define   GMBUS_PIN_DPB		5 /* SDVO, HDMIB */

#define   GMBUS_PIN_DPD		6 /* HDMID */

#define   GMBUS_PIN_RESERVED	7 /* 7 reserved */

#define   GMBUS_NUM_PORTS	(GMBUS_PIN_DPD - GMBUS_PIN_SSC + 1)

#define GMBUS1			0x5104 /* command/status */

#define   GMBUS_SW_CLR_INT	(1<<31)

#define   GMBUS_SW_RDY		(1<<30)

drivers/gpu/drm/i915/intel_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) 
	struct drm_device *dev = dev_priv->dev;

	enum port port;



	dev_priv->vbt.crt_ddc_pin = GMBUS_PORT_VGADDC;

	dev_priv->vbt.crt_ddc_pin = GMBUS_PIN_VGADDC;



	/* Default to having backlight */

	dev_priv->vbt.backlight.present = true;

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static int intel_crt_get_modes(struct drm_connector *connector) 
		goto out;



	/* Try to probe digital port for output in DVI-I -> VGA mode. */

	i2c = intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPB);

	i2c = intel_gmbus_get_adapter(dev_priv, GMBUS_PIN_DPB);

	ret = intel_crt_ddc_get_modes(connector, i2c);



out:

drivers/gpu/drm/i915/intel_dvo.c

+4 −4
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static const struct intel_dvo_device intel_dvo_devices[] = { 
		.name = "ch7017",

		.dvo_reg = DVOC,

		.slave_addr = 0x75,

		.gpio = GMBUS_PORT_DPB,

		.gpio = GMBUS_PIN_DPB,

		.dev_ops = &ch7017_ops,

	},

	{
@@ -364,7 +364,7 @@ static int intel_dvo_get_modes(struct drm_connector *connector) 
	 * that's not the case.

	 */

	intel_ddc_get_modes(connector,

			    intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPC));

			    intel_gmbus_get_adapter(dev_priv, GMBUS_PIN_DPC));

	if (!list_empty(&connector->probed_modes))

		return 1;
@@ -505,9 +505,9 @@ void intel_dvo_init(struct drm_device *dev) 
		if (intel_gmbus_is_port_valid(dvo->gpio))

			gpio = dvo->gpio;

		else if (dvo->type == INTEL_DVO_CHIP_LVDS)

			gpio = GMBUS_PORT_SSC;

			gpio = GMBUS_PIN_SSC;

		else

			gpio = GMBUS_PORT_DPB;

			gpio = GMBUS_PIN_DPB;



		/* Set up the I2C bus necessary for the chip we're probing.

		 * It appears that everything is on GPIOE except for panels