media: atomisp: cleanup directory hierarchy

This driver has very long directories without a good
reason (IMHO). Let's drop two directories from such hierarchy,
in order to simplify things a little bit and make the dir
output a bit more readable.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/Kconfig b/drivers/staging/media/atomisp/Kconfig
index 397745ebcd568abeab4b9ecba30e244b83240c56..dce6dd9bd7e1bc6f9547fcf048f390f131854e05 100644 (file)
--- a/drivers/staging/media/atomisp/Kconfig
+++ b/drivers/staging/media/atomisp/Kconfig
@@ -1,5 +1,5 @@
 menuconfig INTEL_ATOMISP
-       bool "Enable support to Intel MIPI camera drivers"
+       bool "Enable support to Intel Atom ISP camera drivers"
        depends on X86 && EFI && PCI && ACPI
        select IOSF_MBI
        select MEDIA_CONTROLLER
@@ -8,7 +8,17 @@ menuconfig INTEL_ATOMISP
          Enable support for the Intel ISP2 camera interfaces and MIPI
          sensor drivers.
 
+config VIDEO_ATOMISP
+       tristate "Intel Atom Image Signal Processor Driver"
+       depends on VIDEO_V4L2 && INTEL_ATOMISP
+       select IOSF_MBI
+       select VIDEOBUF_VMALLOC
+       ---help---
+         Say Y here if your platform supports Intel Atom SoC
+         camera imaging subsystem.
+         To compile this driver as a module, choose M here: the
+         module will be called atomisp
+
 if INTEL_ATOMISP
-source "drivers/staging/media/atomisp/pci/Kconfig"
 source "drivers/staging/media/atomisp/i2c/Kconfig"
 endif

diff --git a/drivers/staging/media/atomisp/Makefile b/drivers/staging/media/atomisp/Makefile
index 403fe5edff6d406ee5ba8abc0cb771494cf368a9..f09554f2afcc72a4d5942f97104ec7981d74d70a 100644 (file)
--- a/drivers/staging/media/atomisp/Makefile
+++ b/drivers/staging/media/atomisp/Makefile
@@ -1,6 +1,352 @@
 #
 # Makefile for camera drivers.
 #
-obj-$(CONFIG_INTEL_ATOMISP) += pci/
 obj-$(CONFIG_INTEL_ATOMISP) += i2c/
 obj-$(CONFIG_INTEL_ATOMISP) += platform/
