From 8c5ef5ba6ef76386cf9adf217cb812386a0b28c8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 10 Jun 2024 19:30:48 +0200 Subject: [PATCH] Makefile: prefix ipu6 modules with icamera- instead of intel- Now that IPU6 isys support has landed upstream, using an auxbus approach rather then the custom ipu6-bus, there is a conflict between the mainline intel-ipu6* kernel modules and the out of tree ipu6-drivers intel-ipu6* kernel modules. Rename the out of tree ipu6 modules to icamera-ipu6* so that both can be installed together and the user can easily switch by blacklisting one of the 2 sets of modules. Signed-off-by: Hans de Goede --- drivers/media/pci/intel/ipu6/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/Makefile b/drivers/media/pci/intel/ipu6/Makefile index 23f8cdba47ae..92cd9fe1b52a 100644 --- a/drivers/media/pci/intel/ipu6/Makefile +++ b/drivers/media/pci/intel/ipu6/Makefile @@ -8,7 +8,7 @@ endif ccflags-y += -DIPU_TPG_FRAME_SYNC -DIPU_PSYS_GPC \ -DIPU_ISYS_GPC -intel-ipu6-objs += ../ipu.o \ +icamera-ipu6-objs += ../ipu.o \ ../ipu-bus.o \ ../ipu-dma.o \ ../ipu-mmu.o \ @@ -18,12 +18,12 @@ intel-ipu6-objs += ../ipu.o \ ipu6.o \ ../ipu-fw-com.o ifdef CONFIG_IPU_ISYS_BRIDGE -intel-ipu6-objs += ../cio2-bridge.o +icamera-ipu6-objs += ../cio2-bridge.o endif -obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6.o +obj-$(CONFIG_VIDEO_INTEL_IPU6) += icamera-ipu6.o -intel-ipu6-isys-objs += ../ipu-isys.o \ +icamera-ipu6-isys-objs += ../ipu-isys.o \ ../ipu-isys-csi2.o \ ipu6-isys.o \ ipu6-isys-phy.o \ @@ -36,26 +36,26 @@ intel-ipu6-isys-objs += ../ipu-isys.o \ ../ipu-isys-queue.o \ ../ipu-isys-subdev.o -obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6-isys.o +obj-$(CONFIG_VIDEO_INTEL_IPU6) += icamera-ipu6-isys.o -intel-ipu6-psys-objs += ../ipu-psys.o \ +icamera-ipu6-psys-objs += ../ipu-psys.o \ ipu6-psys.o \ ipu-resources.o \ ipu6-psys-gpc.o \ ipu6-l-scheduler.o \ ipu6-ppg.o -intel-ipu6-psys-objs += ipu-fw-resources.o \ +icamera-ipu6-psys-objs += ipu-fw-resources.o \ ipu6-fw-resources.o \ ipu6se-fw-resources.o \ ipu6ep-fw-resources.o \ ../ipu-fw-psys.o ifeq ($(CONFIG_COMPAT),y) -intel-ipu6-psys-objs += ../ipu-psys-compat32.o +icamera-ipu6-psys-objs += ../ipu-psys-compat32.o endif -obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6-psys.o +obj-$(CONFIG_VIDEO_INTEL_IPU6) += icamera-ipu6-psys.o ccflags-y += -I$(srcpath)/$(src)/../../../../../include/ ccflags-y += -I$(srcpath)/$(src)/../