drm: bridge: adv7511: Remove DRM_I2C_ADV7533 Kconfig (b0730f56) · Commits · 戴 / test

drivers/gpu/drm/bridge/adv7511/Kconfig

+2 −9

Original line number	Diff line number	Diff line
		@@ -4,8 +4,9 @@ config DRM_I2C_ADV7511
		depends on OF
		select DRM_KMS_HELPER
		select REGMAP_I2C
		select DRM_MIPI_DSI
		help
		Support for the Analog Device ADV7511(W) and ADV7513 HDMI encoders.
		Support for the Analog Device ADV7511(W)/13/33 HDMI encoders.

		config DRM_I2C_ADV7511_AUDIO
		bool "ADV7511 HDMI Audio driver"
		@@ -15,14 +16,6 @@ config DRM_I2C_ADV7511_AUDIO
		Support the ADV7511 HDMI Audio interface. This is used in
		conjunction with the AV7511 HDMI driver.

		config DRM_I2C_ADV7533
		bool "ADV7533 encoder"
		depends on DRM_I2C_ADV7511
		select DRM_MIPI_DSI
		default y
		help
		Support for the Analog Devices ADV7533 DSI to HDMI encoder.

		config DRM_I2C_ADV7511_CEC
		bool "ADV7511/33 HDMI CEC driver"
		depends on DRM_I2C_ADV7511

+1 −2

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		adv7511-y := adv7511_drv.o
		adv7511-y := adv7511_drv.o adv7533.o
		adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o
		adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o
		adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o
		obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o

+0 −39

Original line number	Diff line number	Diff line
		@@ -393,7 +393,6 @@ static inline int adv7511_cec_init(struct device dev, struct adv7511 adv7511)
		}
		#endif

		#ifdef CONFIG_DRM_I2C_ADV7533
		void adv7533_dsi_power_on(struct adv7511 *adv);
		void adv7533_dsi_power_off(struct adv7511 *adv);
		void adv7533_mode_set(struct adv7511 adv, const struct drm_display_mode mode);
		@@ -402,44 +401,6 @@ int adv7533_patch_cec_registers(struct adv7511 *adv);
		int adv7533_attach_dsi(struct adv7511 *adv);
		void adv7533_detach_dsi(struct adv7511 *adv);
		int adv7533_parse_dt(struct device_node np, struct adv7511 adv);
		#else
		static inline void adv7533_dsi_power_on(struct adv7511 *adv)
		{
		}

		static inline void adv7533_dsi_power_off(struct adv7511 *adv)
		{
		}

		static inline void adv7533_mode_set(struct adv7511 *adv,
		const struct drm_display_mode *mode)
		{
		}

		static inline int adv7533_patch_registers(struct adv7511 *adv)
		{
		return -ENODEV;
		}

		static inline int adv7533_patch_cec_registers(struct adv7511 *adv)
		{
		return -ENODEV;
		}

		static inline int adv7533_attach_dsi(struct adv7511 *adv)
		{
		return -ENODEV;
		}

		static inline void adv7533_detach_dsi(struct adv7511 *adv)
		{
		}

		static inline int adv7533_parse_dt(struct device_node np, struct adv7511 adv)
		{
		return -ENODEV;
		}
		#endif

		#ifdef CONFIG_DRM_I2C_ADV7511_AUDIO
		int adv7511_audio_init(struct device dev, struct adv7511 adv7511);

+0 −4

Original line number	Diff line number	Diff line
		@@ -1266,9 +1266,7 @@ static const struct i2c_device_id adv7511_i2c_ids[] = {
		{ "adv7511", ADV7511 },
		{ "adv7511w", ADV7511 },
		{ "adv7513", ADV7511 },
		#ifdef CONFIG_DRM_I2C_ADV7533
		{ "adv7533", ADV7533 },
		#endif
		{ }
		};
		MODULE_DEVICE_TABLE(i2c, adv7511_i2c_ids);
		@@ -1277,9 +1275,7 @@ static const struct of_device_id adv7511_of_ids[] = {
		{ .compatible = "adi,adv7511", .data = (void *)ADV7511 },
		{ .compatible = "adi,adv7511w", .data = (void *)ADV7511 },
		{ .compatible = "adi,adv7513", .data = (void *)ADV7511 },
		#ifdef CONFIG_DRM_I2C_ADV7533
		{ .compatible = "adi,adv7533", .data = (void *)ADV7533 },
		#endif
		{ }
		};
		MODULE_DEVICE_TABLE(of, adv7511_of_ids);