Commit 929e2a61 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of some unused code 



Now that the defines which are common for both ISP2400 and ISP2401
are at system_global.h, we can get rid of the code not used by
those versions.

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

drivers/staging/media/atomisp/pci/ia_css_mipi.h

+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ int 
ia_css_mipi_frame_specify(const unsigned int	size_mem_words,

			  const bool contiguous);



#if !defined(HAS_NO_INPUT_SYSTEM)

/* @brief Register size of a CSS MIPI frame for check during capturing.

 *

 * @param[in]	port	CSI-2 port this check is registered.
@@ -58,7 +57,6 @@ ia_css_mipi_frame_specify(const unsigned int size_mem_words, 
int

ia_css_mipi_frame_enable_check_on_size(const enum mipi_port_id port,

				       const unsigned int	size_mem_words);

#endif



/* @brief Calculate the size of a mipi frame.

 *

drivers/staging/media/atomisp/pci/ia_css_stream.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <type_support.h>

#include <system_local.h>

#if !defined(HAS_NO_INPUT_SYSTEM) && !defined(USE_INPUT_SYSTEM_VERSION_2401)

#if !defined(USE_INPUT_SYSTEM_VERSION_2401)

#include <input_system.h>

#endif

#include "ia_css_types.h"
@@ -30,7 +30,7 @@ 
struct ia_css_stream {

	struct ia_css_stream_config    config;

	struct ia_css_stream_info      info;

#if !defined(HAS_NO_INPUT_SYSTEM) && !defined(USE_INPUT_SYSTEM_VERSION_2401)

#if !defined(USE_INPUT_SYSTEM_VERSION_2401)

	rx_cfg_t                       csi_rx_config;

#endif

	bool                           reconfigure_css_rx;

drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h

+0 −7
Original line number Diff line number Diff line
@@ -22,15 +22,8 @@ 
#include "ia_css_ctc_types.h"



#ifndef PIPE_GENERATION

#if defined(HAS_VAMEM_VERSION_2)

#define SH_CSS_ISP_CTC_TABLE_SIZE_LOG2       IA_CSS_VAMEM_2_CTC_TABLE_SIZE_LOG2

#define SH_CSS_ISP_CTC_TABLE_SIZE            IA_CSS_VAMEM_2_CTC_TABLE_SIZE

#elif defined(HAS_VAMEM_VERSION_1)

#define SH_CSS_ISP_CTC_TABLE_SIZE_LOG2       IA_CSS_VAMEM_1_CTC_TABLE_SIZE_LOG2

#define SH_CSS_ISP_CTC_TABLE_SIZE            IA_CSS_VAMEM_1_CTC_TABLE_SIZE

#else

#error "VAMEM should be {VERSION1, VERSION2}"

#endif



#else

/* For pipe generation, the size is not relevant */

drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c

+0 −145
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


struct ia_css_ctc_table       default_ctc_table;



#if defined(HAS_VAMEM_VERSION_2)



static const uint16_t