+obj-$(CONFIG_VIDEO_ATOMISP) += atomisp.o
+
+atomisp = $(srctree)/drivers/staging/media/atomisp/
+
+# SPDX-License-Identifier: GPL-2.0
+atomisp-objs += \
+       pci/atomisp_acc.o \
+       pci/atomisp_cmd.o \
+       pci/atomisp_compat_css20.o \
+       pci/atomisp_compat_ioctl32.o \
+       pci/atomisp_csi2.o \
+       pci/atomisp_drvfs.o \
+       pci/atomisp_file.o \
+       pci/atomisp_fops.o \
+       pci/atomisp_ioctl.o \
+       pci/atomisp_subdev.o \
+       pci/atomisp_tpg.o \
+       pci/atomisp_v4l2.o \
+       pci/sh_css_firmware.o \
+       pci/sh_css_host_data.o \
+       pci/sh_css_hrt.o \
+       pci/sh_css_metadata.o \
+       pci/sh_css_metrics.o \
+       pci/sh_css_mipi.o \
+       pci/sh_css_mmu.o \
+       pci/sh_css_morph.o \
+       pci/sh_css.o \
+       pci/sh_css_param_dvs.o \
+       pci/sh_css_param_shading.o \
+       pci/sh_css_params.o \
+       pci/sh_css_pipe.o \
+       pci/sh_css_properties.o \
+       pci/sh_css_shading.o \
+       pci/sh_css_sp.o \
+       pci/sh_css_stream_format.o \
+       pci/sh_css_stream.o \
+       pci/sh_css_version.o \
+       pci/base/circbuf/src/circbuf.o \
+       pci/base/refcount/src/refcount.o \
+       pci/camera/pipe/src/pipe_binarydesc.o \
+       pci/camera/pipe/src/pipe_stagedesc.o \
+       pci/camera/pipe/src/pipe_util.o \
+       pci/camera/util/src/util.o \
+       pci/hmm/hmm_bo.o \
+       pci/hmm/hmm_dynamic_pool.o \
+       pci/hmm/hmm.o \
+       pci/hmm/hmm_reserved_pool.o \
+       pci/hmm/hmm_vm.o \
+       pci/hrt/hive_isp_css_mm_hrt.o \
+       pci/ia_css_device_access.o \
+       pci/ia_css_memory_access.o \
+       pci/isp/kernels/aa/aa_2/ia_css_aa2.host.o \
+       pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.o \
+       pci/isp/kernels/anr/anr_2/ia_css_anr2.host.o \
+       pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.o \
+       pci/isp/kernels/bh/bh_2/ia_css_bh.host.o \
+       pci/isp/kernels/bnlm/ia_css_bnlm.host.o \
+       pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.o \
+       pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.o \
+       pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.o \
+       pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.o \
+       pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.o \
+       pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.o \
+       pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.o \
+       pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.o \
+       pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.o \
+       pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.o \
+       pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.o \
+       pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.o \
+       pci/isp/kernels/de/de_1.0/ia_css_de.host.o \
+       pci/isp/kernels/de/de_2/ia_css_de2.host.o \
+       pci/isp/kernels/dpc2/ia_css_dpc2.host.o \
+       pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.o \
+       pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.o \
+       pci/isp/kernels/eed1_8/ia_css_eed1_8.host.o \
+       pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.o \
+       pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.o \
+       pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.o \
+       pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.o \
+       pci/isp/kernels/gc/gc_2/ia_css_gc2.host.o \
+       pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.o \
+       pci/isp/kernels/hdr/ia_css_hdr.host.o \
+       pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.o \
+       pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.o \
+       pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.o \
+       pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.o \
+       pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.o \
+       pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.o \
+       pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.o \
+       pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.o \
+       pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.o \
+       pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.o \
+       pci/isp/kernels/ob/ob2/ia_css_ob2.host.o \
+       pci/isp/kernels/output/output_1.0/ia_css_output.host.o \
+       pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.o \
+       pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.o \
+       pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.o \
+       pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.o \
+       pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.o \
+       pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.o \
+       pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.o \
+       pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.o \
+       pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.o \
+       pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.o \
+       pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.o \
+       pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.o \
+       pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.o \
+       pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.o \
+       pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.o \
+       pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.o \
+       pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.o \
+       pci/memory_realloc.o \
+       pci/mmu/isp_mmu.o \
+       pci/mmu/sh_mmu_mrfld.o \
+       pci/runtime/binary/src/binary.o \
+       pci/runtime/bufq/src/bufq.o \
+       pci/runtime/debug/src/ia_css_debug.o \
+       pci/runtime/eventq/src/eventq.o \
+       pci/runtime/event/src/event.o \
+       pci/runtime/frame/src/frame.o \
+       pci/runtime/ifmtr/src/ifmtr.o \
+       pci/runtime/inputfifo/src/inputfifo.o \
+       pci/runtime/isp_param/src/isp_param.o \
+       pci/runtime/isys/src/csi_rx_rmgr.o \
+       pci/runtime/isys/src/ibuf_ctrl_rmgr.o \
+       pci/runtime/isys/src/isys_dma_rmgr.o \
+       pci/runtime/isys/src/isys_init.o \
+       pci/runtime/isys/src/isys_stream2mmio_rmgr.o \
+       pci/runtime/isys/src/rx.o \
+       pci/runtime/isys/src/virtual_isys.o \
+       pci/runtime/pipeline/src/pipeline.o \
+       pci/runtime/queue/src/queue_access.o \
+       pci/runtime/queue/src/queue.o \
+       pci/runtime/rmgr/src/rmgr.o \
+       pci/runtime/rmgr/src/rmgr_vbuf.o \
+       pci/runtime/spctrl/src/spctrl.o \
+       pci/runtime/timer/src/timer.o \
+       pci/hive_isp_css_common/host/debug.o \
+       pci/hive_isp_css_common/host/dma.o \
+       pci/hive_isp_css_common/host/event_fifo.o \
+       pci/hive_isp_css_common/host/fifo_monitor.o \
+       pci/hive_isp_css_common/host/gdc.o \
+       pci/hive_isp_css_common/host/gp_device.o \
+       pci/hive_isp_css_common/host/gp_timer.o \
+       pci/hive_isp_css_common/host/hmem.o \
+       pci/hive_isp_css_common/host/input_formatter.o \
+       pci/hive_isp_css_common/host/input_system.o \
+       pci/hive_isp_css_common/host/irq.o \
+       pci/hive_isp_css_common/host/isp.o \
+       pci/hive_isp_css_common/host/mmu.o \
+       pci/hive_isp_css_common/host/sp.o \
+       pci/hive_isp_css_common/host/timed_ctrl.o \
+       pci/hive_isp_css_common/host/vmem.o \
+       pci/hive_isp_css_shared/host/tag.o \
+       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/spmem_dump.o \
+
+# These will be needed when clean merge CHT support nicely into the driver
+# Keep them here handy for when we get to that point
+#
+
+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 \
+
+#      -I$(atomisp)/pci/css_2401_system/hrt/ \
+#      -I$(atomisp)/pci/css_2401_csi2p_system/ \
+#      -I$(atomisp)/pci/css_2401_csi2p_system/host/ \
+#      -I$(atomisp)/pci/css_2401_csi2p_system/hrt/ \
+#      -I$(atomisp)/pci/css_2401_system/hive_isp_css_2401_system_generated/ \
+#      -I$(atomisp)/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ \
+
+INCLUDES += \
+       -I$(atomisp)/ \
+       -I$(atomisp)/include/ \
+       -I$(atomisp)/include/hmm/ \
+       -I$(atomisp)/include/mmu/ \
+       -I$(atomisp)/pci/ \
+       -I$(atomisp)/pci/hrt/ \
+       -I$(atomisp)/pci/base/circbuf/interface/ \
+       -I$(atomisp)/pci/base/refcount/interface/ \
+       -I$(atomisp)/pci/camera/pipe/interface/ \
+       -I$(atomisp)/pci/camera/util/interface/ \
+       -I$(atomisp)/pci/css_2400_system/ \
+       -I$(atomisp)/pci/css_2400_system/hive_isp_css_2400_system_generated/ \
+       -I$(atomisp)/pci/css_2400_system/hrt/ \
+       -I$(atomisp)/pci/hive_isp_css_common/ \
+       -I$(atomisp)/pci/hive_isp_css_common/host/ \
+       -I$(atomisp)/pci/hive_isp_css_include/ \
+       -I$(atomisp)/pci/hive_isp_css_include/device_access/ \
+       -I$(atomisp)/pci/hive_isp_css_include/host/ \
+       -I$(atomisp)/pci/hive_isp_css_include/memory_access/ \
+       -I$(atomisp)/pci/hive_isp_css_shared/ \
+       -I$(atomisp)/pci/hive_isp_css_shared/host/ \
+       -I$(atomisp)/pci/isp/kernels/ \
+       -I$(atomisp)/pci/isp/kernels/aa/aa_2/ \
+       -I$(atomisp)/pci/isp/kernels/anr/anr_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/anr/anr_2/ \
+       -I$(atomisp)/pci/isp/kernels/bh/bh_2/ \
+       -I$(atomisp)/pci/isp/kernels/bnlm/ \
+       -I$(atomisp)/pci/isp/kernels/bnr/ \
+       -I$(atomisp)/pci/isp/kernels/bnr/bnr_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/bnr/bnr2_2/ \
+       -I$(atomisp)/pci/isp/kernels/cnr/ \
+       -I$(atomisp)/pci/isp/kernels/cnr/cnr_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/cnr/cnr_2/ \
+       -I$(atomisp)/pci/isp/kernels/conversion/ \
+       -I$(atomisp)/pci/isp/kernels/conversion/conversion_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/copy_output/ \
+       -I$(atomisp)/pci/isp/kernels/copy_output/copy_output_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/crop/ \
+       -I$(atomisp)/pci/isp/kernels/crop/crop_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/csc/ \
+       -I$(atomisp)/pci/isp/kernels/csc/csc_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/ctc/ \
+       -I$(atomisp)/pci/isp/kernels/ctc/ctc_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/ctc/ctc1_5/ \
+       -I$(atomisp)/pci/isp/kernels/ctc/ctc2/ \
+       -I$(atomisp)/pci/isp/kernels/de/ \
+       -I$(atomisp)/pci/isp/kernels/de/de_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/de/de_2/ \
+       -I$(atomisp)/pci/isp/kernels/dp/ \
+       -I$(atomisp)/pci/isp/kernels/dpc2/ \
+       -I$(atomisp)/pci/isp/kernels/dp/dp_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/dvs/ \
+       -I$(atomisp)/pci/isp/kernels/dvs/dvs_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/eed1_8/ \
+       -I$(atomisp)/pci/isp/kernels/fc/ \
+       -I$(atomisp)/pci/isp/kernels/fc/fc_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/fixedbds/ \
+       -I$(atomisp)/pci/isp/kernels/fixedbds/fixedbds_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/fpn/ \
+       -I$(atomisp)/pci/isp/kernels/fpn/fpn_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/gc/ \
+       -I$(atomisp)/pci/isp/kernels/gc/gc_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/gc/gc_2/ \
+       -I$(atomisp)/pci/isp/kernels/hdr/ \
+       -I$(atomisp)/pci/isp/kernels/ipu2_io_ls/ \
+       -I$(atomisp)/pci/isp/kernels/ipu2_io_ls/ \
+       -I$(atomisp)/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ \
+       -I$(atomisp)/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ \
+       -I$(atomisp)/pci/isp/kernels/ipu2_io_ls/common/ \
+       -I$(atomisp)/pci/isp/kernels/ipu2_io_ls/common/ \
+       -I$(atomisp)/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ \
+       -I$(atomisp)/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ \
+       -I$(atomisp)/pci/isp/kernels/iterator/ \
+       -I$(atomisp)/pci/isp/kernels/iterator/iterator_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/macc/ \
+       -I$(atomisp)/pci/isp/kernels/macc/macc_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/macc/macc1_5/ \
+       -I$(atomisp)/pci/isp/kernels/norm/ \
+       -I$(atomisp)/pci/isp/kernels/norm/norm_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/ob/ \
+       -I$(atomisp)/pci/isp/kernels/ob/ob_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/ob/ob2/ \
+       -I$(atomisp)/pci/isp/kernels/output/ \
+       -I$(atomisp)/pci/isp/kernels/output/output_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/qplane/ \
+       -I$(atomisp)/pci/isp/kernels/qplane/qplane_2/ \
+       -I$(atomisp)/pci/isp/kernels/raw/ \
+       -I$(atomisp)/pci/isp/kernels/raw_aa_binning/ \
+       -I$(atomisp)/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/raw/raw_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/ref/ \
+       -I$(atomisp)/pci/isp/kernels/ref/ref_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/s3a/ \
+       -I$(atomisp)/pci/isp/kernels/s3a/s3a_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/sc/ \
+       -I$(atomisp)/pci/isp/kernels/sc/sc_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/sdis/ \
+       -I$(atomisp)/pci/isp/kernels/sdis/common/ \
+       -I$(atomisp)/pci/isp/kernels/sdis/sdis_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/sdis/sdis_2/ \
+       -I$(atomisp)/pci/isp/kernels/tdf/ \
+       -I$(atomisp)/pci/isp/kernels/tdf/tdf_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/tnr/ \
+       -I$(atomisp)/pci/isp/kernels/tnr/tnr_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/tnr/tnr3/ \
+       -I$(atomisp)/pci/isp/kernels/uds/ \
+       -I$(atomisp)/pci/isp/kernels/uds/uds_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/vf/ \
+       -I$(atomisp)/pci/isp/kernels/vf/vf_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/wb/ \
+       -I$(atomisp)/pci/isp/kernels/wb/wb_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/xnr/ \
+       -I$(atomisp)/pci/isp/kernels/xnr/xnr_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/xnr/xnr_3.0/ \
+       -I$(atomisp)/pci/isp/kernels/ynr/ \
+       -I$(atomisp)/pci/isp/kernels/ynr/ynr_1.0/ \
+       -I$(atomisp)/pci/isp/kernels/ynr/ynr_2/ \
+       -I$(atomisp)/pci/isp/modes/interface/ \
+       -I$(atomisp)/pci/runtime/binary/interface/ \
+       -I$(atomisp)/pci/runtime/bufq/interface/ \
+       -I$(atomisp)/pci/runtime/debug/interface/ \
+       -I$(atomisp)/pci/runtime/event/interface/ \
+       -I$(atomisp)/pci/runtime/eventq/interface/ \
+       -I$(atomisp)/pci/runtime/frame/interface/ \
+       -I$(atomisp)/pci/runtime/ifmtr/interface/ \
+       -I$(atomisp)/pci/runtime/inputfifo/interface/ \
+       -I$(atomisp)/pci/runtime/isp_param/interface/ \
+       -I$(atomisp)/pci/runtime/isys/interface/ \
+       -I$(atomisp)/pci/runtime/isys/src/ \
+       -I$(atomisp)/pci/runtime/pipeline/interface/ \
+       -I$(atomisp)/pci/runtime/queue/interface/ \
+       -I$(atomisp)/pci/runtime/queue/src/ \
+       -I$(atomisp)/pci/runtime/rmgr/interface/ \
+       -I$(atomisp)/pci/runtime/spctrl/interface/ \
+       -I$(atomisp)/pci/runtime/tagger/interface/
+
+ifeq ($(CONFIG_ION),y)
+INCLUDES += -I$(srctree)/drivers/staging/android/ion
+endif
+
+DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -D__HOST__
+#DEFINES += -DUSE_DYNAMIC_BIN
+#DEFINES += -DISP_POWER_GATING
+#DEFINES += -DUSE_INTERRUPTS
+#DEFINES += -DUSE_SSSE3
+#DEFINES += -DPUNIT_CAMERA_BUSY
+#DEFINES += -DUSE_KMEM_CACHE
+
+DEFINES += -DATOMISP_POSTFIX=\"css2400b0_v21\"
+DEFINES += -DSYSTEM_hive_isp_css_2400_system -DISP2400
+
+ccflags-y += $(INCLUDES) $(DEFINES) -fno-common
+
+# HACK! While this driver is in bad shape, don't enable several warnings
+#       that would be otherwise enabled with W=1
+ccflags-y += $(call cc-disable-warning, implicit-fallthrough)
+ccflags-y += $(call cc-disable-warning, missing-prototypes)
+ccflags-y += $(call cc-disable-warning, missing-declarations)
+ccflags-y += $(call cc-disable-warning, suggest-attribute=format)
+ccflags-y += $(call cc-disable-warning, unused-const-variable)
+ccflags-y += $(call cc-disable-warning, unused-but-set-variable)

diff --git a/drivers/staging/media/atomisp/TODO b/drivers/staging/media/atomisp/TODO
index 255ce3630c2a4844452f829dab6b9ee9086b4b44..e2fba1ca0a120a441622abea06ccc07ad99315aa 100644 (file)
--- a/drivers/staging/media/atomisp/TODO
+++ b/drivers/staging/media/atomisp/TODO
@@ -26,7 +26,7 @@
 
 7. The ISP code depends on the exact FW version. The version defined in
    BYT: 
-   drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
+   drivers/staging/media/atomisp/pci/atomisp2/pci/sh_css_firmware.c
    static const char *release_version = STR(irci_stable_candrpv_0415_20150521_0458);
    CHT:
    drivers/staging/media/atomisp/pci/atomisp2/css/sh_css_firmware.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm.h b/drivers/staging/media/atomisp/include/hmm/hmm.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm.h
