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

drm: bridge: adv7511: Remove DRM_I2C_ADV7533 Kconfig

This commit remove DRM_I2C_ADV7533 resulting a simpler driver and less
choices in Kconfig.

Signed-off-by: Bogdan Togorean <bogdan.togorean@analog.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200121082719.27972-2-bogdan.togorean@analog.com

authored by

Bogdan Togorean and committed by
Neil Armstrong
b0730f56 06f749af

+3 -54
+2 -9
drivers/gpu/drm/bridge/adv7511/Kconfig
··· 4 4 depends on OF 5 5 select DRM_KMS_HELPER 6 6 select REGMAP_I2C 7 + select DRM_MIPI_DSI 7 8 help 8 - Support for the Analog Device ADV7511(W) and ADV7513 HDMI encoders. 9 + Support for the Analog Device ADV7511(W)/13/33 HDMI encoders. 9 10 10 11 config DRM_I2C_ADV7511_AUDIO 11 12 bool "ADV7511 HDMI Audio driver" ··· 15 14 help 16 15 Support the ADV7511 HDMI Audio interface. This is used in 17 16 conjunction with the AV7511 HDMI driver. 18 - 19 - config DRM_I2C_ADV7533 20 - bool "ADV7533 encoder" 21 - depends on DRM_I2C_ADV7511 22 - select DRM_MIPI_DSI 23 - default y 24 - help 25 - Support for the Analog Devices ADV7533 DSI to HDMI encoder. 26 17 27 18 config DRM_I2C_ADV7511_CEC 28 19 bool "ADV7511/33 HDMI CEC driver"
+1 -2
drivers/gpu/drm/bridge/adv7511/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - adv7511-y := adv7511_drv.o 2 + adv7511-y := adv7511_drv.o adv7533.o 3 3 adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o 4 4 adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o 5 - adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o 6 5 obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o
-39
drivers/gpu/drm/bridge/adv7511/adv7511.h
··· 393 393 } 394 394 #endif 395 395 396 - #ifdef CONFIG_DRM_I2C_ADV7533 397 396 void adv7533_dsi_power_on(struct adv7511 *adv); 398 397 void adv7533_dsi_power_off(struct adv7511 *adv); 399 398 void adv7533_mode_set(struct adv7511 *adv, const struct drm_display_mode *mode); ··· 401 402 int adv7533_attach_dsi(struct adv7511 *adv); 402 403 void adv7533_detach_dsi(struct adv7511 *adv); 403 404 int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv); 404 - #else 405 - static inline void adv7533_dsi_power_on(struct adv7511 *adv) 406 - { 407 - } 408 - 409 - static inline void adv7533_dsi_power_off(struct adv7511 *adv) 410 - { 411 - } 412 - 413 - static inline void adv7533_mode_set(struct adv7511 *adv, 414 - const struct drm_display_mode *mode) 415 - { 416 - } 417 - 418 - static inline int adv7533_patch_registers(struct adv7511 *adv) 419 - { 420 - return -ENODEV; 421 - } 422 - 423 - static inline int adv7533_patch_cec_registers(struct adv7511 *adv) 424 - { 425 - return -ENODEV; 426 - } 427 - 428 - static inline int adv7533_attach_dsi(struct adv7511 *adv) 429 - { 430 - return -ENODEV; 431 - } 432 - 433 - static inline void adv7533_detach_dsi(struct adv7511 *adv) 434 - { 435 - } 436 - 437 - static inline int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv) 438 - { 439 - return -ENODEV; 440 - } 441 - #endif 442 405 443 406 #ifdef CONFIG_DRM_I2C_ADV7511_AUDIO 444 407 int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511);
-4
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
··· 1266 1266 { "adv7511", ADV7511 }, 1267 1267 { "adv7511w", ADV7511 }, 1268 1268 { "adv7513", ADV7511 }, 1269 - #ifdef CONFIG_DRM_I2C_ADV7533 1270 1269 { "adv7533", ADV7533 }, 1271 - #endif 1272 1270 { } 1273 1271 }; 1274 1272 MODULE_DEVICE_TABLE(i2c, adv7511_i2c_ids); ··· 1275 1277 { .compatible = "adi,adv7511", .data = (void *)ADV7511 }, 1276 1278 { .compatible = "adi,adv7511w", .data = (void *)ADV7511 }, 1277 1279 { .compatible = "adi,adv7513", .data = (void *)ADV7511 }, 1278 - #ifdef CONFIG_DRM_I2C_ADV7533 1279 1280 { .compatible = "adi,adv7533", .data = (void *)ADV7533 }, 1280 - #endif 1281 1281 { } 1282 1282 }; 1283 1283 MODULE_DEVICE_TABLE(of, adv7511_of_ids);