openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jani Nikula 2015-03-27 00:20:19 +02:00 committed by Daniel Vetter
parent dbe4646d6e
commit 988c70156c
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_drv.h
View File

@ -3067,7 +3067,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
extern void intel_teardown_gmbus(struct drm_device *dev); extern void intel_teardown_gmbus(struct drm_device *dev);
static inline bool intel_gmbus_is_port_valid(unsigned port) 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( extern struct i2c_adapter *intel_gmbus_get_adapter(

20
drivers/gpu/drm/i915/i915_reg.h
View File

@ -1788,16 +1788,16 @@ enum skl_disp_power_wells {
#define GMBUS_RATE_400KHZ (2<<8) /* reserved on Pineview */ #define GMBUS_RATE_400KHZ (2<<8) /* reserved on Pineview */
#define GMBUS_RATE_1MHZ (3<<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_HOLD_EXT (1<<7) /* 300ns hold time, rsvd on Pineview */
#define GMBUS_PORT_DISABLED 0 #define GMBUS_PIN_DISABLED 0
#define GMBUS_PORT_SSC 1 #define GMBUS_PIN_SSC 1
#define GMBUS_PORT_VGADDC 2 #define GMBUS_PIN_VGADDC 2
#define GMBUS_PORT_PANEL 3 #define GMBUS_PIN_PANEL 3
#define GMBUS_PORT_DPD_CHV 3 /* HDMID_CHV */ #define GMBUS_PIN_DPD_CHV 3 /* HDMID_CHV */
#define GMBUS_PORT_DPC 4 /* HDMIC */ #define GMBUS_PIN_DPC 4 /* HDMIC */
#define GMBUS_PORT_DPB 5 /* SDVO, HDMIB */ #define GMBUS_PIN_DPB 5 /* SDVO, HDMIB */
#define GMBUS_PORT_DPD 6 /* HDMID */ #define GMBUS_PIN_DPD 6 /* HDMID */
#define GMBUS_PORT_RESERVED 7 /* 7 reserved */ #define GMBUS_PIN_RESERVED 7 /* 7 reserved */
#define GMBUS_NUM_PORTS (GMBUS_PORT_DPD - GMBUS_PORT_SSC + 1) #define GMBUS_NUM_PORTS (GMBUS_PIN_DPD - GMBUS_PIN_SSC + 1)
#define GMBUS1 0x5104 /* command/status */ #define GMBUS1 0x5104 /* command/status */
#define GMBUS_SW_CLR_INT (1<<31) #define GMBUS_SW_CLR_INT (1<<31)
#define GMBUS_SW_RDY (1<<30) #define GMBUS_SW_RDY (1<<30)

2
drivers/gpu/drm/i915/intel_bios.c
View File

@ -1133,7 +1133,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
struct drm_device *dev = dev_priv->dev; struct drm_device *dev = dev_priv->dev;
enum port port; 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 */ /* Default to having backlight */
dev_priv->vbt.backlight.present = true; dev_priv->vbt.backlight.present = true;

2
drivers/gpu/drm/i915/intel_crt.c
View File

@ -747,7 +747,7 @@ static int intel_crt_get_modes(struct drm_connector *connector)
goto out; goto out;
/* Try to probe digital port for output in DVI-I -> VGA mode. */ /* 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); ret = intel_crt_ddc_get_modes(connector, i2c);
out: out:

8
drivers/gpu/drm/i915/intel_dvo.c
View File

@ -80,7 +80,7 @@ static const struct intel_dvo_device intel_dvo_devices[] = {
.name = "ch7017", .name = "ch7017",
.dvo_reg = DVOC, .dvo_reg = DVOC,
.slave_addr = 0x75, .slave_addr = 0x75,
.gpio = GMBUS_PORT_DPB, .gpio = GMBUS_PIN_DPB,
.dev_ops = &ch7017_ops, .dev_ops = &ch7017_ops,
}, },
{ {
@ -364,7 +364,7 @@ static int intel_dvo_get_modes(struct drm_connector *connector)
* that's not the case. * that's not the case.
*/ */
intel_ddc_get_modes(connector, 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)) if (!list_empty(&connector->probed_modes))
return 1; return 1;
@ -505,9 +505,9 @@ void intel_dvo_init(struct drm_device *dev)
if (intel_gmbus_is_port_valid(dvo->gpio)) if (intel_gmbus_is_port_valid(dvo->gpio))
gpio = dvo->gpio; gpio = dvo->gpio;
else if (dvo->type == INTEL_DVO_CHIP_LVDS) else if (dvo->type == INTEL_DVO_CHIP_LVDS)
gpio = GMBUS_PORT_SSC; gpio = GMBUS_PIN_SSC;
else else
gpio = GMBUS_PORT_DPB; gpio = GMBUS_PIN_DPB;
/* Set up the I2C bus necessary for the chip we're probing. /* Set up the I2C bus necessary for the chip we're probing.
* It appears that everything is on GPIOE except for panels * It appears that everything is on GPIOE except for panels

8
drivers/gpu/drm/i915/intel_hdmi.c
View File

@ -1681,18 +1681,18 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
switch (port) { switch (port) {
case PORT_B: case PORT_B:
intel_hdmi->ddc_bus = GMBUS_PORT_DPB; intel_hdmi->ddc_bus = GMBUS_PIN_DPB;
intel_encoder->hpd_pin = HPD_PORT_B; intel_encoder->hpd_pin = HPD_PORT_B;
break; break;
case PORT_C: case PORT_C:
intel_hdmi->ddc_bus = GMBUS_PORT_DPC; intel_hdmi->ddc_bus = GMBUS_PIN_DPC;
intel_encoder->hpd_pin = HPD_PORT_C; intel_encoder->hpd_pin = HPD_PORT_C;
break; break;
case PORT_D: case PORT_D:
if (IS_CHERRYVIEW(dev)) if (IS_CHERRYVIEW(dev))
intel_hdmi->ddc_bus = GMBUS_PORT_DPD_CHV; intel_hdmi->ddc_bus = GMBUS_PIN_DPD_CHV;
else else
intel_hdmi->ddc_bus = GMBUS_PORT_DPD; intel_hdmi->ddc_bus = GMBUS_PIN_DPD;
intel_encoder->hpd_pin = HPD_PORT_D; intel_encoder->hpd_pin = HPD_PORT_D;
break; break;
case PORT_A: case PORT_A:

2
drivers/gpu/drm/i915/intel_lvds.c
View File

@ -921,7 +921,7 @@ void intel_lvds_init(struct drm_device *dev)
if (dmi_check_system(intel_no_lvds)) if (dmi_check_system(intel_no_lvds))
return; return;
pin = GMBUS_PORT_PANEL; pin = GMBUS_PIN_PANEL;
if (!lvds_is_present_in_vbt(dev, &pin)) { if (!lvds_is_present_in_vbt(dev, &pin)) {
DRM_DEBUG_KMS("LVDS is not present in VBT\n"); DRM_DEBUG_KMS("LVDS is not present in VBT\n");
return; return;

2
drivers/gpu/drm/i915/intel_sdvo.c
View File

@ -2294,7 +2294,7 @@ intel_sdvo_select_i2c_bus(struct drm_i915_private *dev_priv,
if (mapping->initialized && intel_gmbus_is_port_valid(mapping->i2c_pin)) if (mapping->initialized && intel_gmbus_is_port_valid(mapping->i2c_pin))
pin = mapping->i2c_pin; pin = mapping->i2c_pin;
else else
pin = GMBUS_PORT_DPB; pin = GMBUS_PIN_DPB;
sdvo->i2c = intel_gmbus_get_adapter(dev_priv, pin); sdvo->i2c = intel_gmbus_get_adapter(dev_priv, pin);