rename to drivers/staging/media/atomisp/include/hmm/hmm.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h
rename to drivers/staging/media/atomisp/include/hmm/hmm_bo.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_common.h b/drivers/staging/media/atomisp/include/hmm/hmm_common.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_common.h
rename to drivers/staging/media/atomisp/include/hmm/hmm_common.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_pool.h b/drivers/staging/media/atomisp/include/hmm/hmm_pool.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_pool.h
rename to drivers/staging/media/atomisp/include/hmm/hmm_pool.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_vm.h b/drivers/staging/media/atomisp/include/hmm/hmm_vm.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_vm.h
rename to drivers/staging/media/atomisp/include/hmm/hmm_vm.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h b/drivers/staging/media/atomisp/include/mmu/isp_mmu.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h
rename to drivers/staging/media/atomisp/include/mmu/isp_mmu.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu_mrfld.h b/drivers/staging/media/atomisp/include/mmu/sh_mmu_mrfld.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu_mrfld.h
rename to drivers/staging/media/atomisp/include/mmu/sh_mmu_mrfld.h

diff --git a/drivers/staging/media/atomisp/pci/Kconfig b/drivers/staging/media/atomisp/pci/Kconfig
deleted file mode 100644 (file)
index 41f116d..0000000
--- a/drivers/staging/media/atomisp/pci/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Kconfig for ISP driver
-#
-
-config VIDEO_ATOMISP
-       tristate "Intel Atom Image Signal Processor Driver"
-       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-       select IOSF_MBI
-       select VIDEOBUF_VMALLOC
-       ---help---
-         Say Y here if your platform supports Intel Atom SoC
-         camera imaging subsystem.
-         To compile this driver as a module, choose M here: the
-         module will be called atomisp

