Commit 33c04118 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of io_ls/ subdir 



The contents of this file is identical to ipu2_io_ls, except
for the bayer directory, with is only at ipu2_io_ls.

So, get rid of the duplicated code.

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

drivers/staging/media/atomisp/pci/atomisp2/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -250,10 +250,10 @@ INCLUDES += \ 
	-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/io_ls/ \

	-I$(atomisp)/css2400/isp/kernels/io_ls/bayer_io_ls/ \

	-I$(atomisp)/css2400/isp/kernels/io_ls/common/ \

	-I$(atomisp)/css2400/isp/kernels/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/ipu2_io_ls/ \

	-I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ \

	-I$(atomisp)/css2400/isp/kernels/ipu2_io_ls/common/ \

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#ifndef __IA_CSS_COMMON_IO_PARAM

#define __IA_CSS_COMMON_IO_PARAM



#include "../common/ia_css_common_io_types.h"



#endif /* __IA_CSS_COMMON_IO_PARAM */

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#ifndef __IA_CSS_COMMON_IO_TYPES

#define __IA_CSS_COMMON_IO_TYPES



#define MAX_IO_DMA_CHANNELS 2



struct ia_css_common_io_config {

	unsigned int base_address;

	unsigned int width;

	unsigned int height;

	unsigned int stride;

	unsigned int ddr_elems_per_word;

	unsigned int dma_channel[MAX_IO_DMA_CHANNELS];

};



#endif /* __IA_CSS_COMMON_IO_TYPES */

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#ifndef __IA_CSS_YUV444_IO_PARAM

#define __IA_CSS_YUV444_IO_PARAM



#include "../common/ia_css_common_io_param.h"



#endif