drm/i915: rearrange DP AUX register macros

Follow the recommended style for grouping register macros.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8ace710d8a1edac7e1af1ed12122fb6bc68114e9.1716894910.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_regs.h b/drivers/gpu/drm/i915/display/intel_dp_aux_regs.h
index e642445364d27e3fa3a48ef2077ca21e715dee41..a438f6003ce47f518b2dddc8e3852c123c29c7a7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_aux_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux_regs.h
@@ -23,12 +23,13 @@
 
 #define _DPA_AUX_CH_CTL                        0x64010
 #define _DPB_AUX_CH_CTL                        0x64110
-#define _XELPDP_USBC1_AUX_CH_CTL       0x16f210
-#define _XELPDP_USBC2_AUX_CH_CTL       0x16f410
 #define DP_AUX_CH_CTL(aux_ch)          _MMIO_PORT(aux_ch, _DPA_AUX_CH_CTL,     \
                                                   _DPB_AUX_CH_CTL)
 #define VLV_DP_AUX_CH_CTL(aux_ch)      _MMIO(VLV_DISPLAY_BASE + \
                                              _PORT(aux_ch, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL))
+
+#define _XELPDP_USBC1_AUX_CH_CTL       0x16f210
+#define _XELPDP_USBC2_AUX_CH_CTL       0x16f410
 #define _XELPDP_DP_AUX_CH_CTL(aux_ch)                                          \
                _MMIO(_PICK_EVEN_2RANGES(aux_ch, AUX_CH_USBC1,                  \
                                         _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL,      \
@@ -72,12 +73,13 @@
 
 #define _DPA_AUX_CH_DATA1              0x64014
 #define _DPB_AUX_CH_DATA1              0x64114
-#define _XELPDP_USBC1_AUX_CH_DATA1     0x16f214
-#define _XELPDP_USBC2_AUX_CH_DATA1     0x16f414
 #define DP_AUX_CH_DATA(aux_ch, i)      _MMIO(_PORT(aux_ch, _DPA_AUX_CH_DATA1,  \
                                                    _DPB_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
 #define VLV_DP_AUX_CH_DATA(aux_ch, i)  _MMIO(VLV_DISPLAY_BASE + _PORT(aux_ch, _DPA_AUX_CH_DATA1, \
                                                                       _DPB_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
+
+#define _XELPDP_USBC1_AUX_CH_DATA1     0x16f214
+#define _XELPDP_USBC2_AUX_CH_DATA1     0x16f414
 #define _XELPDP_DP_AUX_CH_DATA(aux_ch, i)                                      \
                _MMIO(_PICK_EVEN_2RANGES(aux_ch, AUX_CH_USBC1,                  \
                                         _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1,  \