Commit 707df337 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Some Kconfig dependency fixes"

* tag 'media/v6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: cec: tda9950: add back i2c dependency
  media: i2c: lt6911uxe: add two selects to Kconfig
  media: platform: synopsys: VIDEO_SYNOPSYS_HDMIRX should depend on ARCH_ROCKCHIP
  media: i2c: lt6911uxe: Fix Kconfig dependencies:
  media: vivid: fix FB dependency
parents 0d8d44db d51adf03

drivers/media/cec/i2c/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config CEC_CH7322 


config CEC_NXP_TDA9950

	tristate "NXP Semiconductors TDA9950/TDA998X HDMI CEC"

	depends on I2C

	select CEC_NOTIFIER

	select CEC_CORE

	default DRM_I2C_NXP_TDA998X

drivers/media/i2c/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -1149,8 +1149,11 @@ config VIDEO_ISL7998X 


config VIDEO_LT6911UXE

	tristate "Lontium LT6911UXE decoder"

	depends on ACPI && VIDEO_DEV

	depends on ACPI && VIDEO_DEV && I2C

	select V4L2_FWNODE

	select V4L2_CCI_I2C

	select MEDIA_CONTROLLER

	select VIDEO_V4L2_SUBDEV_API

	help

	  This is a Video4Linux2 sensor-level driver for the Lontium

	  LT6911UXE HDMI to MIPI CSI-2 bridge.

drivers/media/platform/synopsys/hdmirx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


config VIDEO_SYNOPSYS_HDMIRX

	tristate "Synopsys DesignWare HDMI Receiver driver"

	depends on ARCH_ROCKCHIP || COMPILE_TEST

	depends on VIDEO_DEV

	select MEDIA_CONTROLLER

	select VIDEO_V4L2_SUBDEV_API

drivers/media/test-drivers/vivid/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ config VIDEO_VIVID_CEC 


config VIDEO_VIVID_OSD

	bool "Enable Framebuffer for testing Output Overlay"

	depends on VIDEO_VIVID && FB

	depends on VIDEO_VIVID && FB_CORE

	depends on VIDEO_VIVID=m || FB_CORE=y

	default y

	select FB_IOMEM_HELPERS

	help