diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2016-01-03 21:33:47 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2016-02-02 09:37:55 -0500 |
commit | 29ce4ed441d04a8931150f291c0f7d961690ab81 (patch) | |
tree | bebe7924f381df02d1fa6ba8f833f49304e8ae0d | |
parent | cd38a33750ace4300ef91b9ad668baf07c3bfd2b (diff) |
drm: adv7511: it's HPD, not HDP
Fix this typo, consequently used over both files :)
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Archit Taneja <architt@codeaurora.org>
-rw-r--r-- | drivers/gpu/drm/i2c/adv7511.c | 22 | ||||
-rw-r--r-- | drivers/gpu/drm/i2c/adv7511.h | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/drivers/gpu/drm/i2c/adv7511.c b/drivers/gpu/drm/i2c/adv7511.c index e1756a452d69..a02112ba1c3d 100644 --- a/drivers/gpu/drm/i2c/adv7511.c +++ b/drivers/gpu/drm/i2c/adv7511.c | |||
@@ -378,16 +378,16 @@ static void adv7511_power_on(struct adv7511 *adv7511) | |||
378 | } | 378 | } |
379 | 379 | ||
380 | /* | 380 | /* |
381 | * Per spec it is allowed to pulse the HDP signal to indicate that the | 381 | * Per spec it is allowed to pulse the HPD signal to indicate that the |
382 | * EDID information has changed. Some monitors do this when they wakeup | 382 | * EDID information has changed. Some monitors do this when they wakeup |
383 | * from standby or are enabled. When the HDP goes low the adv7511 is | 383 | * from standby or are enabled. When the HPD goes low the adv7511 is |
384 | * reset and the outputs are disabled which might cause the monitor to | 384 | * reset and the outputs are disabled which might cause the monitor to |
385 | * go to standby again. To avoid this we ignore the HDP pin for the | 385 | * go to standby again. To avoid this we ignore the HPD pin for the |
386 | * first few seconds after enabling the output. | 386 | * first few seconds after enabling the output. |
387 | */ | 387 | */ |
388 | regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2, | 388 | regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2, |
389 | ADV7511_REG_POWER2_HDP_SRC_MASK, | 389 | ADV7511_REG_POWER2_HPD_SRC_MASK, |
390 | ADV7511_REG_POWER2_HDP_SRC_NONE); | 390 | ADV7511_REG_POWER2_HPD_SRC_NONE); |
391 | 391 | ||
392 | /* | 392 | /* |
393 | * Most of the registers are reset during power down or when HPD is low. | 393 | * Most of the registers are reset during power down or when HPD is low. |
@@ -421,9 +421,9 @@ static bool adv7511_hpd(struct adv7511 *adv7511) | |||
421 | if (ret < 0) | 421 | if (ret < 0) |
422 | return false; | 422 | return false; |
423 | 423 | ||
424 | if (irq0 & ADV7511_INT0_HDP) { | 424 | if (irq0 & ADV7511_INT0_HPD) { |
425 | regmap_write(adv7511->regmap, ADV7511_REG_INT(0), | 425 | regmap_write(adv7511->regmap, ADV7511_REG_INT(0), |
426 | ADV7511_INT0_HDP); | 426 | ADV7511_INT0_HPD); |
427 | return true; | 427 | return true; |
428 | } | 428 | } |
429 | 429 | ||
@@ -446,7 +446,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511) | |||
446 | regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0); | 446 | regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0); |
447 | regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1); | 447 | regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1); |
448 | 448 | ||
449 | if (irq0 & ADV7511_INT0_HDP && adv7511->encoder) | 449 | if (irq0 & ADV7511_INT0_HPD && adv7511->encoder) |
450 | drm_helper_hpd_irq_event(adv7511->encoder->dev); | 450 | drm_helper_hpd_irq_event(adv7511->encoder->dev); |
451 | 451 | ||
452 | if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) { | 452 | if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) { |
@@ -648,10 +648,10 @@ adv7511_encoder_detect(struct drm_encoder *encoder, | |||
648 | if (adv7511->status == connector_status_connected) | 648 | if (adv7511->status == connector_status_connected) |
649 | status = connector_status_disconnected; | 649 | status = connector_status_disconnected; |
650 | } else { | 650 | } else { |
651 | /* Renable HDP sensing */ | 651 | /* Renable HPD sensing */ |
652 | regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2, | 652 | regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2, |
653 | ADV7511_REG_POWER2_HDP_SRC_MASK, | 653 | ADV7511_REG_POWER2_HPD_SRC_MASK, |
654 | ADV7511_REG_POWER2_HDP_SRC_BOTH); | 654 | ADV7511_REG_POWER2_HPD_SRC_BOTH); |
655 | } | 655 | } |
656 | 656 | ||
657 | adv7511->status = status; | 657 | adv7511->status = status; |
diff --git a/drivers/gpu/drm/i2c/adv7511.h b/drivers/gpu/drm/i2c/adv7511.h index 6599ed538426..38515b30cedf 100644 --- a/drivers/gpu/drm/i2c/adv7511.h +++ b/drivers/gpu/drm/i2c/adv7511.h | |||
@@ -90,7 +90,7 @@ | |||
90 | #define ADV7511_CSC_ENABLE BIT(7) | 90 | #define ADV7511_CSC_ENABLE BIT(7) |
91 | #define ADV7511_CSC_UPDATE_MODE BIT(5) | 91 | #define ADV7511_CSC_UPDATE_MODE BIT(5) |
92 | 92 | ||
93 | #define ADV7511_INT0_HDP BIT(7) | 93 | #define ADV7511_INT0_HPD BIT(7) |
94 | #define ADV7511_INT0_VSYNC BIT(5) | 94 | #define ADV7511_INT0_VSYNC BIT(5) |
95 | #define ADV7511_INT0_AUDIO_FIFO_FULL BIT(4) | 95 | #define ADV7511_INT0_AUDIO_FIFO_FULL BIT(4) |
96 | #define ADV7511_INT0_EDID_READY BIT(2) | 96 | #define ADV7511_INT0_EDID_READY BIT(2) |
@@ -157,11 +157,11 @@ | |||
157 | #define ADV7511_PACKET_ENABLE_SPARE2 BIT(1) | 157 | #define ADV7511_PACKET_ENABLE_SPARE2 BIT(1) |
158 | #define ADV7511_PACKET_ENABLE_SPARE1 BIT(0) | 158 | #define ADV7511_PACKET_ENABLE_SPARE1 BIT(0) |
159 | 159 | ||
160 | #define ADV7511_REG_POWER2_HDP_SRC_MASK 0xc0 | 160 | #define ADV7511_REG_POWER2_HPD_SRC_MASK 0xc0 |
161 | #define ADV7511_REG_POWER2_HDP_SRC_BOTH 0x00 | 161 | #define ADV7511_REG_POWER2_HPD_SRC_BOTH 0x00 |
162 | #define ADV7511_REG_POWER2_HDP_SRC_HDP 0x40 | 162 | #define ADV7511_REG_POWER2_HPD_SRC_HPD 0x40 |
163 | #define ADV7511_REG_POWER2_HDP_SRC_CEC 0x80 | 163 | #define ADV7511_REG_POWER2_HPD_SRC_CEC 0x80 |
164 | #define ADV7511_REG_POWER2_HDP_SRC_NONE 0xc0 | 164 | #define ADV7511_REG_POWER2_HPD_SRC_NONE 0xc0 |
165 | #define ADV7511_REG_POWER2_TDMS_ENABLE BIT(4) | 165 | #define ADV7511_REG_POWER2_TDMS_ENABLE BIT(4) |
166 | #define ADV7511_REG_POWER2_GATE_INPUT_CLK BIT(0) | 166 | #define ADV7511_REG_POWER2_GATE_INPUT_CLK BIT(0) |
167 | 167 | ||