Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -4
+6 -4
drivers/gpu/drm/i915/display/intel_dp_aux_regs.h
··· 23 23 24 24 #define _DPA_AUX_CH_CTL 0x64010 25 25 #define _DPB_AUX_CH_CTL 0x64110 26 - #define _XELPDP_USBC1_AUX_CH_CTL 0x16f210 27 - #define _XELPDP_USBC2_AUX_CH_CTL 0x16f410 28 26 #define DP_AUX_CH_CTL(aux_ch) _MMIO_PORT(aux_ch, _DPA_AUX_CH_CTL, \ 29 27 _DPB_AUX_CH_CTL) 30 28 #define VLV_DP_AUX_CH_CTL(aux_ch) _MMIO(VLV_DISPLAY_BASE + \ 31 29 _PORT(aux_ch, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)) 30 + 31 + #define _XELPDP_USBC1_AUX_CH_CTL 0x16f210 32 + #define _XELPDP_USBC2_AUX_CH_CTL 0x16f410 32 33 #define _XELPDP_DP_AUX_CH_CTL(aux_ch) \ 33 34 _MMIO(_PICK_EVEN_2RANGES(aux_ch, AUX_CH_USBC1, \ 34 35 _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL, \ ··· 73 72 74 73 #define _DPA_AUX_CH_DATA1 0x64014 75 74 #define _DPB_AUX_CH_DATA1 0x64114 76 - #define _XELPDP_USBC1_AUX_CH_DATA1 0x16f214 77 - #define _XELPDP_USBC2_AUX_CH_DATA1 0x16f414 78 75 #define DP_AUX_CH_DATA(aux_ch, i) _MMIO(_PORT(aux_ch, _DPA_AUX_CH_DATA1, \ 79 76 _DPB_AUX_CH_DATA1) + (i) * 4) /* 5 registers */ 80 77 #define VLV_DP_AUX_CH_DATA(aux_ch, i) _MMIO(VLV_DISPLAY_BASE + _PORT(aux_ch, _DPA_AUX_CH_DATA1, \ 81 78 _DPB_AUX_CH_DATA1) + (i) * 4) /* 5 registers */ 79 + 80 + #define _XELPDP_USBC1_AUX_CH_DATA1 0x16f214 81 + #define _XELPDP_USBC2_AUX_CH_DATA1 0x16f414 82 82 #define _XELPDP_DP_AUX_CH_DATA(aux_ch, i) \ 83 83 _MMIO(_PICK_EVEN_2RANGES(aux_ch, AUX_CH_USBC1, \ 84 84 _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1, \