Skip to content

Commit 847ad2b

Browse files
committed
drm/display: Make DisplayPort CEC-over-AUX Kconfig name consistent
While most display helpers Kconfig symbols have the DRM_DISPLAY prefix, the DisplayPort CEC tunnelling implementation uses CONFIG_DRM_DISPLAY_DP_AUX_CEC. Since the number of users is limited, we can easily rename it to make it consistent. Reviewed-by: Jani Nikula <[email protected]> Reviewed-by: Lucas De Marchi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent 4d66d84 commit 847ad2b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

arch/parisc/configs/generic-32bit_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ CONFIG_PPDEV=m
131131
CONFIG_I2C=y
132132
CONFIG_HWMON=m
133133
CONFIG_DRM=m
134-
CONFIG_DRM_DP_CEC=y
134+
CONFIG_DRM_DISPLAY_DP_AUX_CEC=y
135135
# CONFIG_DRM_I2C_CH7006 is not set
136136
# CONFIG_DRM_I2C_SIL164 is not set
137137
CONFIG_DRM_RADEON=m

drivers/gpu/drm/display/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ config DRM_DISPLAY_DP_AUX_CHARDEV
5959
read and write values to arbitrary DPCD registers on the DP aux
6060
channel.
6161

62-
config DRM_DP_CEC
62+
config DRM_DISPLAY_DP_AUX_CEC
6363
bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"
6464
depends on DRM && DRM_DISPLAY_HELPER
6565
select DRM_DISPLAY_DP_HELPER

drivers/gpu/drm/display/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) += \
1515
drm_hdmi_helper.o \
1616
drm_scdc_helper.o
1717
drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
18-
drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
18+
drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_AUX_CEC) += drm_dp_cec.o
1919

2020
obj-$(CONFIG_DRM_DISPLAY_HELPER) += drm_display_helper.o

include/drm/display/drm_dp_helper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ static inline int drm_panel_dp_aux_backlight(struct drm_panel *panel,
733733

734734
#endif
735735

736-
#ifdef CONFIG_DRM_DP_CEC
736+
#ifdef CONFIG_DRM_DISPLAY_DP_AUX_CEC
737737
void drm_dp_cec_irq(struct drm_dp_aux *aux);
738738
void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
739739
struct drm_connector *connector);

0 commit comments

Comments
 (0)