Skip to content

Commit 707df33

Browse files
committed
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
2 parents 0d8d44d + d51adf0 commit 707df33

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

drivers/media/cec/i2c/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ config CEC_CH7322
1616

1717
config CEC_NXP_TDA9950
1818
tristate "NXP Semiconductors TDA9950/TDA998X HDMI CEC"
19+
depends on I2C
1920
select CEC_NOTIFIER
2021
select CEC_CORE
2122
default DRM_I2C_NXP_TDA998X

drivers/media/i2c/Kconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,8 +1149,11 @@ config VIDEO_ISL7998X
11491149

11501150
config VIDEO_LT6911UXE
11511151
tristate "Lontium LT6911UXE decoder"
1152-
depends on ACPI && VIDEO_DEV
1152+
depends on ACPI && VIDEO_DEV && I2C
11531153
select V4L2_FWNODE
1154+
select V4L2_CCI_I2C
1155+
select MEDIA_CONTROLLER
1156+
select VIDEO_V4L2_SUBDEV_API
11541157
help
11551158
This is a Video4Linux2 sensor-level driver for the Lontium
11561159
LT6911UXE HDMI to MIPI CSI-2 bridge.

drivers/media/platform/synopsys/hdmirx/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
config VIDEO_SYNOPSYS_HDMIRX
44
tristate "Synopsys DesignWare HDMI Receiver driver"
5+
depends on ARCH_ROCKCHIP || COMPILE_TEST
56
depends on VIDEO_DEV
67
select MEDIA_CONTROLLER
78
select VIDEO_V4L2_SUBDEV_API

drivers/media/test-drivers/vivid/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ config VIDEO_VIVID_CEC
3232

3333
config VIDEO_VIVID_OSD
3434
bool "Enable Framebuffer for testing Output Overlay"
35-
depends on VIDEO_VIVID && FB
35+
depends on VIDEO_VIVID && FB_CORE
36+
depends on VIDEO_VIVID=m || FB_CORE=y
3637
default y
3738
select FB_IOMEM_HELPERS
3839
help

0 commit comments

Comments
 (0)