default_ctc_table_data[IA_CSS_VAMEM_2_CTC_TABLE_SIZE] = {
@@ -62,155 +61,11 @@ default_ctc_table_data[IA_CSS_VAMEM_2_CTC_TABLE_SIZE] = { 
	0

};



#elif defined(HAS_VAMEM_VERSION_1)



/* Default Parameters */

static const uint16_t

default_ctc_table_data[IA_CSS_VAMEM_1_CTC_TABLE_SIZE] = {

	0, 0, 256, 384, 384, 497, 765, 806,

	837, 851, 888, 901, 957, 981, 993, 1001,

	1011, 1029, 1028, 1039, 1062, 1059, 1073, 1080,

	1083, 1085, 1085, 1098, 1080, 1084, 1085, 1093,

	1078, 1073, 1070, 1069, 1077, 1066, 1072, 1063,

	1053, 1044, 1046, 1053, 1039, 1028, 1025, 1024,

	1012, 1013, 1016, 996, 992, 990, 990, 980,

	969, 968, 961, 955, 951, 949, 933, 930,

	929, 925, 921, 916, 906, 901, 895, 893,

	886, 877, 872, 869, 866, 861, 857, 849,

	845, 838, 836, 832, 823, 821, 815, 813,

	809, 805, 796, 793, 790, 785, 784, 778,

	772, 768, 766, 763, 758, 752, 749, 745,

	741, 740, 736, 730, 726, 724, 723, 718,

	711, 709, 706, 704, 701, 698, 691, 689,

	688, 683, 683, 678, 675, 673, 671, 669,

	666, 663, 661, 660, 656, 656, 653, 650,

	648, 647, 646, 643, 639, 638, 637, 635,

	633, 632, 629, 627, 626, 625, 622, 621,

	618, 618, 614, 614, 612, 609, 606, 606,

	603, 600, 600, 597, 594, 591, 590, 586,

	582, 581, 578, 575, 572, 569, 563, 560,

	557, 554, 551, 548, 545, 539, 536, 533,

	529, 527, 524, 519, 516, 513, 510, 507,

	504, 501, 498, 493, 491, 488, 485, 484,

	480, 476, 474, 471, 467, 466, 464, 460,

	459, 455, 453, 449, 447, 446, 443, 441,

	438, 435, 432, 432, 429, 427, 426, 422,

	419, 418, 416, 414, 412, 410, 408, 406,

	404, 402, 401, 398, 397, 395, 393, 390,

	389, 388, 387, 384, 382, 380, 378, 377,

	376, 375, 372, 370, 368, 368, 366, 364,

	363, 361, 360, 358, 357, 355, 354, 352,

	351, 350, 349, 346, 345, 344, 344, 342,

	340, 339, 337, 337, 336, 335, 333, 331,

	330, 329, 328, 326, 326, 324, 324, 322,

	321, 320, 318, 318, 318, 317, 315, 313,

	312, 311, 311, 310, 308, 307, 306, 306,

	304, 304, 302, 301, 300, 300, 299, 297,

	297, 296, 296, 294, 294, 292, 291, 291,

	291, 290, 288, 287, 286, 286, 287, 285,

	284, 283, 282, 282, 281, 281, 279, 278,

	278, 278, 276, 276, 275, 274, 274, 273,

	271, 270, 269, 268, 268, 267, 265, 262,

	261, 260, 260, 259, 257, 254, 252, 252,

	251, 251, 249, 246, 245, 244, 243, 242,

	240, 239, 239, 237, 235, 235, 233, 231,

	232, 230, 229, 226, 225, 224, 225, 224,

	223, 220, 219, 219, 218, 217, 217, 214,

	213, 213, 212, 211, 209, 209, 209, 208,

	206, 205, 204, 203, 204, 203, 201, 200,

	199, 197, 198, 198, 197, 195, 194, 194,

	193, 192, 192, 191, 189, 190, 189, 188,

	186, 187, 186, 185, 185, 184, 183, 181,

	183, 182, 181, 180, 179, 178, 178, 178,

	177, 176, 175, 176, 175, 174, 174, 173,

	172, 173, 172, 171, 170, 170, 169, 169,

	169, 168, 167, 166, 167, 167, 166, 165,

	164, 164, 164, 163, 164, 163, 162, 163,

	162, 161, 160, 161, 160, 160, 160, 159,

	158, 157, 158, 158, 157, 157, 156, 156,

	156, 156, 155, 155, 154, 154, 154, 154,

	154, 153, 152, 153, 152, 152, 151, 152,

	151, 152, 151, 150, 150, 149, 149, 150,

	149, 149, 148, 148, 148, 149, 148, 147,

	146, 146, 147, 146, 147, 146, 145, 146,

	146, 145, 144, 145, 144, 145, 144, 144,

	143, 143, 143, 144, 143, 142, 142, 142,

	142, 142, 142, 141, 141, 141, 141, 140,

	140, 141, 140, 140, 141, 140, 139, 139,

	139, 140, 139, 139, 138, 138, 137, 139,

	138, 138, 138, 137, 138, 137, 137, 137,

	137, 136, 137, 136, 136, 136, 136, 135,

	136, 135, 135, 135, 135, 136, 135, 135,

	134, 134, 133, 135, 134, 134, 134, 133,

	134, 133, 134, 133, 133, 132, 133, 133,

	132, 133, 132, 132, 132, 132, 131, 131,

	131, 132, 131, 131, 130, 131, 130, 132,

	131, 130, 130, 129, 130, 129, 130, 129,

	129, 129, 130, 129, 128, 128, 128, 128,

	129, 128, 128, 127, 127, 128, 128, 127,

	127, 126, 126, 127, 127, 126, 126, 126,

	127, 126, 126, 126, 125, 125, 126, 125,

	125, 124, 124, 124, 125, 125, 124, 124,

	123, 124, 124, 123, 123, 122, 122, 122,

	122, 122, 121, 120, 120, 119, 118, 118,

	118, 117, 117, 116, 115, 115, 115, 114,

	114, 113, 113, 112, 111, 111, 111, 110,

	110, 109, 109, 108, 108, 108, 107, 107,

	106, 106, 105, 105, 105, 104, 104, 103,

	103, 102, 102, 102, 102, 101, 101, 100,

	100, 99, 99, 99, 99, 99, 99, 98,

	97, 98, 97, 97, 97, 96, 96, 95,

	96, 95, 96, 95, 95, 94, 94, 95,

	94, 94, 94, 93, 93, 92, 93, 93,

	93, 93, 92, 92, 91, 92, 92, 92,

	91, 91, 90, 90, 91, 91, 91, 90,

	90, 90, 90, 91, 90, 90, 90, 89,

	89, 89, 90, 89, 89, 89, 89, 89,

	88, 89, 89, 88, 88, 88, 88, 87,

	89, 88, 88, 88, 88, 88, 87, 88,

	88, 88, 87, 87, 87, 87, 87, 88,

	87, 87, 87, 87, 87, 87, 88, 87,

	87, 87, 87, 86, 86, 87, 87, 87,

	87, 86, 86, 86, 87, 87, 86, 87,

	86, 86, 86, 87, 87, 86, 86, 86,

	86, 86, 87, 87, 86, 85, 85, 85,

	84, 85, 85, 84, 84, 83, 83, 82,

	82, 82, 81, 81, 80, 79, 79, 79,

	78, 77, 77, 76, 76, 76, 75, 74,

	74, 74, 73, 73, 72, 71, 71, 71,

	70, 70, 69, 69, 68, 68, 67, 67,

	67, 66, 66, 65, 65, 64, 64, 63,

	62, 62, 62, 61, 60, 60, 59, 59,

	58, 58, 57, 57, 56, 56, 56, 55,

	55, 54, 55, 55, 54, 53, 53, 52,

	53, 53, 52, 51, 51, 50, 51, 50,

	49, 49, 50, 49, 49, 48, 48, 47,

	47, 48, 46, 45, 45, 45, 46, 45,

	45, 44, 45, 45, 45, 43, 42, 42,

	41, 43, 41, 40, 40, 39, 40, 41,

	39, 39, 39, 39, 39, 38, 35, 35,

	34, 37, 36, 34, 33, 33, 33, 35,

	34, 32, 32, 31, 32, 30, 29, 26,

	25, 25, 27, 26, 23, 23, 23, 25,

	24, 24, 22, 21, 20, 19, 16, 14,

	13, 13, 13, 10, 9, 7, 7, 7,

	12, 12, 12, 7, 0, 0, 0, 0

};



#else

#error "VAMEM version must be one of {VAMEM_VERSION_1, VAMEM_VERSION_2}"

#endif



void

ia_css_config_ctc_table(void)

{

#if defined(HAS_VAMEM_VERSION_2)

	memcpy(default_ctc_table.data.vamem_2, default_ctc_table_data,

	       sizeof(default_ctc_table_data));

	default_ctc_table.vamem_type     = IA_CSS_VAMEM_TYPE_2;

#else

	memcpy(default_ctc_table.data.vamem_1, default_ctc_table_data,

	       sizeof(default_ctc_table_data));

	default_ctc_table.vamem_type     = 1IA_CSS_VAMEM_TYPE_1;

#endif

}

drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c

+0 −144
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "ia_css_types.h"

#include "ia_css_gc_table.host.h"



#if defined(HAS_VAMEM_VERSION_2)



struct ia_css_gamma_table default_gamma_table;
@@ -62,154 +61,11 @@ default_gamma_table_data[IA_CSS_VAMEM_2_GAMMA_TABLE_SIZE] = { 
	255

};



#elif defined(HAS_VAMEM_VERSION_1)



static const uint16_t

default_gamma_table_data[IA_CSS_VAMEM_1_GAMMA_TABLE_SIZE] = {

	0, 1, 2, 3, 4, 5, 6, 7,

	8, 9, 10, 11, 12, 13, 14, 16,

	17, 18, 19, 20, 21, 23, 24, 25,

	27, 28, 29, 31, 32, 33, 35, 36,

	38, 39, 41, 42, 44, 45, 47, 48,

	49, 51, 52, 54, 55, 57, 58, 60,

	61, 62, 64, 65, 66, 68, 69, 70,

	71, 72, 74, 75, 76, 77, 78, 79,

	80, 81, 82, 83, 84, 85, 86, 87,

	88, 89, 90, 91, 92, 93, 93, 94,

	95, 96, 97, 98, 98, 99, 100, 101,

	102, 102, 103, 104, 105, 105, 106, 107,

	108, 108, 109, 110, 110, 111, 112, 112,

	113, 114, 114, 115, 116, 116, 117, 118,

	118, 119, 120, 120, 121, 121, 122, 123,

	123, 124, 125, 125, 126, 126, 127, 127,	/* 128 */

	128, 129, 129, 130, 130, 131, 131, 132,

	132, 133, 134, 134, 135, 135, 136, 136,

	137, 137, 138, 138, 139, 139, 140, 140,

	141, 141, 142, 142, 143, 143, 144, 144,

	145, 145, 145, 146, 146, 147, 147, 148,

	148, 149, 149, 150, 150, 150, 151, 151,

	152, 152, 152, 153, 153, 154, 154, 155,

	155, 155, 156, 156, 156, 157, 157, 158,

	158, 158, 159, 159, 160, 160, 160, 161,

	161, 161, 162, 162, 162, 163, 163, 163,

	164, 164, 164, 165, 165, 165, 166, 166,

	166, 167, 167, 167, 168, 168, 168, 169,

	169, 169, 170, 170, 170, 170, 171, 171,

	171, 172, 172, 172, 172, 173, 173, 173,

	174, 174, 174, 174, 175, 175, 175, 176,

	176, 176, 176, 177, 177, 177, 177, 178,	/* 256 */

	178, 178, 178, 179, 179, 179, 179, 180,

	180, 180, 180, 181, 181, 181, 181, 182,

	182, 182, 182, 182, 183, 183, 183, 183,

	184, 184, 184, 184, 184, 185, 185, 185,

	185, 186, 186, 186, 186, 186, 187, 187,

	187, 187, 187, 188, 188, 188, 188, 188,

	189, 189, 189, 189, 189, 190, 190, 190,

	190, 190, 191, 191, 191, 191, 191, 192,

	192, 192, 192, 192, 192, 193, 193, 193,

	193, 193, 194, 194, 194, 194, 194, 194,

	195, 195, 195, 195, 195, 195, 196, 196,

	196, 196, 196, 196, 197, 197, 197, 197,

	197, 197, 198, 198, 198, 198, 198, 198,

	198, 199, 199, 199, 199, 199, 199, 200,

	200, 200, 200, 200, 200, 200, 201, 201,

	201, 201, 201, 201, 201, 202, 202, 202,	/* 384 */

	202, 202, 202, 202, 203, 203, 203, 203,

	203, 203, 203, 204, 204, 204, 204, 204,

	204, 204, 204, 205, 205, 205, 205, 205,

	205, 205, 205, 206, 206, 206, 206, 206,

	206, 206, 206, 207, 207, 207, 207, 207,

	207, 207, 207, 208, 208, 208, 208, 208,

	208, 208, 208, 209, 209, 209, 209, 209,

	209, 209, 209, 209, 210, 210, 210, 210,

	210, 210, 210, 210, 210, 211, 211, 211,

	211, 211, 211, 211, 211, 211, 212, 212,

	212, 212, 212, 212, 212, 212, 212, 213,

	213, 213, 213, 213, 213, 213, 213, 213,

	214, 214, 214, 214, 214, 214, 214, 214,

	214, 214, 215, 215, 215, 215, 215, 215,

	215, 215, 215, 216, 216, 216, 216, 216,

	216, 216, 216, 216, 216, 217, 217, 217,	/* 512 */

	217, 217, 217, 217, 217, 217, 217, 218,

	218, 218, 218, 218, 218, 218, 218, 218,

	218, 219, 219, 219, 219, 219, 219, 219,

	219, 219, 219, 220, 220, 220, 220, 220,

	220, 220, 220, 220, 220, 221, 221, 221,

	221, 221, 221, 221, 221, 221, 221, 221,

	222, 222, 222, 222, 222, 222, 222, 222,

	222, 222, 223, 223, 223, 223, 223, 223,

	223, 223, 223, 223, 223, 224, 224, 224,

	224, 224, 224, 224, 224, 224, 224, 224,

	225, 225, 225, 225, 225, 225, 225, 225,

	225, 225, 225, 226, 226, 226, 226, 226,

	226, 226, 226, 226, 226, 226, 226, 227,

	227, 227, 227, 227, 227, 227, 227, 227,

	227, 227, 228, 228, 228, 228, 228, 228,

	228, 228, 228, 228, 228, 228, 229, 229,

	229, 229, 229, 229, 229, 229, 229, 229,

	229, 229, 230, 230, 230, 230, 230, 230,

	230, 230, 230, 230, 230, 230, 231, 231,

	231, 231, 231, 231, 231, 231, 231, 231,

	231, 231, 231, 232, 232, 232, 232, 232,

	232, 232, 232, 232, 232, 232, 232, 233,

	233, 233, 233, 233, 233, 233, 233, 233,

	233, 233, 233, 233, 234, 234, 234, 234,

	234, 234, 234, 234, 234, 234, 234, 234,

	234, 235, 235, 235, 235, 235, 235, 235,

	235, 235, 235, 235, 235, 235, 236, 236,

	236, 236, 236, 236, 236, 236, 236, 236,

	236, 236, 236, 236, 237, 237, 237, 237,

	237, 237, 237, 237, 237, 237, 237, 237,

	237, 237, 238, 238, 238, 238, 238, 238,

	238, 238, 238, 238, 238, 238, 238, 238,

	239, 239, 239, 239, 239, 239, 239, 239,

	239, 239, 239, 239, 239, 239, 240, 240,

	240, 240, 240, 240, 240, 240, 240, 240,

	240, 240, 240, 240, 241, 241, 241, 241,

	241, 241, 241, 241, 241, 241, 241, 241,

	241, 241, 241, 242, 242, 242, 242, 242,

	242, 242, 242, 242, 242, 242, 242, 242,

	242, 242, 243, 243, 243, 243, 243, 243,

	243, 243, 243, 243, 243, 243, 243, 243,

	243, 244, 244, 244, 244, 244, 244, 244,

	244, 244, 244, 244, 244, 244, 244, 244,

	245, 245, 245, 245, 245, 245, 245, 245,

	245, 245, 245, 245, 245, 245, 245, 246,

	246, 246, 246, 246, 246, 246, 246, 246,

	246, 246, 246, 246, 246, 246, 246, 247,

	247, 247, 247, 247, 247, 247, 247, 247,

	247, 247, 247, 247, 247, 247, 247, 248,

	248, 248, 248, 248, 248, 248, 248, 248,

	248, 248, 248, 248, 248, 248, 248, 249,

	249, 249, 249, 249, 249, 249, 249, 249,

	249, 249, 249, 249, 249, 249, 249, 250,

	250, 250, 250, 250, 250, 250, 250, 250,

	250, 250, 250, 250, 250, 250, 250, 251,

	251, 251, 251, 251, 251, 251, 251, 251,

	251, 251, 251, 251, 251, 251, 251, 252,

	252, 252, 252, 252, 252, 252, 252, 252,

	252, 252, 252, 252, 252, 252, 252, 253,

	253, 253, 253, 253, 253, 253, 253, 253,

	253, 253, 253, 253, 253, 253, 253, 253,

	254, 254, 254, 254, 254, 254, 254, 254,

	254, 254, 254, 254, 254, 254, 254, 254,

	255, 255, 255, 255, 255, 255, 255, 255

};



#else

#error "VAMEM version must be one of {VAMEM_VERSION_1, VAMEM_VERSION_2}"

#endif



void

ia_css_config_gamma_table(void)

{

#if defined(HAS_VAMEM_VERSION_2)

	memcpy(default_gamma_table.data.vamem_2, default_gamma_table_data,

	       sizeof(default_gamma_table_data));

	default_gamma_table.vamem_type   = IA_CSS_VAMEM_TYPE_2;

#else

	memcpy(default_gamma_table.data.vamem_1, default_gamma_table_data,

	       sizeof(default_gamma_table_data));

	default_gamma_table.vamem_type   = IA_CSS_VAMEM_TYPE_1;

#endif

}