diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-31 07:47:21 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-31 07:47:21 +0300 |
commit | 8527e94216902cab5b483e2450db93c11109ff97 (patch) | |
tree | 7c09f3babead432991f69a7fe6f14a525d13ad0c /drivers/media/platform/sunxi/sun6i-csi/Kconfig | |
parent | 8127cac0f393abaddf5747bcc7e7ccf6668117fe (diff) | |
parent | 30a0b95b1335e12efef89dd78518ed3e4a71a763 (diff) | |
download | linux-8527e94216902cab5b483e2450db93c11109ff97.tar.xz |
Merge 6.1-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/platform/sunxi/sun6i-csi/Kconfig')
-rw-r--r-- | drivers/media/platform/sunxi/sun6i-csi/Kconfig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/sunxi/sun6i-csi/Kconfig index 0345901617d4..886006f6a48a 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/Kconfig +++ b/drivers/media/platform/sunxi/sun6i-csi/Kconfig @@ -1,13 +1,15 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_SUN6I_CSI - tristate "Allwinner V3s Camera Sensor Interface driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && COMMON_CLK && HAS_DMA + tristate "Allwinner A31 Camera Sensor Interface (CSI) Driver" + depends on V4L_PLATFORM_DRIVERS && VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST + depends on PM && COMMON_CLK && RESET_CONTROLLER && HAS_DMA select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEOBUF2_DMA_CONTIG - select REGMAP_MMIO select V4L2_FWNODE + select REGMAP_MMIO help - Support for the Allwinner Camera Sensor Interface Controller on V3s. + Support for the Allwinner A31 Camera Sensor Interface (CSI) + controller, also found on other platforms such as the A83T, H3, + V3/V3s or A64. |