# SPDX-License-Identifier: GPL-2.0-only
 
 source "drivers/media/pci/intel/ipu3/Kconfig"
+source "drivers/media/pci/intel/ipu6/Kconfig"
 source "drivers/media/pci/intel/ivsc/Kconfig"
 
 config IPU_BRIDGE
 
--- /dev/null
+config VIDEO_INTEL_IPU6
+       tristate "Intel IPU6 driver"
+       depends on ACPI || COMPILE_TEST
+       depends on VIDEO_DEV
+       depends on X86 && X86_64 && HAS_DMA
+       select DMA_OPS
+       select IOMMU_IOVA
+       select VIDEO_V4L2_SUBDEV_API
+       select MEDIA_CONTROLLER
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_FWNODE
+       select IPU_BRIDGE
+       help
+         This is the 6th Gen Intel Image Processing Unit, found in Intel SoCs
+         and used for capturing images and video from camera sensors.
+
+         To compile this driver, say Y here! It contains 2 modules -
+         intel_ipu6 and intel_ipu6_isys.
 
--- /dev/null
+# SPDX-License-Identifier: GPL-2.0-only
+
+intel-ipu6-y                   := ipu6.o \
+                               ipu6-bus.o \
+                               ipu6-dma.o \
+                               ipu6-mmu.o \
+                               ipu6-buttress.o \
+                               ipu6-cpd.o \
+                               ipu6-fw-com.o
+
+obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6.o
+
+intel-ipu6-isys-y              := ipu6-isys.o \
+                               ipu6-isys-csi2.o \
+                               ipu6-fw-isys.o \
+                               ipu6-isys-video.o \
+                               ipu6-isys-queue.o \
+                               ipu6-isys-subdev.o \
+                               ipu6-isys-mcd-phy.o \
+                               ipu6-isys-jsl-phy.o \
+                               ipu6-isys-dwc-phy.o
+
+obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6-isys.o