diff --git a/drivers/staging/media/atomisp/pci/Makefile b/drivers/staging/media/atomisp/pci/Makefile
deleted file mode 100644 (file)
index 61ad1fb..0000000
--- a/drivers/staging/media/atomisp/pci/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for ISP driver
-#
-
-obj-$(CONFIG_VIDEO_ATOMISP) += atomisp2/

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h b/drivers/staging/media/atomisp/pci/atomisp-regs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h
rename to drivers/staging/media/atomisp/pci/atomisp-regs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/Makefile b/drivers/staging/media/atomisp/pci/atomisp2/Makefile
deleted file mode 100644 (file)
index 06f52fb..0000000
--- a/drivers/staging/media/atomisp/pci/atomisp2/Makefile
+++ /dev/null
@@ -1,349 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-atomisp-objs += \
-       atomisp_drvfs.o \
-       atomisp_file.o \
-       css2400/sh_css_mipi.o \
-       css2400/runtime/pipeline/src/pipeline.o \
-       css2400/runtime/spctrl/src/spctrl.o \
-       css2400/runtime/rmgr/src/rmgr.o \
-       css2400/runtime/rmgr/src/rmgr_vbuf.o \
-       css2400/runtime/isp_param/src/isp_param.o \
-       css2400/runtime/inputfifo/src/inputfifo.o \
-       css2400/runtime/queue/src/queue_access.o \
-       css2400/runtime/queue/src/queue.o \
-       css2400/runtime/frame/src/frame.o \
-       css2400/runtime/eventq/src/eventq.o \
-       css2400/runtime/binary/src/binary.o \
-       css2400/runtime/timer/src/timer.o \
-       css2400/runtime/isys/src/csi_rx_rmgr.o \
-       css2400/runtime/isys/src/isys_stream2mmio_rmgr.o \
-       css2400/runtime/isys/src/virtual_isys.o \
-       css2400/runtime/isys/src/rx.o \
-       css2400/runtime/isys/src/isys_dma_rmgr.o \
-       css2400/runtime/isys/src/ibuf_ctrl_rmgr.o \
-       css2400/runtime/isys/src/isys_init.o \
-       css2400/runtime/bufq/src/bufq.o \
-       css2400/runtime/ifmtr/src/ifmtr.o \
-       css2400/runtime/debug/src/ia_css_debug.o \
-       css2400/runtime/event/src/event.o \
-       css2400/sh_css_sp.o \
-       css2400/css_2400_system/spmem_dump.o \
-       css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.o \
-       css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.o \
-       css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.o \
-       css2400/sh_css_stream_format.o \
-       css2400/sh_css_hrt.o \
-       css2400/sh_css_properties.o \
-       css2400/memory_realloc.o \
-       css2400/hive_isp_css_shared/host/tag.o \
-       css2400/sh_css_params.o \
-       css2400/sh_css.o \
-       css2400/isp/kernels/hdr/ia_css_hdr.host.o \
-       css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.o \
-       css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.o \
-       css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.o \
-       css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.o \
-       css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.o \
-       css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.o \
-       css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.o \
-       css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.o \
-       css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.o \
-       css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.o \
-       css2400/isp/kernels/output/output_1.0/ia_css_output.host.o \
-       css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.o \
-       css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.o \
-       css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.o \
-       css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.o \
-       css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.o \
-       css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.o \
-       css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.o \
-       css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.o \
-       css2400/isp/kernels/dpc2/ia_css_dpc2.host.o \
-       css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.o \
-       css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.o \
-       css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.o \
-       css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.o \
-       css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.o \
-       css2400/isp/kernels/bh/bh_2/ia_css_bh.host.o \
-       css2400/isp/kernels/bnlm/ia_css_bnlm.host.o \
-       css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.o \
-       css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.o \
-       css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.o \
-       css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.o \
-       css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.o \
-       css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.o \
-       css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.o \
-       css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.o \
-       css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.o \
-       css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.o \
-       css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.o \
-       css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.o \
-       css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.o \
-       css2400/isp/kernels/de/de_1.0/ia_css_de.host.o \
-       css2400/isp/kernels/de/de_2/ia_css_de2.host.o \
-       css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.o \
-       css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.o \
-       css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.o \
-       css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.o \
-       css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.o \
-       css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.o \
-       css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.o \
-       css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.o \
-       css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.o \
-       css2400/isp/kernels/ob/ob2/ia_css_ob2.host.o \
-       css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.o \
-       css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.o \
-       css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.o \
-       css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.o \
-       css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.o \
-       css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.o \
-       css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.o \
-       css2400/sh_css_pipe.o \
-       css2400/ia_css_device_access.o \
-       css2400/sh_css_host_data.o \
-       css2400/sh_css_mmu.o \
-       css2400/sh_css_metadata.o \
-       css2400/base/refcount/src/refcount.o \
-       css2400/base/circbuf/src/circbuf.o \
-       css2400/camera/pipe/src/pipe_binarydesc.o \
-       css2400/camera/pipe/src/pipe_util.o \
-       css2400/camera/pipe/src/pipe_stagedesc.o \
-       css2400/camera/util/src/util.o \
-       css2400/sh_css_metrics.o \
-       css2400/sh_css_version.o \
-       css2400/ia_css_memory_access.o \
-       css2400/sh_css_param_shading.o \
-       css2400/sh_css_morph.o \
-       css2400/sh_css_firmware.o \
-       css2400/hive_isp_css_common/host/isp.o \
-       css2400/hive_isp_css_common/host/gdc.o \
-       css2400/hive_isp_css_common/host/sp.o \
-       css2400/hive_isp_css_common/host/vmem.o \
-       css2400/hive_isp_css_common/host/dma.o \
-       css2400/hive_isp_css_common/host/input_formatter.o \
-       css2400/hive_isp_css_common/host/debug.o \
-       css2400/hive_isp_css_common/host/hmem.o \
-       css2400/hive_isp_css_common/host/gp_device.o \
-       css2400/hive_isp_css_common/host/fifo_monitor.o \
-       css2400/hive_isp_css_common/host/gp_timer.o \
-       css2400/hive_isp_css_common/host/irq.o \
-       css2400/hive_isp_css_common/host/input_system.o \
-       css2400/hive_isp_css_common/host/timed_ctrl.o \
-       css2400/hive_isp_css_common/host/mmu.o \
-       css2400/hive_isp_css_common/host/event_fifo.o \
-       css2400/sh_css_param_dvs.o \
-       css2400/sh_css_shading.o \
-       css2400/sh_css_stream.o \
-       mmu/sh_mmu_mrfld.o \
-       mmu/isp_mmu.o \
-       atomisp_acc.o \
-       atomisp_compat_css20.o \
-       atomisp_fops.o \
-       atomisp_subdev.o \
-       atomisp_ioctl.o \
-       atomisp_compat_ioctl32.o \
-       atomisp_csi2.o \
-       atomisp_cmd.o \
-       atomisp_tpg.o \
-       hmm/hmm_vm.o \
-       hmm/hmm.o \
-       hmm/hmm_bo.o \
-       hmm/hmm_reserved_pool.o \
-       hmm/hmm_dynamic_pool.o \
-       hrt/hive_isp_css_mm_hrt.o \
-       atomisp_v4l2.o
-       
-# These will be needed when clean merge CHT support nicely into the driver
-# Keep them here handy for when we get to that point
-#
-
-obj-cht= \
-       css2400/css_2401_system/spmem_dump.o \
-       css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.o \
-       css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.o \
-       css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.o \
-       css2400/css_2401_csi2p_system/spmem_dump.o \
-       css2400/css_2401_csi2p_system/host/isys_stream2mmio.o \
-       css2400/css_2401_csi2p_system/host/ibuf_ctrl.o \
-       css2400/css_2401_csi2p_system/host/isys_irq.o \
-       css2400/css_2401_csi2p_system/host/isys_dma.o \
-       css2400/css_2401_csi2p_system/host/csi_rx.o \
-       css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.o \
-       css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.o \
-       css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.o \
-
-#      -I$(atomisp)/css2400/css_2401_csi2p_system/ \
-#      -I$(atomisp)/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ \
-#      -I$(atomisp)/css2400/css_2401_csi2p_system/host/ \
-#      -I$(atomisp)/css2400/css_2401_csi2p_system/hrt/ \
-#      -I$(atomisp)/css2400/css_2401_system/hive_isp_css_2401_system_generated/ \
-#      -I$(atomisp)/css2400/css_2401_system/hrt/ \
-
-
-
-obj-$(CONFIG_VIDEO_ATOMISP) += atomisp.o
-
-atomisp = $(srctree)/drivers/staging/media/atomisp/pci/atomisp2
-
-INCLUDES += \
-       -I$(atomisp)/ \
-       -I$(atomisp)/css2400/ \
-       -I$(atomisp)/hrt/ \
-       -I$(atomisp)/include/ \
-       -I$(atomisp)/include/hmm/ \
-       -I$(atomisp)/include/mmu/ \
-       -I$(atomisp)/css2400/base/circbuf/interface/ \
-       -I$(atomisp)/css2400/base/refcount/interface/ \
-       -I$(atomisp)/css2400/camera/pipe/interface/ \
-       -I$(atomisp)/css2400/camera/util/interface/ \
-       -I$(atomisp)/css2400/css_2400_system/ \
-       -I$(atomisp)/css2400/css_2400_system/hive_isp_css_2400_system_generated/ \
-       -I$(atomisp)/css2400/css_2400_system/hrt/ \
-       -I$(atomisp)/css2400/hive_isp_css_common/ \
-       -I$(atomisp)/css2400/hive_isp_css_common/host/ \
-       -I$(atomisp)/css2400/hive_isp_css_include/ \
-       -I$(atomisp)/css2400/hive_isp_css_include/device_access/ \
-       -I$(atomisp)/css2400/hive_isp_css_include/host/ \
-       -I$(atomisp)/css2400/hive_isp_css_include/memory_access/ \
-       -I$(atomisp)/css2400/hive_isp_css_shared/ \
-       -I$(atomisp)/css2400/hive_isp_css_shared/host/ \
-       -I$(atomisp)/css2400/isp/kernels/ \
-       -I$(atomisp)/css2400/isp/kernels/aa/aa_2/ \
-       -I$(atomisp)/css2400/isp/kernels/anr/anr_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/anr/anr_2/ \
-       -I$(atomisp)/css2400/isp/kernels/bh/bh_2/ \
-       -I$(atomisp)/css2400/isp/kernels/bnlm/ \
-       -I$(atomisp)/css2400/isp/kernels/bnr/ \
-       -I$(atomisp)/css2400/isp/kernels/bnr/bnr_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/bnr/bnr2_2/ \
-       -I$(atomisp)/css2400/isp/kernels/cnr/ \
-       -I$(atomisp)/css2400/isp/kernels/cnr/cnr_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/cnr/cnr_2/ \
-       -I$(atomisp)/css2400/isp/kernels/conversion/ \
-       -I$(atomisp)/css2400/isp/kernels/conversion/conversion_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/copy_output/ \
-       -I$(atomisp)/css2400/isp/kernels/copy_output/copy_output_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/crop/ \
-       -I$(atomisp)/css2400/isp/kernels/crop/crop_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/csc/ \
-       -I$(atomisp)/css2400/isp/kernels/csc/csc_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/ctc/ \
-       -I$(atomisp)/css2400/isp/kernels/ctc/ctc_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/ctc/ctc1_5/ \
-       -I$(atomisp)/css2400/isp/kernels/ctc/ctc2/ \
-       -I$(atomisp)/css2400/isp/kernels/de/ \
-       -I$(atomisp)/css2400/isp/kernels/de/de_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/de/de_2/ \
-       -I$(atomisp)/css2400/isp/kernels/dpc2/ \
-       -I$(atomisp)/css2400/isp/kernels/dp/ \
-       -I$(atomisp)/css2400/isp/kernels/dp/dp_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/dvs/ \
-       -I$(atomisp)/css2400/isp/kernels/dvs/dvs_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/eed1_8/ \
-       -I$(atomisp)/css2400/isp/kernels/fc/ \
-       -I$(atomisp)/css2400/isp/kernels/fc/fc_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/fixedbds/ \
-       -I$(atomisp)/css2400/isp/kernels/fixedbds/fixedbds_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/fpn/ \
-       -I$(atomisp)/css2400/isp/kernels/fpn/fpn_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/gc/ \
-       -I$(atomisp)/css2400/isp/kernels/gc/gc_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/gc/gc_2/ \
-       -I$(atomisp)/css2400/isp/kernels/hdr/ \
-       -I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/ \
-       -I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ \
-       -I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/common/ \
-       -I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ \
-       -I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/ \
-       -I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ \
-       -I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/common/ \
-       -I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ \
-       -I$(atomisp)/css2400/isp/kernels/iterator/ \
-       -I$(atomisp)/css2400/isp/kernels/iterator/iterator_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/macc/ \
-       -I$(atomisp)/css2400/isp/kernels/macc/macc_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/macc/macc1_5/ \
-       -I$(atomisp)/css2400/isp/kernels/norm/ \
-       -I$(atomisp)/css2400/isp/kernels/norm/norm_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/ob/ \
-       -I$(atomisp)/css2400/isp/kernels/ob/ob_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/ob/ob2/ \
-       -I$(atomisp)/css2400/isp/kernels/output/ \
-       -I$(atomisp)/css2400/isp/kernels/output/output_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/qplane/ \
-       -I$(atomisp)/css2400/isp/kernels/qplane/qplane_2/ \
-       -I$(atomisp)/css2400/isp/kernels/raw_aa_binning/ \
-       -I$(atomisp)/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/raw/ \
-       -I$(atomisp)/css2400/isp/kernels/raw/raw_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/ref/ \
-       -I$(atomisp)/css2400/isp/kernels/ref/ref_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/s3a/ \
-       -I$(atomisp)/css2400/isp/kernels/s3a/s3a_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/sc/ \
-       -I$(atomisp)/css2400/isp/kernels/sc/sc_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/sdis/ \
-       -I$(atomisp)/css2400/isp/kernels/sdis/common/ \
-       -I$(atomisp)/css2400/isp/kernels/sdis/sdis_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/sdis/sdis_2/ \
-       -I$(atomisp)/css2400/isp/kernels/tdf/ \
-       -I$(atomisp)/css2400/isp/kernels/tdf/tdf_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/tnr/ \
-       -I$(atomisp)/css2400/isp/kernels/tnr/tnr_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/tnr/tnr3/ \
-       -I$(atomisp)/css2400/isp/kernels/uds/ \
-       -I$(atomisp)/css2400/isp/kernels/uds/uds_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/vf/ \
-       -I$(atomisp)/css2400/isp/kernels/vf/vf_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/wb/ \
-       -I$(atomisp)/css2400/isp/kernels/wb/wb_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/xnr/ \
-       -I$(atomisp)/css2400/isp/kernels/xnr/xnr_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/xnr/xnr_3.0/ \
-       -I$(atomisp)/css2400/isp/kernels/ynr/ \
-       -I$(atomisp)/css2400/isp/kernels/ynr/ynr_1.0/ \
-       -I$(atomisp)/css2400/isp/kernels/ynr/ynr_2/ \
-       -I$(atomisp)/css2400/isp/modes/interface/ \
-       -I$(atomisp)/css2400/runtime/binary/interface/ \
-       -I$(atomisp)/css2400/runtime/bufq/interface/ \
-       -I$(atomisp)/css2400/runtime/debug/interface/ \
-       -I$(atomisp)/css2400/runtime/event/interface/ \
-       -I$(atomisp)/css2400/runtime/eventq/interface/ \
-       -I$(atomisp)/css2400/runtime/frame/interface/ \
-       -I$(atomisp)/css2400/runtime/ifmtr/interface/ \
-       -I$(atomisp)/css2400/runtime/inputfifo/interface/ \
-       -I$(atomisp)/css2400/runtime/isp_param/interface/ \
-       -I$(atomisp)/css2400/runtime/isys/interface/ \
-       -I$(atomisp)/css2400/runtime/isys/src/ \
-       -I$(atomisp)/css2400/runtime/pipeline/interface/ \
-       -I$(atomisp)/css2400/runtime/queue/interface/ \
-       -I$(atomisp)/css2400/runtime/queue/src/ \
-       -I$(atomisp)/css2400/runtime/rmgr/interface/ \
-       -I$(atomisp)/css2400/runtime/spctrl/interface/ \
-       -I$(atomisp)/css2400/runtime/tagger/interface/
-
-ifeq ($(CONFIG_ION),y)
-INCLUDES += -I$(srctree)/drivers/staging/android/ion
-endif
-
-DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -D__HOST__
-#DEFINES += -DUSE_DYNAMIC_BIN
-#DEFINES += -DISP_POWER_GATING
-#DEFINES += -DUSE_INTERRUPTS
-#DEFINES += -DUSE_SSSE3
-#DEFINES += -DPUNIT_CAMERA_BUSY
-#DEFINES += -DUSE_KMEM_CACHE
-
-DEFINES += -DATOMISP_POSTFIX=\"css2400b0_v21\"
-DEFINES += -DSYSTEM_hive_isp_css_2400_system -DISP2400
-
-ccflags-y += $(INCLUDES) $(DEFINES) -fno-common
-
-# HACK! While this driver is in bad shape, don't enable several warnings
-#       that would be otherwise enabled with W=1
-ccflags-y += $(call cc-disable-warning, implicit-fallthrough)
-ccflags-y += $(call cc-disable-warning, missing-prototypes)
-ccflags-y += $(call cc-disable-warning, missing-declarations)
-ccflags-y += $(call cc-disable-warning, suggest-attribute=format)
-ccflags-y += $(call cc-disable-warning, unused-const-variable)
-ccflags-y += $(call cc-disable-warning, unused-but-set-variable)

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c b/drivers/staging/media/atomisp/pci/atomisp_acc.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c
rename to drivers/staging/media/atomisp/pci/atomisp_acc.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h b/drivers/staging/media/atomisp/pci/atomisp_acc.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h
rename to drivers/staging/media/atomisp/pci/atomisp_acc.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
rename to drivers/staging/media/atomisp/pci/atomisp_cmd.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h b/drivers/staging/media/atomisp/pci/atomisp_cmd.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h
rename to drivers/staging/media/atomisp/pci/atomisp_cmd.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h b/drivers/staging/media/atomisp/pci/atomisp_common.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h
rename to drivers/staging/media/atomisp/pci/atomisp_common.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp_compat.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
rename to drivers/staging/media/atomisp/pci/atomisp_compat.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
rename to drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h
rename to drivers/staging/media/atomisp/pci/atomisp_compat_css20.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c b/drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c
rename to drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.h b/drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.h
rename to drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.c b/drivers/staging/media/atomisp/pci/atomisp_csi2.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.c
rename to drivers/staging/media/atomisp/pci/atomisp_csi2.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.h b/drivers/staging/media/atomisp/pci/atomisp_csi2.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.h
rename to drivers/staging/media/atomisp/pci/atomisp_csi2.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h b/drivers/staging/media/atomisp/pci/atomisp_dfs_tables.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h
rename to drivers/staging/media/atomisp/pci/atomisp_dfs_tables.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c b/drivers/staging/media/atomisp/pci/atomisp_drvfs.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c
rename to drivers/staging/media/atomisp/pci/atomisp_drvfs.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.h b/drivers/staging/media/atomisp/pci/atomisp_drvfs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.h
rename to drivers/staging/media/atomisp/pci/atomisp_drvfs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.c b/drivers/staging/media/atomisp/pci/atomisp_file.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.c
rename to drivers/staging/media/atomisp/pci/atomisp_file.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.h b/drivers/staging/media/atomisp/pci/atomisp_file.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.h
rename to drivers/staging/media/atomisp/pci/atomisp_file.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
rename to drivers/staging/media/atomisp/pci/atomisp_fops.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.h b/drivers/staging/media/atomisp/pci/atomisp_fops.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.h
rename to drivers/staging/media/atomisp/pci/atomisp_fops.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_helper.h b/drivers/staging/media/atomisp/pci/atomisp_helper.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_helper.h
rename to drivers/staging/media/atomisp/pci/atomisp_helper.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h b/drivers/staging/media/atomisp/pci/atomisp_internal.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h
rename to drivers/staging/media/atomisp/pci/atomisp_internal.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
rename to drivers/staging/media/atomisp/pci/atomisp_ioctl.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.h b/drivers/staging/media/atomisp/pci/atomisp_ioctl.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.h
rename to drivers/staging/media/atomisp/pci/atomisp_ioctl.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c
rename to drivers/staging/media/atomisp/pci/atomisp_subdev.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h
rename to drivers/staging/media/atomisp/pci/atomisp_subdev.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_tables.h b/drivers/staging/media/atomisp/pci/atomisp_tables.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_tables.h
rename to drivers/staging/media/atomisp/pci/atomisp_tables.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.c b/drivers/staging/media/atomisp/pci/atomisp_tpg.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.c
rename to drivers/staging/media/atomisp/pci/atomisp_tpg.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.h b/drivers/staging/media/atomisp/pci/atomisp_tpg.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.h
rename to drivers/staging/media/atomisp/pci/atomisp_tpg.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_trace_event.h b/drivers/staging/media/atomisp/pci/atomisp_trace_event.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_trace_event.h
rename to drivers/staging/media/atomisp/pci/atomisp_trace_event.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
rename to drivers/staging/media/atomisp/pci/atomisp_v4l2.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.h b/drivers/staging/media/atomisp/pci/atomisp_v4l2.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.h
rename to drivers/staging/media/atomisp/pci/atomisp_v4l2.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf.h b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf.h
rename to drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_comm.h b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_comm.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_comm.h
rename to drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_comm.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_desc.h b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_desc.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_desc.h
rename to drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_desc.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/src/circbuf.c b/drivers/staging/media/atomisp/pci/base/circbuf/src/circbuf.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/src/circbuf.c
rename to drivers/staging/media/atomisp/pci/base/circbuf/src/circbuf.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/interface/ia_css_refcount.h b/drivers/staging/media/atomisp/pci/base/refcount/interface/ia_css_refcount.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/interface/ia_css_refcount.h
rename to drivers/staging/media/atomisp/pci/base/refcount/interface/ia_css_refcount.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/src/refcount.c b/drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/src/refcount.c
rename to drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/bits.h b/drivers/staging/media/atomisp/pci/bits.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/bits.h
rename to drivers/staging/media/atomisp/pci/bits.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_binarydesc.h b/drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_binarydesc.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_binarydesc.h
rename to drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_binarydesc.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_stagedesc.h b/drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_stagedesc.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_stagedesc.h
rename to drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_stagedesc.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_util.h b/drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_util.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_util.h
rename to drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_util.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_binarydesc.c b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_binarydesc.c
rename to drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_stagedesc.c b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_stagedesc.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_stagedesc.c
rename to drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_stagedesc.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_util.c b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_util.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_util.c
rename to drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_util.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h b/drivers/staging/media/atomisp/pci/camera/util/interface/ia_css_util.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h
rename to drivers/staging/media/atomisp/pci/camera/util/interface/ia_css_util.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c b/drivers/staging/media/atomisp/pci/camera/util/src/util.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c
rename to drivers/staging/media/atomisp/pci/camera/util/src/util.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/cell_params.h b/drivers/staging/media/atomisp/pci/cell_params.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/cell_params.h
rename to drivers/staging/media/atomisp/pci/cell_params.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c b/drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c
rename to drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c b/drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c
rename to drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c b/drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c
rename to drivers/staging/media/atomisp/pci/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h b/drivers/staging/media/atomisp/pci/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h
rename to drivers/staging/media/atomisp/pci/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_mamoiada_params.h b/drivers/staging/media/atomisp/pci/css_2400_system/hrt/isp2400_mamoiada_params.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_mamoiada_params.h
rename to drivers/staging/media/atomisp/pci/css_2400_system/hrt/isp2400_mamoiada_params.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/spmem_dump.c b/drivers/staging/media/atomisp/pci/css_2400_system/spmem_dump.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/spmem_dump.c
rename to drivers/staging/media/atomisp/pci/css_2400_system/spmem_dump.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/csi_rx_global.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/csi_rx_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/csi_rx_global.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/csi_rx_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/csi_rx.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/csi_rx.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_local.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/csi_rx_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_local.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/csi_rx_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_private.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/csi_rx_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_private.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/csi_rx_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/ibuf_ctrl.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/ibuf_ctrl.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_local.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/ibuf_ctrl_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_local.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/ibuf_ctrl_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_private.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/ibuf_ctrl_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_private.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/ibuf_ctrl_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_dma.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_dma.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_local.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_dma_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_local.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_dma_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_private.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_dma_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_private.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_dma_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_irq.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_irq.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_local.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_irq_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_local.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_irq_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_private.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_irq_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_private.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_irq_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_stream2mmio.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_stream2mmio.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_local.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_stream2mmio_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_local.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_stream2mmio_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_private.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_stream2mmio_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_private.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/isys_stream2mmio_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_local.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/pixelgen_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_local.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/pixelgen_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_private.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/pixelgen_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_private.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/host/pixelgen_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_defs.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/mipi_backend_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_defs.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/mipi_backend_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/rx_csi_defs.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/rx_csi_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/rx_csi_defs.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/rx_csi_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/stream2mmio_defs.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/stream2mmio_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/stream2mmio_defs.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hrt/stream2mmio_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/ibuf_ctrl_global.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/ibuf_ctrl_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/ibuf_ctrl_global.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/ibuf_ctrl_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_dma_global.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/isys_dma_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_dma_global.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/isys_dma_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_irq_global.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/isys_irq_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_irq_global.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/isys_irq_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_stream2mmio_global.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/isys_stream2mmio_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_stream2mmio_global.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/isys_stream2mmio_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/pixelgen_global.h b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/pixelgen_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/pixelgen_global.h
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/pixelgen_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/spmem_dump.c b/drivers/staging/media/atomisp/pci/css_2401_csi2p_system/spmem_dump.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/spmem_dump.c
rename to drivers/staging/media/atomisp/pci/css_2401_csi2p_system/spmem_dump.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c b/drivers/staging/media/atomisp/pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c
rename to drivers/staging/media/atomisp/pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c b/drivers/staging/media/atomisp/pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c
rename to drivers/staging/media/atomisp/pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c b/drivers/staging/media/atomisp/pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c
rename to drivers/staging/media/atomisp/pci/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/spmem_dump.c b/drivers/staging/media/atomisp/pci/css_2401_system/spmem_dump.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/spmem_dump.c
rename to drivers/staging/media/atomisp/pci/css_2401_system/spmem_dump.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_receiver_2400_common_defs.h b/drivers/staging/media/atomisp/pci/css_receiver_2400_common_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_receiver_2400_common_defs.h
rename to drivers/staging/media/atomisp/pci/css_receiver_2400_common_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_receiver_2400_defs.h b/drivers/staging/media/atomisp/pci/css_receiver_2400_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_receiver_2400_defs.h
rename to drivers/staging/media/atomisp/pci/css_receiver_2400_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_trace.h b/drivers/staging/media/atomisp/pci/css_trace.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_trace.h
rename to drivers/staging/media/atomisp/pci/css_trace.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/defs.h b/drivers/staging/media/atomisp/pci/defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/defs.h
rename to drivers/staging/media/atomisp/pci/defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/dma_v2_defs.h b/drivers/staging/media/atomisp/pci/dma_v2_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/dma_v2_defs.h
rename to drivers/staging/media/atomisp/pci/dma_v2_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/gdc_v2_defs.h b/drivers/staging/media/atomisp/pci/gdc_v2_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/gdc_v2_defs.h
rename to drivers/staging/media/atomisp/pci/gdc_v2_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/gp_timer_defs.h b/drivers/staging/media/atomisp/pci/gp_timer_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/gp_timer_defs.h
rename to drivers/staging/media/atomisp/pci/gp_timer_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/gpio_block_defs.h b/drivers/staging/media/atomisp/pci/gpio_block_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/gpio_block_defs.h
rename to drivers/staging/media/atomisp/pci/gpio_block_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_2401_irq_types_hrt.h b/drivers/staging/media/atomisp/pci/hive_isp_css_2401_irq_types_hrt.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_2401_irq_types_hrt.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_2401_irq_types_hrt.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/debug_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/debug_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/debug_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/debug_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/dma_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/dma_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/dma_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/dma_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/event_fifo_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/event_fifo_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/event_fifo_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/event_fifo_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/fifo_monitor_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/fifo_monitor_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/fifo_monitor_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/fifo_monitor_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/gdc_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/gdc_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_device_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/gp_device_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_device_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/gp_device_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_timer_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/gp_timer_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_timer_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/gp_timer_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gpio_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/gpio_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gpio_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/gpio_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/hmem_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/hmem_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/hmem_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/hmem_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vamem_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vamem_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/input_formatter_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/input_formatter_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/irq_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/irq_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/irq_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/irq_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/isp_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/isp_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/mmu_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/mmu_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/mmu_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/mmu_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/sp_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/sp_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/timed_ctrl_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/timed_ctrl_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/timed_ctrl_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/timed_ctrl_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vamem_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/vamem_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vamem_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/vamem_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vmem_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/vmem_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vmem_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_common/vmem_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_defs.h b/drivers/staging/media/atomisp/pci/hive_isp_css_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_defs.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/assert_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/assert_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/assert_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/assert_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bitop_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/bitop_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bitop_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/bitop_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/csi_rx.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/csi_rx.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/csi_rx.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/csi_rx.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/debug.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/debug.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/debug.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/debug.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/device_access/device_access.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/device_access/device_access.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/device_access/device_access.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/device_access/device_access.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/dma.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/dma.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/dma.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/dma.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/error_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/error_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/error_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/error_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/event_fifo.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/event_fifo.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/event_fifo.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/event_fifo.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/fifo_monitor.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/fifo_monitor.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/fifo_monitor.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/fifo_monitor.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gdc_device.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/gdc_device.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gdc_device.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/gdc_device.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_device.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/gp_device.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_device.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/gp_device.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_timer.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/gp_timer.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_timer.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/gp_timer.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gpio.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/gpio.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gpio.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/gpio.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/hmem.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/hmem.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/hmem.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/hmem.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/csi_rx_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/csi_rx_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/csi_rx_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/csi_rx_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/debug_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/debug_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/debug_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/debug_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/dma_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/dma_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/dma_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/dma_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/event_fifo_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/event_fifo_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/event_fifo_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/event_fifo_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/fifo_monitor_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/fifo_monitor_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/fifo_monitor_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/fifo_monitor_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gdc_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gdc_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gdc_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gdc_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_device_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_device_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_device_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_device_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_timer_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_timer_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_timer_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_timer_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gpio_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gpio_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gpio_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gpio_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/hmem_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/hmem_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/hmem_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/hmem_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ibuf_ctrl_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/ibuf_ctrl_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ibuf_ctrl_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/ibuf_ctrl_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_formatter_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/input_formatter_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_formatter_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/input_formatter_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/irq_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/irq_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/irq_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/irq_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isp_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isp_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_dma_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_dma_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_dma_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_dma_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_irq_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_irq_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_irq_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_irq_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_stream2mmio_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_stream2mmio_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_stream2mmio_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_stream2mmio_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mmu_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mmu_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pixelgen_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/pixelgen_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pixelgen_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/pixelgen_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/sp_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/sp_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/sp_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/sp_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/tag_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/tag_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/tag_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/tag_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/timed_ctrl_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/timed_ctrl_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/timed_ctrl_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/timed_ctrl_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vamem_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/vamem_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vamem_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/vamem_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vmem_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/vmem_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vmem_public.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/host/vmem_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/ibuf_ctrl.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/ibuf_ctrl.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/ibuf_ctrl.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/ibuf_ctrl.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_formatter.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/input_formatter.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_formatter.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/input_formatter.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_system.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/input_system.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_system.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/input_system.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/irq.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/irq.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/irq.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/irq.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isp.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/isp.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isp.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/isp.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_dma.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_dma.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_dma.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_dma.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_irq.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_irq.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_irq.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_irq.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_stream2mmio.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_stream2mmio.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_stream2mmio.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_stream2mmio.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/math_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/math_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_access/memory_access.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_access/memory_access.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_realloc.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_realloc.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_realloc.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_realloc.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/misc_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/misc_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/misc_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/misc_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/mmu_device.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/mmu_device.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/pixelgen.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/pixelgen.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/pixelgen.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/pixelgen.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/platform_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/platform_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/platform_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/platform_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/print_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/print_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/queue.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/queue.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/queue.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/queue.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/resource.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/resource.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/resource.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/resource.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/sp.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/sp.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/sp.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/sp.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/string_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/string_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/system_types.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/system_types.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/tag.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/tag.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/tag.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/tag.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/timed_ctrl.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/timed_ctrl.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/timed_ctrl.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/timed_ctrl.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/type_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/type_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/type_support.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/type_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vamem.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/vamem.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vamem.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/vamem.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vmem.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/vmem.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vmem.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_include/vmem.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/queue_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/queue_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/queue_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/queue_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag.c b/drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag.c
rename to drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_local.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_private.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/queue_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_shared/queue_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/queue_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_shared/queue_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/sw_event_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_shared/sw_event_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/sw_event_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_shared/sw_event_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/tag_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_shared/tag_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/tag_global.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_shared/tag_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_streaming_to_mipi_types_hrt.h b/drivers/staging/media/atomisp/pci/hive_isp_css_streaming_to_mipi_types_hrt.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_streaming_to_mipi_types_hrt.h
rename to drivers/staging/media/atomisp/pci/hive_isp_css_streaming_to_mipi_types_hrt.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_types.h b/drivers/staging/media/atomisp/pci/hive_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_types.h
rename to drivers/staging/media/atomisp/pci/hive_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c b/drivers/staging/media/atomisp/pci/hmm/hmm.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c
rename to drivers/staging/media/atomisp/pci/hmm/hmm.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
rename to drivers/staging/media/atomisp/pci/hmm/hmm_bo.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c b/drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c
rename to drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c b/drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c
rename to drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c b/drivers/staging/media/atomisp/pci/hmm/hmm_vm.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c
rename to drivers/staging/media/atomisp/pci/hmm/hmm_vm.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_custom_host_hrt.h b/drivers/staging/media/atomisp/pci/hrt/hive_isp_css_custom_host_hrt.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_custom_host_hrt.h
rename to drivers/staging/media/atomisp/pci/hrt/hive_isp_css_custom_host_hrt.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c b/drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c
rename to drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h b/drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h
rename to drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h b/drivers/staging/media/atomisp/pci/ia_css.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h
rename to drivers/staging/media/atomisp/pci/ia_css.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_3a.h b/drivers/staging/media/atomisp/pci/ia_css_3a.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_3a.h
rename to drivers/staging/media/atomisp/pci/ia_css_3a.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h
rename to drivers/staging/media/atomisp/pci/ia_css_acc_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h b/drivers/staging/media/atomisp/pci/ia_css_buffer.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h
rename to drivers/staging/media/atomisp/pci/ia_css_buffer.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_control.h b/drivers/staging/media/atomisp/pci/ia_css_control.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_control.h
rename to drivers/staging/media/atomisp/pci/ia_css_control.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.c b/drivers/staging/media/atomisp/pci/ia_css_device_access.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.c
rename to drivers/staging/media/atomisp/pci/ia_css_device_access.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.h b/drivers/staging/media/atomisp/pci/ia_css_device_access.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.h
rename to drivers/staging/media/atomisp/pci/ia_css_device_access.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_dvs.h b/drivers/staging/media/atomisp/pci/ia_css_dvs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_dvs.h
rename to drivers/staging/media/atomisp/pci/ia_css_dvs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_env.h b/drivers/staging/media/atomisp/pci/ia_css_env.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_env.h
rename to drivers/staging/media/atomisp/pci/ia_css_env.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_err.h b/drivers/staging/media/atomisp/pci/ia_css_err.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_err.h
rename to drivers/staging/media/atomisp/pci/ia_css_err.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_event_public.h b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_event_public.h
rename to drivers/staging/media/atomisp/pci/ia_css_event_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_firmware.h b/drivers/staging/media/atomisp/pci/ia_css_firmware.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_firmware.h
rename to drivers/staging/media/atomisp/pci/ia_css_firmware.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frac.h b/drivers/staging/media/atomisp/pci/ia_css_frac.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frac.h
rename to drivers/staging/media/atomisp/pci/ia_css_frac.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_format.h b/drivers/staging/media/atomisp/pci/ia_css_frame_format.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_format.h
rename to drivers/staging/media/atomisp/pci/ia_css_frame_format.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h b/drivers/staging/media/atomisp/pci/ia_css_frame_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h
rename to drivers/staging/media/atomisp/pci/ia_css_frame_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_host_data.h b/drivers/staging/media/atomisp/pci/ia_css_host_data.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_host_data.h
rename to drivers/staging/media/atomisp/pci/ia_css_host_data.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h b/drivers/staging/media/atomisp/pci/ia_css_input_port.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h
rename to drivers/staging/media/atomisp/pci/ia_css_input_port.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_irq.h b/drivers/staging/media/atomisp/pci/ia_css_irq.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_irq.h
rename to drivers/staging/media/atomisp/pci/ia_css_irq.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_isp_configs.h b/drivers/staging/media/atomisp/pci/ia_css_isp_configs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_isp_configs.h
rename to drivers/staging/media/atomisp/pci/ia_css_isp_configs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_isp_params.h b/drivers/staging/media/atomisp/pci/ia_css_isp_params.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_isp_params.h
rename to drivers/staging/media/atomisp/pci/ia_css_isp_params.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_isp_states.h b/drivers/staging/media/atomisp/pci/ia_css_isp_states.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_isp_states.h
rename to drivers/staging/media/atomisp/pci/ia_css_isp_states.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c b/drivers/staging/media/atomisp/pci/ia_css_memory_access.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c
rename to drivers/staging/media/atomisp/pci/ia_css_memory_access.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h b/drivers/staging/media/atomisp/pci/ia_css_metadata.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h
rename to drivers/staging/media/atomisp/pci/ia_css_metadata.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h b/drivers/staging/media/atomisp/pci/ia_css_mipi.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h
rename to drivers/staging/media/atomisp/pci/ia_css_mipi.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu.h b/drivers/staging/media/atomisp/pci/ia_css_mmu.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu.h
rename to drivers/staging/media/atomisp/pci/ia_css_mmu.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu_private.h b/drivers/staging/media/atomisp/pci/ia_css_mmu_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu_private.h
rename to drivers/staging/media/atomisp/pci/ia_css_mmu_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h b/drivers/staging/media/atomisp/pci/ia_css_morph.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h
rename to drivers/staging/media/atomisp/pci/ia_css_morph.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h b/drivers/staging/media/atomisp/pci/ia_css_pipe.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
rename to drivers/staging/media/atomisp/pci/ia_css_pipe.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h b/drivers/staging/media/atomisp/pci/ia_css_pipe_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h
rename to drivers/staging/media/atomisp/pci/ia_css_pipe_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_prbs.h b/drivers/staging/media/atomisp/pci/ia_css_prbs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_prbs.h
rename to drivers/staging/media/atomisp/pci/ia_css_prbs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h b/drivers/staging/media/atomisp/pci/ia_css_properties.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h
rename to drivers/staging/media/atomisp/pci/ia_css_properties.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_shading.h b/drivers/staging/media/atomisp/pci/ia_css_shading.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_shading.h
rename to drivers/staging/media/atomisp/pci/ia_css_shading.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream.h b/drivers/staging/media/atomisp/pci/ia_css_stream.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream.h
rename to drivers/staging/media/atomisp/pci/ia_css_stream.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h b/drivers/staging/media/atomisp/pci/ia_css_stream_format.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h
rename to drivers/staging/media/atomisp/pci/ia_css_stream_format.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h b/drivers/staging/media/atomisp/pci/ia_css_stream_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h
rename to drivers/staging/media/atomisp/pci/ia_css_stream_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_timer.h b/drivers/staging/media/atomisp/pci/ia_css_timer.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_timer.h
rename to drivers/staging/media/atomisp/pci/ia_css_timer.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_tpg.h b/drivers/staging/media/atomisp/pci/ia_css_tpg.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_tpg.h
rename to drivers/staging/media/atomisp/pci/ia_css_tpg.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h b/drivers/staging/media/atomisp/pci/ia_css_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
rename to drivers/staging/media/atomisp/pci/ia_css_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version.h b/drivers/staging/media/atomisp/pci/ia_css_version.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version.h
rename to drivers/staging/media/atomisp/pci/ia_css_version.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h b/drivers/staging/media/atomisp/pci/ia_css_version_data.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h
rename to drivers/staging/media/atomisp/pci/ia_css_version_data.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/if_defs.h b/drivers/staging/media/atomisp/pci/if_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/if_defs.h
rename to drivers/staging/media/atomisp/pci/if_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_formatter_subsystem_defs.h b/drivers/staging/media/atomisp/pci/input_formatter_subsystem_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_formatter_subsystem_defs.h
rename to drivers/staging/media/atomisp/pci/input_formatter_subsystem_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_selector_defs.h b/drivers/staging/media/atomisp/pci/input_selector_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_selector_defs.h
rename to drivers/staging/media/atomisp/pci/input_selector_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_switch_2400_defs.h b/drivers/staging/media/atomisp/pci/input_switch_2400_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_switch_2400_defs.h
rename to drivers/staging/media/atomisp/pci/input_switch_2400_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_ctrl_defs.h b/drivers/staging/media/atomisp/pci/input_system_ctrl_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_ctrl_defs.h
rename to drivers/staging/media/atomisp/pci/input_system_ctrl_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_defs.h b/drivers/staging/media/atomisp/pci/input_system_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_defs.h
rename to drivers/staging/media/atomisp/pci/input_system_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_global.h b/drivers/staging/media/atomisp/pci/input_system_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_global.h
rename to drivers/staging/media/atomisp/pci/input_system_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_local.h b/drivers/staging/media/atomisp/pci/input_system_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_local.h
rename to drivers/staging/media/atomisp/pci/input_system_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_private.h b/drivers/staging/media/atomisp/pci/input_system_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_private.h
rename to drivers/staging/media/atomisp/pci/input_system_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_public.h b/drivers/staging/media/atomisp/pci/input_system_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_public.h
rename to drivers/staging/media/atomisp/pci/input_system_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/irq_controller_defs.h b/drivers/staging/media/atomisp/pci/irq_controller_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/irq_controller_defs.h
rename to drivers/staging/media/atomisp/pci/irq_controller_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h b/drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_state.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_state.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h b/drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/uds/uds_1.0/ia_css_uds_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/uds/uds_1.0/ia_css_uds_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c
rename to drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h b/drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h b/drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h b/drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h
rename to drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/input_buf.isp.h b/drivers/staging/media/atomisp/pci/isp/modes/interface/input_buf.isp.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/input_buf.isp.h
rename to drivers/staging/media/atomisp/pci/isp/modes/interface/input_buf.isp.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h b/drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h
rename to drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h b/drivers/staging/media/atomisp/pci/isp/modes/interface/isp_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h
rename to drivers/staging/media/atomisp/pci/isp/modes/interface/isp_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/isp2400_input_system_global.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/isp2400_input_system_global.h
rename to drivers/staging/media/atomisp/pci/isp2400_input_system_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_local.h
rename to drivers/staging/media/atomisp/pci/isp2400_input_system_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_private.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_private.h
rename to drivers/staging/media/atomisp/pci/isp2400_input_system_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_public.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_public.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_public.h
rename to drivers/staging/media/atomisp/pci/isp2400_input_system_public.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_support.h b/drivers/staging/media/atomisp/pci/isp2400_support.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_support.h
rename to drivers/staging/media/atomisp/pci/isp2400_support.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_system_global.h b/drivers/staging/media/atomisp/pci/isp2400_system_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_system_global.h
rename to drivers/staging/media/atomisp/pci/isp2400_system_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_system_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_system_local.h
rename to drivers/staging/media/atomisp/pci/isp2400_system_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_global.h b/drivers/staging/media/atomisp/pci/isp2401_input_system_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_global.h
rename to drivers/staging/media/atomisp/pci/isp2401_input_system_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2401_input_system_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_local.h
rename to drivers/staging/media/atomisp/pci/isp2401_input_system_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_private.h b/drivers/staging/media/atomisp/pci/isp2401_input_system_private.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_private.h
rename to drivers/staging/media/atomisp/pci/isp2401_input_system_private.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_mamoiada_params.h b/drivers/staging/media/atomisp/pci/isp2401_mamoiada_params.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_mamoiada_params.h
rename to drivers/staging/media/atomisp/pci/isp2401_mamoiada_params.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_system_global.h b/drivers/staging/media/atomisp/pci/isp2401_system_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_system_global.h
rename to drivers/staging/media/atomisp/pci/isp2401_system_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_system_local.h b/drivers/staging/media/atomisp/pci/isp2401_system_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_system_local.h
rename to drivers/staging/media/atomisp/pci/isp2401_system_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp_acquisition_defs.h b/drivers/staging/media/atomisp/pci/isp_acquisition_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp_acquisition_defs.h
rename to drivers/staging/media/atomisp/pci/isp_acquisition_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp_capture_defs.h b/drivers/staging/media/atomisp/pci/isp_capture_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/isp_capture_defs.h
rename to drivers/staging/media/atomisp/pci/isp_capture_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/memory_realloc.c b/drivers/staging/media/atomisp/pci/memory_realloc.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/memory_realloc.c
rename to drivers/staging/media/atomisp/pci/memory_realloc.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c b/drivers/staging/media/atomisp/pci/mmu/isp_mmu.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c
rename to drivers/staging/media/atomisp/pci/mmu/isp_mmu.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c b/drivers/staging/media/atomisp/pci/mmu/sh_mmu_mrfld.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c
rename to drivers/staging/media/atomisp/pci/mmu/sh_mmu_mrfld.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/mmu_defs.h b/drivers/staging/media/atomisp/pci/mmu_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/mmu_defs.h
rename to drivers/staging/media/atomisp/pci/mmu_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h b/drivers/staging/media/atomisp/pci/runtime/binary/interface/ia_css_binary.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h
rename to drivers/staging/media/atomisp/pci/runtime/binary/interface/ia_css_binary.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c
rename to drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq.h b/drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq.h
rename to drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq_comm.h b/drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq_comm.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq_comm.h
rename to drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq_comm.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c b/drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c
rename to drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h
rename to drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_internal.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug_internal.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_internal.h
rename to drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug_internal.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_pipe.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug_pipe.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_pipe.h
rename to drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug_pipe.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
rename to drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/interface/ia_css_event.h b/drivers/staging/media/atomisp/pci/runtime/event/interface/ia_css_event.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/interface/ia_css_event.h
rename to drivers/staging/media/atomisp/pci/runtime/event/interface/ia_css_event.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/src/event.c b/drivers/staging/media/atomisp/pci/runtime/event/src/event.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/src/event.c
rename to drivers/staging/media/atomisp/pci/runtime/event/src/event.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/interface/ia_css_eventq.h b/drivers/staging/media/atomisp/pci/runtime/eventq/interface/ia_css_eventq.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/interface/ia_css_eventq.h
rename to drivers/staging/media/atomisp/pci/runtime/eventq/interface/ia_css_eventq.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/src/eventq.c b/drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/src/eventq.c
rename to drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame.h b/drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame.h
rename to drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame_comm.h b/drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame_comm.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame_comm.h
rename to drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame_comm.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/src/frame.c b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/src/frame.c
rename to drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/interface/ia_css_ifmtr.h b/drivers/staging/media/atomisp/pci/runtime/ifmtr/interface/ia_css_ifmtr.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/interface/ia_css_ifmtr.h
rename to drivers/staging/media/atomisp/pci/runtime/ifmtr/interface/ia_css_ifmtr.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c b/drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c
rename to drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h b/drivers/staging/media/atomisp/pci/runtime/inputfifo/interface/ia_css_inputfifo.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h
rename to drivers/staging/media/atomisp/pci/runtime/inputfifo/interface/ia_css_inputfifo.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c b/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c
rename to drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param.h b/drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param.h
rename to drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h b/drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param_types.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
rename to drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param_types.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/src/isp_param.c b/drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/src/isp_param.c
rename to drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h b/drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h
rename to drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys_comm.h b/drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys_comm.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys_comm.h
rename to drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys_comm.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.c
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.h b/drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.h
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.c
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.h b/drivers/staging/media/atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.h
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_dma_rmgr.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.c
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/isys_dma_rmgr.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.h b/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_dma_rmgr.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.h
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/isys_dma_rmgr.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_stream2mmio_rmgr.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.c
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/isys_stream2mmio_rmgr.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.h b/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_stream2mmio_rmgr.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.h
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/isys_stream2mmio_rmgr.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.c
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.h b/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.h
rename to drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline.h b/drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline.h
rename to drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline_common.h b/drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline_common.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline_common.h
rename to drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline_common.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/src/pipeline.c b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/src/pipeline.c
rename to drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue.h b/drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue.h
rename to drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue_comm.h b/drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue_comm.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue_comm.h
rename to drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue_comm.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue.c b/drivers/staging/media/atomisp/pci/runtime/queue/src/queue.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue.c
rename to drivers/staging/media/atomisp/pci/runtime/queue/src/queue.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.c b/drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.c
rename to drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.h b/drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.h
rename to drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr.h b/drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr.h
rename to drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr_vbuf.h b/drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr_vbuf.h
rename to drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c b/drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c
rename to drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c b/drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c
rename to drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl.h b/drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl.h
rename to drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl_comm.h b/drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl_comm.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl_comm.h
rename to drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl_comm.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c b/drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c
rename to drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/tagger/interface/ia_css_tagger_common.h b/drivers/staging/media/atomisp/pci/runtime/tagger/interface/ia_css_tagger_common.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/tagger/interface/ia_css_tagger_common.h
rename to drivers/staging/media/atomisp/pci/runtime/tagger/interface/ia_css_tagger_common.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/timer/src/timer.c b/drivers/staging/media/atomisp/pci/runtime/timer/src/timer.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/timer/src/timer.c
rename to drivers/staging/media/atomisp/pci/runtime/timer/src/timer.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/scalar_processor_2400_params.h b/drivers/staging/media/atomisp/pci/scalar_processor_2400_params.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/scalar_processor_2400_params.h
rename to drivers/staging/media/atomisp/pci/scalar_processor_2400_params.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
rename to drivers/staging/media/atomisp/pci/sh_css.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_defs.h b/drivers/staging/media/atomisp/pci/sh_css_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_defs.h
rename to drivers/staging/media/atomisp/pci/sh_css_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_dvs_info.h b/drivers/staging/media/atomisp/pci/sh_css_dvs_info.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_dvs_info.h
rename to drivers/staging/media/atomisp/pci/sh_css_dvs_info.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/sh_css_firmware.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
rename to drivers/staging/media/atomisp/pci/sh_css_firmware.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.h b/drivers/staging/media/atomisp/pci/sh_css_firmware.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.h
rename to drivers/staging/media/atomisp/pci/sh_css_firmware.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_frac.h b/drivers/staging/media/atomisp/pci/sh_css_frac.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_frac.h
rename to drivers/staging/media/atomisp/pci/sh_css_frac.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_host_data.c b/drivers/staging/media/atomisp/pci/sh_css_host_data.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_host_data.c
rename to drivers/staging/media/atomisp/pci/sh_css_host_data.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.c b/drivers/staging/media/atomisp/pci/sh_css_hrt.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.c
rename to drivers/staging/media/atomisp/pci/sh_css_hrt.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.h b/drivers/staging/media/atomisp/pci/sh_css_hrt.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.h
rename to drivers/staging/media/atomisp/pci/sh_css_hrt.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h b/drivers/staging/media/atomisp/pci/sh_css_internal.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h
rename to drivers/staging/media/atomisp/pci/sh_css_internal.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h b/drivers/staging/media/atomisp/pci/sh_css_legacy.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h
rename to drivers/staging/media/atomisp/pci/sh_css_legacy.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metadata.c b/drivers/staging/media/atomisp/pci/sh_css_metadata.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metadata.c
rename to drivers/staging/media/atomisp/pci/sh_css_metadata.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.c b/drivers/staging/media/atomisp/pci/sh_css_metrics.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.c
rename to drivers/staging/media/atomisp/pci/sh_css_metrics.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.h b/drivers/staging/media/atomisp/pci/sh_css_metrics.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.h
rename to drivers/staging/media/atomisp/pci/sh_css_metrics.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/sh_css_mipi.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
rename to drivers/staging/media/atomisp/pci/sh_css_mipi.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.h b/drivers/staging/media/atomisp/pci/sh_css_mipi.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.h
rename to drivers/staging/media/atomisp/pci/sh_css_mipi.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mmu.c b/drivers/staging/media/atomisp/pci/sh_css_mmu.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mmu.c
rename to drivers/staging/media/atomisp/pci/sh_css_mmu.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_morph.c b/drivers/staging/media/atomisp/pci/sh_css_morph.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_morph.c
rename to drivers/staging/media/atomisp/pci/sh_css_morph.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.c b/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.c
rename to drivers/staging/media/atomisp/pci/sh_css_param_dvs.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.h b/drivers/staging/media/atomisp/pci/sh_css_param_dvs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.h
rename to drivers/staging/media/atomisp/pci/sh_css_param_dvs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c b/drivers/staging/media/atomisp/pci/sh_css_param_shading.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c
rename to drivers/staging/media/atomisp/pci/sh_css_param_shading.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.h b/drivers/staging/media/atomisp/pci/sh_css_param_shading.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.h
rename to drivers/staging/media/atomisp/pci/sh_css_param_shading.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c
rename to drivers/staging/media/atomisp/pci/sh_css_params.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.h b/drivers/staging/media/atomisp/pci/sh_css_params.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.h
rename to drivers/staging/media/atomisp/pci/sh_css_params.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params_internal.h b/drivers/staging/media/atomisp/pci/sh_css_params_internal.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params_internal.h
rename to drivers/staging/media/atomisp/pci/sh_css_params_internal.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_pipe.c b/drivers/staging/media/atomisp/pci/sh_css_pipe.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_pipe.c
rename to drivers/staging/media/atomisp/pci/sh_css_pipe.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_properties.c b/drivers/staging/media/atomisp/pci/sh_css_properties.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_properties.c
rename to drivers/staging/media/atomisp/pci/sh_css_properties.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_shading.c b/drivers/staging/media/atomisp/pci/sh_css_shading.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_shading.c
rename to drivers/staging/media/atomisp/pci/sh_css_shading.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c b/drivers/staging/media/atomisp/pci/sh_css_sp.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c
rename to drivers/staging/media/atomisp/pci/sh_css_sp.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.h b/drivers/staging/media/atomisp/pci/sh_css_sp.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.h
rename to drivers/staging/media/atomisp/pci/sh_css_sp.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream.c b/drivers/staging/media/atomisp/pci/sh_css_stream.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream.c
rename to drivers/staging/media/atomisp/pci/sh_css_stream.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c b/drivers/staging/media/atomisp/pci/sh_css_stream_format.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c
rename to drivers/staging/media/atomisp/pci/sh_css_stream_format.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h b/drivers/staging/media/atomisp/pci/sh_css_stream_format.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h
rename to drivers/staging/media/atomisp/pci/sh_css_stream_format.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h b/drivers/staging/media/atomisp/pci/sh_css_struct.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h
rename to drivers/staging/media/atomisp/pci/sh_css_struct.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_uds.h b/drivers/staging/media/atomisp/pci/sh_css_uds.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_uds.h
rename to drivers/staging/media/atomisp/pci/sh_css_uds.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c b/drivers/staging/media/atomisp/pci/sh_css_version.c
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c
rename to drivers/staging/media/atomisp/pci/sh_css_version.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/str2mem_defs.h b/drivers/staging/media/atomisp/pci/str2mem_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/str2mem_defs.h
rename to drivers/staging/media/atomisp/pci/str2mem_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/streaming_to_mipi_defs.h b/drivers/staging/media/atomisp/pci/streaming_to_mipi_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/streaming_to_mipi_defs.h
rename to drivers/staging/media/atomisp/pci/streaming_to_mipi_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/system_global.h b/drivers/staging/media/atomisp/pci/system_global.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/system_global.h
rename to drivers/staging/media/atomisp/pci/system_global.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/system_local.h b/drivers/staging/media/atomisp/pci/system_local.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/system_local.h
rename to drivers/staging/media/atomisp/pci/system_local.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/timed_controller_defs.h b/drivers/staging/media/atomisp/pci/timed_controller_defs.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/timed_controller_defs.h
rename to drivers/staging/media/atomisp/pci/timed_controller_defs.h

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/version.h b/drivers/staging/media/atomisp/pci/version.h
similarity index 100%
rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/version.h
rename to drivers/staging/media/atomisp/pci/version.h