aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2015-04-27 08:48:35 -0400
committerThierry Reding <treding@nvidia.com>2015-08-13 07:47:43 -0400
commit8fd3ffa902a0d9f282ffa80599970ff1c823b1a8 (patch)
treea116aa9be3741bcbe07fbf6f0eefd3f8c137303e
parent791ddb1e1cea14aa278580b3832cd0f10252aafa (diff)
drm/tegra: dc: Rename register for consistency
The horizontal pulse enable bits are named H_PULSE{0,1,2}_ENABLE in the TRM. Modify the driver to use the same naming for consistency. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/dc.h6
-rw-r--r--drivers/gpu/drm/tegra/hdmi.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h
index 5edae2653f09..87700bf60108 100644
--- a/drivers/gpu/drm/tegra/dc.h
+++ b/drivers/gpu/drm/tegra/dc.h
@@ -119,9 +119,9 @@
119#define DC_COM_CRC_CHECKSUM_LATCHED 0x329 119#define DC_COM_CRC_CHECKSUM_LATCHED 0x329
120 120
121#define DC_DISP_DISP_SIGNAL_OPTIONS0 0x400 121#define DC_DISP_DISP_SIGNAL_OPTIONS0 0x400
122#define H_PULSE_0_ENABLE (1 << 8) 122#define H_PULSE0_ENABLE (1 << 8)
123#define H_PULSE_1_ENABLE (1 << 10) 123#define H_PULSE1_ENABLE (1 << 10)
124#define H_PULSE_2_ENABLE (1 << 12) 124#define H_PULSE2_ENABLE (1 << 12)
125 125
126#define DC_DISP_DISP_SIGNAL_OPTIONS1 0x401 126#define DC_DISP_DISP_SIGNAL_OPTIONS1 0x401
127 127
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 06ab1783bba1..58f0cff65ff8 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -878,7 +878,7 @@ static void tegra_hdmi_encoder_mode_set(struct drm_encoder *encoder,
878 /* video_preamble uses h_pulse2 */ 878 /* video_preamble uses h_pulse2 */
879 pulse_start = 1 + h_sync_width + h_back_porch - 10; 879 pulse_start = 1 + h_sync_width + h_back_porch - 10;
880 880
881 tegra_dc_writel(dc, H_PULSE_2_ENABLE, DC_DISP_DISP_SIGNAL_OPTIONS0); 881 tegra_dc_writel(dc, H_PULSE2_ENABLE, DC_DISP_DISP_SIGNAL_OPTIONS0);
882 882
883 value = PULSE_MODE_NORMAL | PULSE_POLARITY_HIGH | PULSE_QUAL_VACTIVE | 883 value = PULSE_MODE_NORMAL | PULSE_POLARITY_HIGH | PULSE_QUAL_VACTIVE |
884 PULSE_LAST_END_A; 884 PULSE_LAST_END_A;