diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2021-06-20 12:16:11 +0000 |
|---|---|---|
| committer | Salvatore Bonaccorso <carnil@debian.org> | 2021-06-20 12:16:11 +0000 |
| commit | 4878dea1ffd939c8d62bc9cc549b159260572eb8 (patch) | |
| tree | 02f30c36447ba175f9c44529835b22634e03be85 | |
| parent | d5c75bcccb5365d3520f773694cefe7be961450a (diff) | |
| parent | 3fac361e95500d4fb45212a24f1c731545b64106 (diff) | |
| download | kernel_replicant_linux-4878dea1ffd939c8d62bc9cc549b159260572eb8.tar.gz kernel_replicant_linux-4878dea1ffd939c8d62bc9cc549b159260572eb8.tar.bz2 kernel_replicant_linux-4878dea1ffd939c8d62bc9cc549b159260572eb8.zip | |
Merge branch 's_pr_mx6_2' into 'sid'
[armhf] enable i.mx6 video capture device drivers
See merge request kernel-team/linux!367
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/config/armhf/config | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index f44a5ed63341..439e95b0a264 100644 --- a/debian/changelog +++ b/debian/changelog @@ -481,6 +481,11 @@ linux (5.10.45-1) UNRELEASED; urgency=medium [ Josua Mayer ] * [armhf] drivers/bluetooth: Enable BT_HCIUART as a module, with support for all features already enabled in the generic config. (Closes: #987361) + * [armhf] enable i.MX6 MIPI-CSI video capture device. (Closes: #987365) + - drivers/mux: Enable MUX_MMIO as a module. + - drivers/media/platform: Enable VIDEO_MUX as a module. + - drivers/staging/media/imx: Enable VIDEO_IMX_MEDIA and VIDEO_IMX_CSI as + modules. [ Uwe Kleine-König ] * [arm64] Update device tree for Kobol's helios64 from next diff --git a/debian/config/armhf/config b/debian/config/armhf/config index f0ae7fbfed36..c8f25acb69dd 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -661,6 +661,7 @@ CONFIG_MEDIA_CONTROLLER=y ## file: drivers/media/platform/Kconfig ## CONFIG_VIDEO_ASPEED=m +CONFIG_VIDEO_MUX=m CONFIG_VIDEO_OMAP3=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_IMX_PXP=m @@ -808,6 +809,11 @@ CONFIG_MTD_NAND_STM32_FMC2=m CONFIG_SPI_ASPEED_SMC=m ## +## file: drivers/mux/Kconfig +## +CONFIG_MUX_MMIO=m + +## ## file: drivers/net/can/Kconfig ## CONFIG_CAN_FLEXCAN=m @@ -1286,6 +1292,12 @@ CONFIG_SPI_SLAVE=y CONFIG_STAGING_MEDIA=y ## +## file: drivers/staging/media/imx/Kconfig +## +CONFIG_VIDEO_IMX_MEDIA=m +CONFIG_VIDEO_IMX_CSI=m + +## ## file: drivers/staging/media/sunxi/Kconfig ## CONFIG_VIDEO_SUNXI=y |