Commit 0057131f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: remove some file duplication and do more dir renames 



There are currently two identical copies of some files, one
at css_2401_csi2p_system/ and another one at css_2401_system/.

Get rid of one of them, moving the remaining files to the
directory with the shortest name.

While here, do more renames, in order to get smaller path
names.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent bbf3f782

drivers/staging/media/atomisp/Makefile

+17 −21
Original line number Diff line number Diff line
@@ -159,9 +159,9 @@ atomisp-objs += \ 
	pci/hive_isp_css_shared/host/tag.o \



obj-byt = \

	pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.o \

	pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.o \

	pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.o \

	pci/css_2400_system/hive/ia_css_isp_configs.o \

	pci/css_2400_system/hive/ia_css_isp_params.o \

	pci/css_2400_system/hive/ia_css_isp_states.o \

	pci/css_2400_system/spmem_dump.o \



# These will be needed when clean merge CHT support nicely into the driver
@@ -170,19 +170,15 @@ obj-byt = \ 


obj-cht = \

	pci/css_2401_system/spmem_dump.o \

	pci/css_2401_csi2p_system/spmem_dump.o \

	pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.o \

	pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.o \

	pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.o \

	pci/css_2401_csi2p_system/host/csi_rx.o \

	pci/css_2401_csi2p_system/host/ibuf_ctrl.o \

	pci/css_2401_csi2p_system/host/isys_dma.o \

	pci/css_2401_csi2p_system/host/isys_irq.o \

	pci/css_2401_csi2p_system/host/isys_stream2mmio.o



#	pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.o \

#	pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.o \

#	pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.o \

	pci/css_2401_system/spmem_dump.o \

	pci/css_2401_system/hive/ia_css_isp_configs.o \

	pci/css_2401_system/hive/ia_css_isp_params.o \

	pci/css_2401_system/hive/ia_css_isp_states.o \

	pci/css_2401_system/host/csi_rx.o \

	pci/css_2401_system/host/ibuf_ctrl.o \

	pci/css_2401_system/host/isys_dma.o \

	pci/css_2401_system/host/isys_irq.o \

	pci/css_2401_system/host/isys_stream2mmio.o



INCLUDES += \

	-I$(atomisp)/ \
@@ -320,14 +316,14 @@ INCLUDES += \ 


INCLUDES_byt += \

	-I$(atomisp)/pci/css_2400_system/ \

	-I$(atomisp)/pci/css_2400_system/hive_isp_css_2400_system_generated/ \

	-I$(atomisp)/pci/css_2400_system/hive/ \

	-I$(atomisp)/pci/css_2400_system/hrt/ \



INCLUDES_cht += \

	-I$(atomisp)/pci/css_2401_csi2p_system/ \

	-I$(atomisp)/pci/css_2401_csi2p_system/host/ \

	-I$(atomisp)/pci/css_2401_csi2p_system/hive_isp_css_2400_system_generated/ \

	-I$(atomisp)/pci/css_2401_csi2p_system/hrt/ \

	-I$(atomisp)/pci/css_2401_system/ \

	-I$(atomisp)/pci/css_2401_system/host/ \

	-I$(atomisp)/pci/css_2401_system/hive/ \

	-I$(atomisp)/pci/css_2401_system/hrt/ \



#	-I$(atomisp)/pci/css_2401_system/hrt/ \

#	-I$(atomisp)/pci/css_2401_system/hive_isp_css_2401_system_generated/ \

drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c→drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_configs.c

+0 −0

File moved.

View file

drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c→drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_params.c

+0 −0

File moved.

View file

drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c→drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_states.c

+0 −0

File moved.

View file

drivers/staging/media/atomisp/pci/css_2401_csi2p_system/spmem_dump.c

deleted100644 → 0
+0 −1965

File deleted.

Preview size limit exceeded, changes collapsed.