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

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

drivers/gpu/drm/i915/i915_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ static bool bxt_port_hotplug_long_detect(enum port port, u32 val) 
{

	switch (port) {

	case PORT_A:

		return val & BXT_PORTA_HOTPLUG_LONG_DETECT;

		return val & PORTA_HOTPLUG_LONG_DETECT;

	case PORT_B:

		return val & PORTB_HOTPLUG_LONG_DETECT;

	case PORT_C:

drivers/gpu/drm/i915/i915_reg.h

+5 −5
Original line number Diff line number Diff line
@@ -6033,11 +6033,11 @@ enum skl_disp_power_wells { 


/* digital port hotplug */

#define PCH_PORT_HOTPLUG		0xc4030	/* SHOTPLUG_CTL */

#define  BXT_PORTA_HOTPLUG_ENABLE	(1 << 28)

#define  BXT_PORTA_HOTPLUG_STATUS_MASK	(3 << 24)

#define  BXT_PORTA_HOTPLUG_NO_DETECT	(0 << 24)

#define  BXT_PORTA_HOTPLUG_SHORT_DETECT	(1 << 24)

#define  BXT_PORTA_HOTPLUG_LONG_DETECT	(2 << 24)

#define  PORTA_HOTPLUG_ENABLE		(1 << 28) /* LPT:LP+ & BXT */

#define  PORTA_HOTPLUG_STATUS_MASK	(3 << 24) /* SPT+ & BXT */

#define  PORTA_HOTPLUG_NO_DETECT	(0 << 24) /* SPT+ & BXT */

#define  PORTA_HOTPLUG_SHORT_DETECT	(1 << 24) /* SPT+ & BXT */

#define  PORTA_HOTPLUG_LONG_DETECT	(2 << 24) /* SPT+ & BXT */

#define  PORTD_HOTPLUG_ENABLE		(1 << 20)

#define  PORTD_PULSE_DURATION_2ms	(0 << 18) /* pre-LPT */

#define  PORTD_PULSE_DURATION_4_5ms	(1 << 18) /* pre-LPT */

CRA Git | Maintained and supported by SUSTech CRA and CCSE