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>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 83cda2786e556f01bbcf6f986d9a0f35cae43e43..dca3a4d32a11e8376cdb704f5765d10a18c5eae1 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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(

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b522eb6e59a486d2305aec3f2a7982473f322753..b6113c9a803b02dd77114dc67ff9b0463897c9ab 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -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)

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index c684085cb56ac0d3001ded0c81cbe72da4341a28..40c8375a4477185536560f7d7ffd5945873c4583 100644 (file)
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 6095a998bdac38d32bc2abb30f8d82ee4bbd7f36..fa5699c8452b0a01cb9761155aacb88b561676d0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -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:

diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index f2ed122615ae7ff50d5435b4bed4b6c381774956..447cdc76c960e712de95e2be1f12aad49d8f9ee6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -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

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index cacbafdad3abd300a02d2d35e22dcc9fd2de037f..26222e6c1ff34337ef66921873980192000873a5 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1681,18 +1681,18 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
 
        switch (port) {
        case PORT_B:
-               intel_hdmi->ddc_bus = GMBUS_PORT_DPB;
+               intel_hdmi->ddc_bus = GMBUS_PIN_DPB;
                intel_encoder->hpd_pin = HPD_PORT_B;
                break;
        case PORT_C:
-               intel_hdmi->ddc_bus = GMBUS_PORT_DPC;
+               intel_hdmi->ddc_bus = GMBUS_PIN_DPC;
                intel_encoder->hpd_pin = HPD_PORT_C;
                break;
        case PORT_D:
                if (IS_CHERRYVIEW(dev))
-                       intel_hdmi->ddc_bus = GMBUS_PORT_DPD_CHV;
+                       intel_hdmi->ddc_bus = GMBUS_PIN_DPD_CHV;
                else
-                       intel_hdmi->ddc_bus = GMBUS_PORT_DPD;
+                       intel_hdmi->ddc_bus = GMBUS_PIN_DPD;
                intel_encoder->hpd_pin = HPD_PORT_D;
                break;
        case PORT_A:

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 06d2da336f7c863d7ccff9438f2cc54487b4caa8..87591615264569cbda087762c5d41a2754f8b23a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -921,7 +921,7 @@ void intel_lvds_init(struct drm_device *dev)
        if (dmi_check_system(intel_no_lvds))
                return;
 
-       pin = GMBUS_PORT_PANEL;
+       pin = GMBUS_PIN_PANEL;
        if (!lvds_is_present_in_vbt(dev, &pin)) {
                DRM_DEBUG_KMS("LVDS is not present in VBT\n");
                return;

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index f5b7e1e7c5e039ffe53023fcb166c9fd9b5f6e76..3e0e9b0e350342a776d7994bea22169d9d33fca9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -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))
                pin = mapping->i2c_pin;
        else
-               pin = GMBUS_PORT_DPB;
+               pin = GMBUS_PIN_DPB;
 
        sdvo->i2c = intel_gmbus_get_adapter(dev_priv, pin);