Commit 195baa06 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

drm/i915: Rename BXT PORTA HPD defines

The PORTA HPD defines are not BXT specific. They also exist on SPT,
and partially already on LPT:LP.
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c2699524
...@@ -1250,7 +1250,7 @@ static bool bxt_port_hotplug_long_detect(enum port port, u32 val) ...@@ -1250,7 +1250,7 @@ static bool bxt_port_hotplug_long_detect(enum port port, u32 val)
{ {
switch (port) { switch (port) {
case PORT_A: case PORT_A:
return val & BXT_PORTA_HOTPLUG_LONG_DETECT; return val & PORTA_HOTPLUG_LONG_DETECT;
case PORT_B: case PORT_B:
return val & PORTB_HOTPLUG_LONG_DETECT; return val & PORTB_HOTPLUG_LONG_DETECT;
case PORT_C: case PORT_C:
......
...@@ -6033,11 +6033,11 @@ enum skl_disp_power_wells { ...@@ -6033,11 +6033,11 @@ enum skl_disp_power_wells {
/* digital port hotplug */ /* digital port hotplug */
#define PCH_PORT_HOTPLUG 0xc4030 /* SHOTPLUG_CTL */ #define PCH_PORT_HOTPLUG 0xc4030 /* SHOTPLUG_CTL */
#define BXT_PORTA_HOTPLUG_ENABLE (1 << 28) #define PORTA_HOTPLUG_ENABLE (1 << 28) /* LPT:LP+ & BXT */
#define BXT_PORTA_HOTPLUG_STATUS_MASK (3 << 24) #define PORTA_HOTPLUG_STATUS_MASK (3 << 24) /* SPT+ & BXT */
#define BXT_PORTA_HOTPLUG_NO_DETECT (0 << 24) #define PORTA_HOTPLUG_NO_DETECT (0 << 24) /* SPT+ & BXT */
#define BXT_PORTA_HOTPLUG_SHORT_DETECT (1 << 24) #define PORTA_HOTPLUG_SHORT_DETECT (1 << 24) /* SPT+ & BXT */
#define BXT_PORTA_HOTPLUG_LONG_DETECT (2 << 24) #define PORTA_HOTPLUG_LONG_DETECT (2 << 24) /* SPT+ & BXT */
#define PORTD_HOTPLUG_ENABLE (1 << 20) #define PORTD_HOTPLUG_ENABLE (1 << 20)
#define PORTD_PULSE_DURATION_2ms (0 << 18) /* pre-LPT */ #define PORTD_PULSE_DURATION_2ms (0 << 18) /* pre-LPT */
#define PORTD_PULSE_DURATION_4_5ms (1 << 18) /* pre-LPT */ #define PORTD_PULSE_DURATION_4_5ms (1 << 18) /* pre-LPT */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment