aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/media/atomisp/include/linux/atomisp_platform.h4
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h12
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c16
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h3
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c14
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h8
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h6
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c72
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h4
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h2
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h71
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h8
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c42
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h2
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h8
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c6
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c91
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c92
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h6
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c22
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h4
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c110
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c132
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c56
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c2
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c4
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c58
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h2
28 files changed, 396 insertions, 461 deletions
diff --git a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
index e0f0c379e7ce..aa5e294e7b7d 100644
--- a/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp_platform.h
@@ -104,6 +104,10 @@ enum atomisp_input_format {
104 ATOMISP_INPUT_FORMAT_USER_DEF8, /* User defined 8-bit data type 8 */ 104 ATOMISP_INPUT_FORMAT_USER_DEF8, /* User defined 8-bit data type 8 */
105}; 105};
106 106
107#define N_ATOMISP_INPUT_FORMAT (ATOMISP_INPUT_FORMAT_USER_DEF8 + 1)
108
109
110
107enum intel_v4l2_subdev_type { 111enum intel_v4l2_subdev_type {
108 RAW_CAMERA = 1, 112 RAW_CAMERA = 1,
109 SOC_CAMERA = 2, 113 SOC_CAMERA = 2,
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
index 1567572e5b49..6c829d0a1e4c 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h
@@ -253,7 +253,7 @@ void atomisp_css_isys_set_valid(struct atomisp_sub_device *asd,
253 253
254void atomisp_css_isys_set_format(struct atomisp_sub_device *asd, 254void atomisp_css_isys_set_format(struct atomisp_sub_device *asd,
255 enum atomisp_input_stream_id stream_id, 255 enum atomisp_input_stream_id stream_id,
256 enum atomisp_css_stream_format format, 256 enum atomisp_input_format format,
257 int isys_stream); 257 int isys_stream);
258 258
259int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd, 259int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd,
@@ -262,18 +262,18 @@ int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd,
262 262
263int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd, 263int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd,
264 enum atomisp_input_stream_id stream_id, 264 enum atomisp_input_stream_id stream_id,
265 enum atomisp_css_stream_format input_format); 265 enum atomisp_input_format input_format);
266 266
267void atomisp_css_isys_two_stream_cfg_update_stream1( 267void atomisp_css_isys_two_stream_cfg_update_stream1(
268 struct atomisp_sub_device *asd, 268 struct atomisp_sub_device *asd,
269 enum atomisp_input_stream_id stream_id, 269 enum atomisp_input_stream_id stream_id,
270 enum atomisp_css_stream_format input_format, 270 enum atomisp_input_format input_format,
271 unsigned int width, unsigned int height); 271 unsigned int width, unsigned int height);
272 272
273void atomisp_css_isys_two_stream_cfg_update_stream2( 273void atomisp_css_isys_two_stream_cfg_update_stream2(
274 struct atomisp_sub_device *asd, 274 struct atomisp_sub_device *asd,
275 enum atomisp_input_stream_id stream_id, 275 enum atomisp_input_stream_id stream_id,
276 enum atomisp_css_stream_format input_format, 276 enum atomisp_input_format input_format,
277 unsigned int width, unsigned int height); 277 unsigned int width, unsigned int height);
278 278
279int atomisp_css_input_set_resolution(struct atomisp_sub_device *asd, 279int atomisp_css_input_set_resolution(struct atomisp_sub_device *asd,
@@ -290,7 +290,7 @@ void atomisp_css_input_set_bayer_order(struct atomisp_sub_device *asd,
290 290
291void atomisp_css_input_set_format(struct atomisp_sub_device *asd, 291void atomisp_css_input_set_format(struct atomisp_sub_device *asd,
292 enum atomisp_input_stream_id stream_id, 292 enum atomisp_input_stream_id stream_id,
293 enum atomisp_css_stream_format format); 293 enum atomisp_input_format format);
294 294
295int atomisp_css_input_set_effective_resolution( 295int atomisp_css_input_set_effective_resolution(
296 struct atomisp_sub_device *asd, 296 struct atomisp_sub_device *asd,
@@ -336,7 +336,7 @@ int atomisp_css_input_configure_port(struct atomisp_sub_device *asd,
336 unsigned int num_lanes, 336 unsigned int num_lanes,
337 unsigned int timeout, 337 unsigned int timeout,
338 unsigned int mipi_freq, 338 unsigned int mipi_freq,
339 enum atomisp_css_stream_format metadata_format, 339 enum atomisp_input_format metadata_format,
340 unsigned int metadata_width, 340 unsigned int metadata_width,
341 unsigned int metadata_height); 341 unsigned int metadata_height);
342 342
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
index d9c8c202fd81..f668c68dc33a 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
@@ -1784,7 +1784,7 @@ void atomisp_css_isys_set_valid(struct atomisp_sub_device *asd,
1784 1784
1785void atomisp_css_isys_set_format(struct atomisp_sub_device *asd, 1785void atomisp_css_isys_set_format(struct atomisp_sub_device *asd,
1786 enum atomisp_input_stream_id stream_id, 1786 enum atomisp_input_stream_id stream_id,
1787 enum atomisp_css_stream_format format, 1787 enum atomisp_input_format format,
1788 int isys_stream) 1788 int isys_stream)
1789{ 1789{
1790 1790
@@ -1796,7 +1796,7 @@ void atomisp_css_isys_set_format(struct atomisp_sub_device *asd,
1796 1796
1797void atomisp_css_input_set_format(struct atomisp_sub_device *asd, 1797void atomisp_css_input_set_format(struct atomisp_sub_device *asd,
1798 enum atomisp_input_stream_id stream_id, 1798 enum atomisp_input_stream_id stream_id,
1799 enum atomisp_css_stream_format format) 1799 enum atomisp_input_format format)
1800{ 1800{
1801 1801
1802 struct ia_css_stream_config *s_config = 1802 struct ia_css_stream_config *s_config =
@@ -1835,7 +1835,7 @@ int atomisp_css_set_default_isys_config(struct atomisp_sub_device *asd,
1835 1835
1836int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd, 1836int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd,
1837 enum atomisp_input_stream_id stream_id, 1837 enum atomisp_input_stream_id stream_id,
1838 enum atomisp_css_stream_format input_format) 1838 enum atomisp_input_format input_format)
1839{ 1839{
1840 struct ia_css_stream_config *s_config = 1840 struct ia_css_stream_config *s_config =
1841 &asd->stream_env[stream_id].stream_config; 1841 &asd->stream_env[stream_id].stream_config;
@@ -1849,9 +1849,9 @@ int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd,
1849 s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].linked_isys_stream_id 1849 s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].linked_isys_stream_id
1850 = IA_CSS_STREAM_ISYS_STREAM_0; 1850 = IA_CSS_STREAM_ISYS_STREAM_0;
1851 s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_0].format = 1851 s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_0].format =
1852 IA_CSS_STREAM_FORMAT_USER_DEF1; 1852 ATOMISP_INPUT_FORMAT_USER_DEF1;
1853 s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].format = 1853 s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].format =
1854 IA_CSS_STREAM_FORMAT_USER_DEF2; 1854 ATOMISP_INPUT_FORMAT_USER_DEF2;
1855 s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].valid = true; 1855 s_config->isys_config[IA_CSS_STREAM_ISYS_STREAM_1].valid = true;
1856 return 0; 1856 return 0;
1857} 1857}
@@ -1859,7 +1859,7 @@ int atomisp_css_isys_two_stream_cfg(struct atomisp_sub_device *asd,
1859void atomisp_css_isys_two_stream_cfg_update_stream1( 1859void atomisp_css_isys_two_stream_cfg_update_stream1(
1860 struct atomisp_sub_device *asd, 1860 struct atomisp_sub_device *asd,
1861 enum atomisp_input_stream_id stream_id, 1861 enum atomisp_input_stream_id stream_id,
1862 enum atomisp_css_stream_format input_format, 1862 enum atomisp_input_format input_format,
1863 unsigned int width, unsigned int height) 1863 unsigned int width, unsigned int height)
1864{ 1864{
1865 struct ia_css_stream_config *s_config = 1865 struct ia_css_stream_config *s_config =
@@ -1877,7 +1877,7 @@ void atomisp_css_isys_two_stream_cfg_update_stream1(
1877void atomisp_css_isys_two_stream_cfg_update_stream2( 1877void atomisp_css_isys_two_stream_cfg_update_stream2(
1878 struct atomisp_sub_device *asd, 1878 struct atomisp_sub_device *asd,
1879 enum atomisp_input_stream_id stream_id, 1879 enum atomisp_input_stream_id stream_id,
1880 enum atomisp_css_stream_format input_format, 1880 enum atomisp_input_format input_format,
1881 unsigned int width, unsigned int height) 1881 unsigned int width, unsigned int height)
1882{ 1882{
1883 struct ia_css_stream_config *s_config = 1883 struct ia_css_stream_config *s_config =
@@ -2122,7 +2122,7 @@ int atomisp_css_input_configure_port(
2122 unsigned int num_lanes, 2122 unsigned int num_lanes,
2123 unsigned int timeout, 2123 unsigned int timeout,
2124 unsigned int mipi_freq, 2124 unsigned int mipi_freq,
2125 enum atomisp_css_stream_format metadata_format, 2125 enum atomisp_input_format metadata_format,
2126 unsigned int metadata_width, 2126 unsigned int metadata_width,
2127 unsigned int metadata_height) 2127 unsigned int metadata_height)
2128{ 2128{
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h
index b03711668eda..a06c5b6e8027 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h
@@ -37,7 +37,6 @@
37#define atomisp_css_irq_info ia_css_irq_info 37#define atomisp_css_irq_info ia_css_irq_info
38#define atomisp_css_isp_config ia_css_isp_config 38#define atomisp_css_isp_config ia_css_isp_config
39#define atomisp_css_bayer_order ia_css_bayer_order 39#define atomisp_css_bayer_order ia_css_bayer_order
40#define atomisp_css_stream_format ia_css_stream_format
41#define atomisp_css_capture_mode ia_css_capture_mode 40#define atomisp_css_capture_mode ia_css_capture_mode
42#define atomisp_css_input_mode ia_css_input_mode 41#define atomisp_css_input_mode ia_css_input_mode
43#define atomisp_css_frame ia_css_frame 42#define atomisp_css_frame ia_css_frame
@@ -117,7 +116,7 @@
117 */ 116 */
118#define CSS_ID(val) (IA_ ## val) 117#define CSS_ID(val) (IA_ ## val)
119#define CSS_EVENT(val) (IA_CSS_EVENT_TYPE_ ## val) 118#define CSS_EVENT(val) (IA_CSS_EVENT_TYPE_ ## val)
120#define CSS_FORMAT(val) (IA_CSS_STREAM_FORMAT_ ## val) 119#define CSS_FORMAT(val) (ATOMISP_INPUT_FORMAT_ ## val)
121 120
122#define CSS_EVENT_PORT_EOF CSS_EVENT(PORT_EOF) 121#define CSS_EVENT_PORT_EOF CSS_EVENT(PORT_EOF)
123#define CSS_EVENT_FRAME_TAGGED CSS_EVENT(FRAME_TAGGED) 122#define CSS_EVENT_FRAME_TAGGED CSS_EVENT(FRAME_TAGGED)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c
index b78276ac22da..49a9973b4289 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c
@@ -42,17 +42,17 @@ const struct atomisp_in_fmt_conv atomisp_in_fmt_conv[] = {
42 { MEDIA_BUS_FMT_SGBRG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_GBRG, CSS_FORMAT_RAW_12 }, 42 { MEDIA_BUS_FMT_SGBRG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_GBRG, CSS_FORMAT_RAW_12 },
43 { MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_GRBG, CSS_FORMAT_RAW_12 }, 43 { MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_GRBG, CSS_FORMAT_RAW_12 },
44 { MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_RGGB, CSS_FORMAT_RAW_12 }, 44 { MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, CSS_BAYER_ORDER_RGGB, CSS_FORMAT_RAW_12 },
45 { MEDIA_BUS_FMT_UYVY8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, IA_CSS_STREAM_FORMAT_YUV422_8 }, 45 { MEDIA_BUS_FMT_UYVY8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 },
46 { MEDIA_BUS_FMT_YUYV8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, IA_CSS_STREAM_FORMAT_YUV422_8 }, 46 { MEDIA_BUS_FMT_YUYV8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 },
47 { MEDIA_BUS_FMT_JPEG_1X8, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, IA_CSS_STREAM_FORMAT_BINARY_8 }, 47 { MEDIA_BUS_FMT_JPEG_1X8, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 },
48 { V4L2_MBUS_FMT_CUSTOM_NV12, 12, 12, CSS_FRAME_FORMAT_NV12, 0, CSS_FRAME_FORMAT_NV12 }, 48 { V4L2_MBUS_FMT_CUSTOM_NV12, 12, 12, CSS_FRAME_FORMAT_NV12, 0, CSS_FRAME_FORMAT_NV12 },
49 { V4L2_MBUS_FMT_CUSTOM_NV21, 12, 12, CSS_FRAME_FORMAT_NV21, 0, CSS_FRAME_FORMAT_NV21 }, 49 { V4L2_MBUS_FMT_CUSTOM_NV21, 12, 12, CSS_FRAME_FORMAT_NV21, 0, CSS_FRAME_FORMAT_NV21 },
50 { V4L2_MBUS_FMT_CUSTOM_YUV420, 12, 12, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, 0, IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY }, 50 { V4L2_MBUS_FMT_CUSTOM_YUV420, 12, 12, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, 0, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY },
51#if 0 51#if 0
52 { V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, IA_CSS_STREAM_FORMAT_BINARY_8 }, 52 { V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, 8, 8, CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 },
53#endif 53#endif
54 /* no valid V4L2 MBUS code for metadata format, so leave it 0. */ 54 /* no valid V4L2 MBUS code for metadata format, so leave it 0. */
55 { 0, 0, 0, ATOMISP_INPUT_FORMAT_EMBEDDED, 0, IA_CSS_STREAM_FORMAT_EMBEDDED }, 55 { 0, 0, 0, ATOMISP_INPUT_FORMAT_EMBEDDED, 0, ATOMISP_INPUT_FORMAT_EMBEDDED },
56 {} 56 {}
57}; 57};
58 58
@@ -101,7 +101,7 @@ const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv(u32 code)
101} 101}
102 102
103const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv_by_atomisp_in_fmt( 103const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv_by_atomisp_in_fmt(
104 enum atomisp_css_stream_format atomisp_in_fmt) 104 enum atomisp_input_format atomisp_in_fmt)
105{ 105{
106 int i; 106 int i;
107 107
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h
index c3eba675da06..59ff8723c182 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h
@@ -58,9 +58,9 @@ struct atomisp_in_fmt_conv {
58 u32 code; 58 u32 code;
59 uint8_t bpp; /* bits per pixel */ 59 uint8_t bpp; /* bits per pixel */
60 uint8_t depth; /* uncompressed */ 60 uint8_t depth; /* uncompressed */
61 enum atomisp_css_stream_format atomisp_in_fmt; 61 enum atomisp_input_format atomisp_in_fmt;
62 enum atomisp_css_bayer_order bayer_order; 62 enum atomisp_css_bayer_order bayer_order;
63 enum ia_css_stream_format css_stream_fmt; 63 enum atomisp_input_format css_stream_fmt;
64}; 64};
65 65
66struct atomisp_sub_device; 66struct atomisp_sub_device;
@@ -424,10 +424,10 @@ bool atomisp_subdev_is_compressed(u32 code);
424const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv(u32 code); 424const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv(u32 code);
425#ifndef ISP2401 425#ifndef ISP2401
426const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv_by_atomisp_in_fmt( 426const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv_by_atomisp_in_fmt(
427 enum atomisp_css_stream_format atomisp_in_fmt); 427 enum atomisp_input_format atomisp_in_fmt);
428#else 428#else
429const struct atomisp_in_fmt_conv 429const struct atomisp_in_fmt_conv
430 *atomisp_find_in_fmt_conv_by_atomisp_in_fmt(enum atomisp_css_stream_format 430 *atomisp_find_in_fmt_conv_by_atomisp_in_fmt(enum atomisp_input_format
431 atomisp_in_fmt); 431 atomisp_in_fmt);
432#endif 432#endif
433const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv_compressed(u32 code); 433const struct atomisp_in_fmt_conv *atomisp_find_in_fmt_conv_compressed(u32 code);
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h
index a8c27676a38b..5ab48f346790 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h
@@ -116,7 +116,7 @@ extern bool ia_css_util_resolution_is_even(
116 * 116 *
117 */ 117 */
118extern unsigned int ia_css_util_input_format_bpp( 118extern unsigned int ia_css_util_input_format_bpp(
119 enum ia_css_stream_format stream_format, 119 enum atomisp_input_format stream_format,
120 bool two_ppc); 120 bool two_ppc);
121 121
122/* @brief check if input format it raw 122/* @brief check if input format it raw
@@ -126,7 +126,7 @@ extern unsigned int ia_css_util_input_format_bpp(
126 * 126 *
127 */ 127 */
128extern bool ia_css_util_is_input_format_raw( 128extern bool ia_css_util_is_input_format_raw(
129 enum ia_css_stream_format stream_format); 129 enum atomisp_input_format stream_format);
130 130
131/* @brief check if input format it yuv 131/* @brief check if input format it yuv
132 * 132 *
@@ -135,7 +135,7 @@ extern bool ia_css_util_is_input_format_raw(
135 * 135 *
136 */ 136 */
137extern bool ia_css_util_is_input_format_yuv( 137extern bool ia_css_util_is_input_format_yuv(
138 enum ia_css_stream_format stream_format); 138 enum atomisp_input_format stream_format);
139 139
140#endif /* __IA_CSS_UTIL_H__ */ 140#endif /* __IA_CSS_UTIL_H__ */
141 141
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c
index 54193789a809..91e586112332 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c
@@ -52,55 +52,55 @@ enum ia_css_err ia_css_convert_errno(
52 52
53/* MW: Table look-up ??? */ 53/* MW: Table look-up ??? */
54unsigned int ia_css_util_input_format_bpp( 54unsigned int ia_css_util_input_format_bpp(
55 enum ia_css_stream_format format, 55 enum atomisp_input_format format,
56 bool two_ppc) 56 bool two_ppc)
57{ 57{
58 unsigned int rval = 0; 58 unsigned int rval = 0;
59 switch (format) { 59 switch (format) {
60 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: 60 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
61 case IA_CSS_STREAM_FORMAT_YUV420_8: 61 case ATOMISP_INPUT_FORMAT_YUV420_8:
62 case IA_CSS_STREAM_FORMAT_YUV422_8: 62 case ATOMISP_INPUT_FORMAT_YUV422_8:
63 case IA_CSS_STREAM_FORMAT_RGB_888: 63 case ATOMISP_INPUT_FORMAT_RGB_888:
64 case IA_CSS_STREAM_FORMAT_RAW_8: 64 case ATOMISP_INPUT_FORMAT_RAW_8:
65 case IA_CSS_STREAM_FORMAT_BINARY_8: 65 case ATOMISP_INPUT_FORMAT_BINARY_8:
66 case IA_CSS_STREAM_FORMAT_EMBEDDED: 66 case ATOMISP_INPUT_FORMAT_EMBEDDED:
67 rval = 8; 67 rval = 8;
68 break; 68 break;
69 case IA_CSS_STREAM_FORMAT_YUV420_10: 69 case ATOMISP_INPUT_FORMAT_YUV420_10:
70 case IA_CSS_STREAM_FORMAT_YUV422_10: 70 case ATOMISP_INPUT_FORMAT_YUV422_10:
71 case IA_CSS_STREAM_FORMAT_RAW_10: 71 case ATOMISP_INPUT_FORMAT_RAW_10:
72 rval = 10; 72 rval = 10;
73 break; 73 break;
74 case IA_CSS_STREAM_FORMAT_YUV420_16: 74 case ATOMISP_INPUT_FORMAT_YUV420_16:
75 case IA_CSS_STREAM_FORMAT_YUV422_16: 75 case ATOMISP_INPUT_FORMAT_YUV422_16:
76 rval = 16; 76 rval = 16;
77 break; 77 break;
78 case IA_CSS_STREAM_FORMAT_RGB_444: 78 case ATOMISP_INPUT_FORMAT_RGB_444:
79 rval = 4; 79 rval = 4;
80 break; 80 break;
81 case IA_CSS_STREAM_FORMAT_RGB_555: 81 case ATOMISP_INPUT_FORMAT_RGB_555:
82 rval = 5; 82 rval = 5;
83 break; 83 break;
84 case IA_CSS_STREAM_FORMAT_RGB_565: 84 case ATOMISP_INPUT_FORMAT_RGB_565:
85 rval = 65; 85 rval = 65;
86 break; 86 break;
87 case IA_CSS_STREAM_FORMAT_RGB_666: 87 case ATOMISP_INPUT_FORMAT_RGB_666:
88 case IA_CSS_STREAM_FORMAT_RAW_6: 88 case ATOMISP_INPUT_FORMAT_RAW_6:
89 rval = 6; 89 rval = 6;
90 break; 90 break;
91 case IA_CSS_STREAM_FORMAT_RAW_7: 91 case ATOMISP_INPUT_FORMAT_RAW_7:
92 rval = 7; 92 rval = 7;
93 break; 93 break;
94 case IA_CSS_STREAM_FORMAT_RAW_12: 94 case ATOMISP_INPUT_FORMAT_RAW_12:
95 rval = 12; 95 rval = 12;
96 break; 96 break;
97 case IA_CSS_STREAM_FORMAT_RAW_14: 97 case ATOMISP_INPUT_FORMAT_RAW_14:
98 if (two_ppc) 98 if (two_ppc)
99 rval = 14; 99 rval = 14;
100 else 100 else
101 rval = 12; 101 rval = 12;
102 break; 102 break;
103 case IA_CSS_STREAM_FORMAT_RAW_16: 103 case ATOMISP_INPUT_FORMAT_RAW_16:
104 if (two_ppc) 104 if (two_ppc)
105 rval = 16; 105 rval = 16;
106 else 106 else
@@ -175,28 +175,28 @@ bool ia_css_util_resolution_is_even(const struct ia_css_resolution resolution)
175} 175}
176 176
177#endif 177#endif
178bool ia_css_util_is_input_format_raw(enum ia_css_stream_format format) 178bool ia_css_util_is_input_format_raw(enum atomisp_input_format format)
179{ 179{
180 return ((format == IA_CSS_STREAM_FORMAT_RAW_6) || 180 return ((format == ATOMISP_INPUT_FORMAT_RAW_6) ||
181 (format == IA_CSS_STREAM_FORMAT_RAW_7) || 181 (format == ATOMISP_INPUT_FORMAT_RAW_7) ||
182 (format == IA_CSS_STREAM_FORMAT_RAW_8) || 182 (format == ATOMISP_INPUT_FORMAT_RAW_8) ||
183 (format == IA_CSS_STREAM_FORMAT_RAW_10) || 183 (format == ATOMISP_INPUT_FORMAT_RAW_10) ||
184 (format == IA_CSS_STREAM_FORMAT_RAW_12)); 184 (format == ATOMISP_INPUT_FORMAT_RAW_12));
185 /* raw_14 and raw_16 are not supported as input formats to the ISP. 185 /* raw_14 and raw_16 are not supported as input formats to the ISP.
186 * They can only be copied to a frame in memory using the 186 * They can only be copied to a frame in memory using the
187 * copy binary. 187 * copy binary.
188 */ 188 */
189} 189}
190 190
191bool ia_css_util_is_input_format_yuv(enum ia_css_stream_format format) 191bool ia_css_util_is_input_format_yuv(enum atomisp_input_format format)
192{ 192{
193 return format == IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY || 193 return format == ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY ||
194 format == IA_CSS_STREAM_FORMAT_YUV420_8 || 194 format == ATOMISP_INPUT_FORMAT_YUV420_8 ||
195 format == IA_CSS_STREAM_FORMAT_YUV420_10 || 195 format == ATOMISP_INPUT_FORMAT_YUV420_10 ||
196 format == IA_CSS_STREAM_FORMAT_YUV420_16 || 196 format == ATOMISP_INPUT_FORMAT_YUV420_16 ||
197 format == IA_CSS_STREAM_FORMAT_YUV422_8 || 197 format == ATOMISP_INPUT_FORMAT_YUV422_8 ||
198 format == IA_CSS_STREAM_FORMAT_YUV422_10 || 198 format == ATOMISP_INPUT_FORMAT_YUV422_10 ||
199 format == IA_CSS_STREAM_FORMAT_YUV422_16; 199 format == ATOMISP_INPUT_FORMAT_YUV422_16;
200} 200}
201 201
202enum ia_css_err ia_css_util_check_input( 202enum ia_css_err ia_css_util_check_input(
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h
index 8b674c98224c..ed0b6ab371da 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h
@@ -27,8 +27,8 @@
27 * to process sensor metadata. 27 * to process sensor metadata.
28 */ 28 */
29struct ia_css_metadata_config { 29struct ia_css_metadata_config {
30 enum ia_css_stream_format data_type; /** Data type of CSI-2 embedded 30 enum atomisp_input_format data_type; /** Data type of CSI-2 embedded
31 data. The default value is IA_CSS_STREAM_FORMAT_EMBEDDED. For 31 data. The default value is ATOMISP_INPUT_FORMAT_EMBEDDED. For
32 certain sensors, user can choose non-default data type for embedded 32 certain sensors, user can choose non-default data type for embedded
33 data. */ 33 data. */
34 struct ia_css_resolution resolution; /** Resolution */ 34 struct ia_css_resolution resolution; /** Resolution */
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h
index 05170c4487eb..367b2aafa5e8 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h
@@ -74,7 +74,7 @@ ia_css_mipi_frame_enable_check_on_size(const enum mipi_port_id port,
74enum ia_css_err 74enum ia_css_err
75ia_css_mipi_frame_calculate_size(const unsigned int width, 75ia_css_mipi_frame_calculate_size(const unsigned int width,
76 const unsigned int height, 76 const unsigned int height,
77 const enum ia_css_stream_format format, 77 const enum atomisp_input_format format,
78 const bool hasSOLandEOL, 78 const bool hasSOLandEOL,
79 const unsigned int embedded_data_size_words, 79 const unsigned int embedded_data_size_words,
80 unsigned int *size_mem_words); 80 unsigned int *size_mem_words);
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h
index f7e9020a86e1..f97b9eb2b19c 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h
@@ -20,75 +20,10 @@
20 */ 20 */
21 21
22#include <type_support.h> /* bool */ 22#include <type_support.h> /* bool */
23 23#include "../../../include/linux/atomisp_platform.h"
24/* The ISP streaming input interface supports the following formats.
25 * These match the corresponding MIPI formats.
26 */
27enum ia_css_stream_format {
28 IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY, /** 8 bits per subpixel */
29 IA_CSS_STREAM_FORMAT_YUV420_8, /** 8 bits per subpixel */
30 IA_CSS_STREAM_FORMAT_YUV420_10, /** 10 bits per subpixel */
31 IA_CSS_STREAM_FORMAT_YUV420_16, /** 16 bits per subpixel */
32 IA_CSS_STREAM_FORMAT_YUV422_8, /** UYVY..UYVY, 8 bits per subpixel */
33 IA_CSS_STREAM_FORMAT_YUV422_10, /** UYVY..UYVY, 10 bits per subpixel */
34 IA_CSS_STREAM_FORMAT_YUV422_16, /** UYVY..UYVY, 16 bits per subpixel */
35 IA_CSS_STREAM_FORMAT_RGB_444, /** BGR..BGR, 4 bits per subpixel */
36 IA_CSS_STREAM_FORMAT_RGB_555, /** BGR..BGR, 5 bits per subpixel */
37 IA_CSS_STREAM_FORMAT_RGB_565, /** BGR..BGR, 5 bits B and R, 6 bits G */
38 IA_CSS_STREAM_FORMAT_RGB_666, /** BGR..BGR, 6 bits per subpixel */
39 IA_CSS_STREAM_FORMAT_RGB_888, /** BGR..BGR, 8 bits per subpixel */
40 IA_CSS_STREAM_FORMAT_RAW_6, /** RAW data, 6 bits per pixel */
41 IA_CSS_STREAM_FORMAT_RAW_7, /** RAW data, 7 bits per pixel */
42 IA_CSS_STREAM_FORMAT_RAW_8, /** RAW data, 8 bits per pixel */
43 IA_CSS_STREAM_FORMAT_RAW_10, /** RAW data, 10 bits per pixel */
44 IA_CSS_STREAM_FORMAT_RAW_12, /** RAW data, 12 bits per pixel */
45 IA_CSS_STREAM_FORMAT_RAW_14, /** RAW data, 14 bits per pixel */
46 IA_CSS_STREAM_FORMAT_RAW_16, /** RAW data, 16 bits per pixel, which is
47 not specified in CSI-MIPI standard*/
48 IA_CSS_STREAM_FORMAT_BINARY_8, /** Binary byte stream, which is target at
49 JPEG. */
50
51 /* CSI2-MIPI specific format: Generic short packet data. It is used to
52 * keep the timing information for the opening/closing of shutters,
53 * triggering of flashes and etc.
54 */
55 IA_CSS_STREAM_FORMAT_GENERIC_SHORT1, /** Generic Short Packet Code 1 */
56 IA_CSS_STREAM_FORMAT_GENERIC_SHORT2, /** Generic Short Packet Code 2 */
57 IA_CSS_STREAM_FORMAT_GENERIC_SHORT3, /** Generic Short Packet Code 3 */
58 IA_CSS_STREAM_FORMAT_GENERIC_SHORT4, /** Generic Short Packet Code 4 */
59 IA_CSS_STREAM_FORMAT_GENERIC_SHORT5, /** Generic Short Packet Code 5 */
60 IA_CSS_STREAM_FORMAT_GENERIC_SHORT6, /** Generic Short Packet Code 6 */
61 IA_CSS_STREAM_FORMAT_GENERIC_SHORT7, /** Generic Short Packet Code 7 */
62 IA_CSS_STREAM_FORMAT_GENERIC_SHORT8, /** Generic Short Packet Code 8 */
63
64 /* CSI2-MIPI specific format: YUV data.
65 */
66 IA_CSS_STREAM_FORMAT_YUV420_8_SHIFT, /** YUV420 8-bit (Chroma Shifted Pixel Sampling) */
67 IA_CSS_STREAM_FORMAT_YUV420_10_SHIFT, /** YUV420 8-bit (Chroma Shifted Pixel Sampling) */
68
69 /* CSI2-MIPI specific format: Generic long packet data
70 */
71 IA_CSS_STREAM_FORMAT_EMBEDDED, /** Embedded 8-bit non Image Data */
72
73 /* CSI2-MIPI specific format: User defined byte-based data. For example,
74 * the data transmitter (e.g. the SoC sensor) can keep the JPEG data as
75 * the User Defined Data Type 4 and the MPEG data as the
76 * User Defined Data Type 7.
77 */
78 IA_CSS_STREAM_FORMAT_USER_DEF1, /** User defined 8-bit data type 1 */
79 IA_CSS_STREAM_FORMAT_USER_DEF2, /** User defined 8-bit data type 2 */
80 IA_CSS_STREAM_FORMAT_USER_DEF3, /** User defined 8-bit data type 3 */
81 IA_CSS_STREAM_FORMAT_USER_DEF4, /** User defined 8-bit data type 4 */
82 IA_CSS_STREAM_FORMAT_USER_DEF5, /** User defined 8-bit data type 5 */
83 IA_CSS_STREAM_FORMAT_USER_DEF6, /** User defined 8-bit data type 6 */
84 IA_CSS_STREAM_FORMAT_USER_DEF7, /** User defined 8-bit data type 7 */
85 IA_CSS_STREAM_FORMAT_USER_DEF8, /** User defined 8-bit data type 8 */
86};
87
88#define IA_CSS_STREAM_FORMAT_NUM IA_CSS_STREAM_FORMAT_USER_DEF8
89 24
90unsigned int ia_css_util_input_format_bpp( 25unsigned int ia_css_util_input_format_bpp(
91 enum ia_css_stream_format format, 26 enum atomisp_input_format format,
92 bool two_ppc); 27 bool two_ppc);
93 28
94#endif /* __IA_CSS_STREAM_FORMAT_H */ 29#endif /* __ATOMISP_INPUT_FORMAT_H */
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h
index ca3203357ff5..ddefad330db7 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h
@@ -62,7 +62,7 @@ enum {
62 */ 62 */
63struct ia_css_stream_isys_stream_config { 63struct ia_css_stream_isys_stream_config {
64 struct ia_css_resolution input_res; /** Resolution of input data */ 64 struct ia_css_resolution input_res; /** Resolution of input data */
65 enum ia_css_stream_format format; /** Format of input stream. This data 65 enum atomisp_input_format format; /** Format of input stream. This data
66 format will be mapped to MIPI data 66 format will be mapped to MIPI data
67 type internally. */ 67 type internally. */
68 int linked_isys_stream_id; /** default value is -1, other value means 68 int linked_isys_stream_id; /** default value is -1, other value means
@@ -77,7 +77,7 @@ struct ia_css_stream_input_config {
77 Used for CSS 2400/1 System and deprecated for other 77 Used for CSS 2400/1 System and deprecated for other
78 systems (replaced by input_effective_res in 78 systems (replaced by input_effective_res in
79 ia_css_pipe_config) */ 79 ia_css_pipe_config) */
80 enum ia_css_stream_format format; /** Format of input stream. This data 80 enum atomisp_input_format format; /** Format of input stream. This data
81 format will be mapped to MIPI data 81 format will be mapped to MIPI data
82 type internally. */ 82 type internally. */
83 enum ia_css_bayer_order bayer_order; /** Bayer order for RAW streams */ 83 enum ia_css_bayer_order bayer_order; /** Bayer order for RAW streams */
@@ -257,7 +257,7 @@ ia_css_stream_unload(struct ia_css_stream *stream);
257 * 257 *
258 * This function will return the stream format. 258 * This function will return the stream format.
259 */ 259 */
260enum ia_css_stream_format 260enum atomisp_input_format
261ia_css_stream_get_format(const struct ia_css_stream *stream); 261ia_css_stream_get_format(const struct ia_css_stream *stream);
262 262
263/* @brief Check if the stream is configured for 2 pixels per clock 263/* @brief Check if the stream is configured for 2 pixels per clock
@@ -453,7 +453,7 @@ ia_css_stream_send_input_line(const struct ia_css_stream *stream,
453 */ 453 */
454void 454void
455ia_css_stream_send_input_embedded_line(const struct ia_css_stream *stream, 455ia_css_stream_send_input_embedded_line(const struct ia_css_stream *stream,
456 enum ia_css_stream_format format, 456 enum atomisp_input_format format,
457 const unsigned short *data, 457 const unsigned short *data,
458 unsigned int width); 458 unsigned int width);
459 459
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/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
index 68a27f0cfba0..fa9ce0fedf23 100644
--- 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/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
@@ -37,34 +37,34 @@ sh_css_elems_bytes_from_info (unsigned raw_bit_depth)
37 37
38/* MW: These areMIPI / ISYS properties, not camera function properties */ 38/* MW: These areMIPI / ISYS properties, not camera function properties */
39static enum sh_stream_format 39static enum sh_stream_format
40css2isp_stream_format(enum ia_css_stream_format from) 40css2isp_stream_format(enum atomisp_input_format from)
41{ 41{
42 switch (from) { 42 switch (from) {
43 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: 43 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
44 return sh_stream_format_yuv420_legacy; 44 return sh_stream_format_yuv420_legacy;
45 case IA_CSS_STREAM_FORMAT_YUV420_8: 45 case ATOMISP_INPUT_FORMAT_YUV420_8:
46 case IA_CSS_STREAM_FORMAT_YUV420_10: 46 case ATOMISP_INPUT_FORMAT_YUV420_10:
47 case IA_CSS_STREAM_FORMAT_YUV420_16: 47 case ATOMISP_INPUT_FORMAT_YUV420_16:
48 return sh_stream_format_yuv420; 48 return sh_stream_format_yuv420;
49 case IA_CSS_STREAM_FORMAT_YUV422_8: 49 case ATOMISP_INPUT_FORMAT_YUV422_8:
50 case IA_CSS_STREAM_FORMAT_YUV422_10: 50 case ATOMISP_INPUT_FORMAT_YUV422_10:
51 case IA_CSS_STREAM_FORMAT_YUV422_16: 51 case ATOMISP_INPUT_FORMAT_YUV422_16:
52 return sh_stream_format_yuv422; 52 return sh_stream_format_yuv422;
53 case IA_CSS_STREAM_FORMAT_RGB_444: 53 case ATOMISP_INPUT_FORMAT_RGB_444:
54 case IA_CSS_STREAM_FORMAT_RGB_555: 54 case ATOMISP_INPUT_FORMAT_RGB_555:
55 case IA_CSS_STREAM_FORMAT_RGB_565: 55 case ATOMISP_INPUT_FORMAT_RGB_565:
56 case IA_CSS_STREAM_FORMAT_RGB_666: 56 case ATOMISP_INPUT_FORMAT_RGB_666:
57 case IA_CSS_STREAM_FORMAT_RGB_888: 57 case ATOMISP_INPUT_FORMAT_RGB_888:
58 return sh_stream_format_rgb; 58 return sh_stream_format_rgb;
59 case IA_CSS_STREAM_FORMAT_RAW_6: 59 case ATOMISP_INPUT_FORMAT_RAW_6:
60 case IA_CSS_STREAM_FORMAT_RAW_7: 60 case ATOMISP_INPUT_FORMAT_RAW_7:
61 case IA_CSS_STREAM_FORMAT_RAW_8: 61 case ATOMISP_INPUT_FORMAT_RAW_8:
62 case IA_CSS_STREAM_FORMAT_RAW_10: 62 case ATOMISP_INPUT_FORMAT_RAW_10:
63 case IA_CSS_STREAM_FORMAT_RAW_12: 63 case ATOMISP_INPUT_FORMAT_RAW_12:
64 case IA_CSS_STREAM_FORMAT_RAW_14: 64 case ATOMISP_INPUT_FORMAT_RAW_14:
65 case IA_CSS_STREAM_FORMAT_RAW_16: 65 case ATOMISP_INPUT_FORMAT_RAW_16:
66 return sh_stream_format_raw; 66 return sh_stream_format_raw;
67 case IA_CSS_STREAM_FORMAT_BINARY_8: 67 case ATOMISP_INPUT_FORMAT_BINARY_8:
68 default: 68 default:
69 return sh_stream_format_raw; 69 return sh_stream_format_raw;
70 } 70 }
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/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h
index 5c0b8febd79a..ae868eb5e10f 100644
--- 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/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h
@@ -28,7 +28,7 @@ struct ia_css_raw_configuration {
28 const struct ia_css_frame_info *in_info; 28 const struct ia_css_frame_info *in_info;
29 const struct ia_css_frame_info *internal_info; 29 const struct ia_css_frame_info *internal_info;
30 bool two_ppc; 30 bool two_ppc;
31 enum ia_css_stream_format stream_format; 31 enum atomisp_input_format stream_format;
32 bool deinterleaved; 32 bool deinterleaved;
33 uint8_t enable_left_padding; 33 uint8_t enable_left_padding;
34}; 34};
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h
index 732e49a241eb..b62c4d321a4e 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h
@@ -113,7 +113,7 @@ struct ia_css_binary_descr {
113#endif 113#endif
114 bool enable_capture_pp_bli; 114 bool enable_capture_pp_bli;
115 struct ia_css_resolution dvs_env; 115 struct ia_css_resolution dvs_env;
116 enum ia_css_stream_format stream_format; 116 enum atomisp_input_format stream_format;
117 struct ia_css_frame_info *in_info; /* the info of the input-frame with the 117 struct ia_css_frame_info *in_info; /* the info of the input-frame with the
118 ISP required resolution. */ 118 ISP required resolution. */
119 struct ia_css_frame_info *bds_out_info; 119 struct ia_css_frame_info *bds_out_info;
@@ -126,7 +126,7 @@ struct ia_css_binary_descr {
126 126
127struct ia_css_binary { 127struct ia_css_binary {
128 const struct ia_css_binary_xinfo *info; 128 const struct ia_css_binary_xinfo *info;
129 enum ia_css_stream_format input_format; 129 enum atomisp_input_format input_format;
130 struct ia_css_frame_info in_frame_info; 130 struct ia_css_frame_info in_frame_info;
131 struct ia_css_frame_info internal_frame_info; 131 struct ia_css_frame_info internal_frame_info;
132 struct ia_css_frame_info out_frame_info[IA_CSS_BINARY_MAX_OUTPUT_PORTS]; 132 struct ia_css_frame_info out_frame_info[IA_CSS_BINARY_MAX_OUTPUT_PORTS];
@@ -162,7 +162,7 @@ struct ia_css_binary {
162 162
163#define IA_CSS_BINARY_DEFAULT_SETTINGS \ 163#define IA_CSS_BINARY_DEFAULT_SETTINGS \
164(struct ia_css_binary) { \ 164(struct ia_css_binary) { \
165 .input_format = IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY, \ 165 .input_format = ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, \
166 .in_frame_info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \ 166 .in_frame_info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
167 .internal_frame_info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \ 167 .internal_frame_info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
168 .out_frame_info = {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, \ 168 .out_frame_info = {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, \
@@ -179,7 +179,7 @@ enum ia_css_err
179ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo, 179ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
180 bool online, 180 bool online,
181 bool two_ppc, 181 bool two_ppc,
182 enum ia_css_stream_format stream_format, 182 enum atomisp_input_format stream_format,
183 const struct ia_css_frame_info *in_info, 183 const struct ia_css_frame_info *in_info,
184 const struct ia_css_frame_info *bds_out_info, 184 const struct ia_css_frame_info *bds_out_info,
185 const struct ia_css_frame_info *out_info[], 185 const struct ia_css_frame_info *out_info[],
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c
index a0f0e9062c4c..0cd6e1da43cf 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c
@@ -861,7 +861,7 @@ binary_supports_output_format(const struct ia_css_binary_xinfo *info,
861#ifdef ISP2401 861#ifdef ISP2401
862static bool 862static bool
863binary_supports_input_format(const struct ia_css_binary_xinfo *info, 863binary_supports_input_format(const struct ia_css_binary_xinfo *info,
864 enum ia_css_stream_format format) 864 enum atomisp_input_format format)
865{ 865{
866 866
867 assert(info != NULL); 867 assert(info != NULL);
@@ -1088,7 +1088,7 @@ enum ia_css_err
1088ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo, 1088ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
1089 bool online, 1089 bool online,
1090 bool two_ppc, 1090 bool two_ppc,
1091 enum ia_css_stream_format stream_format, 1091 enum atomisp_input_format stream_format,
1092 const struct ia_css_frame_info *in_info, /* can be NULL */ 1092 const struct ia_css_frame_info *in_info, /* can be NULL */
1093 const struct ia_css_frame_info *bds_out_info, /* can be NULL */ 1093 const struct ia_css_frame_info *bds_out_info, /* can be NULL */
1094 const struct ia_css_frame_info *out_info[], /* can be NULL */ 1094 const struct ia_css_frame_info *out_info[], /* can be NULL */
@@ -1382,7 +1382,7 @@ ia_css_binary_find(struct ia_css_binary_descr *descr,
1382 int mode; 1382 int mode;
1383 bool online; 1383 bool online;
1384 bool two_ppc; 1384 bool two_ppc;
1385 enum ia_css_stream_format stream_format; 1385 enum atomisp_input_format stream_format;
1386 const struct ia_css_frame_info *req_in_info, 1386 const struct ia_css_frame_info *req_in_info,
1387 *req_bds_out_info, 1387 *req_bds_out_info,
1388 *req_out_info[IA_CSS_BINARY_MAX_OUTPUT_PORTS], 1388 *req_out_info[IA_CSS_BINARY_MAX_OUTPUT_PORTS],
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
index aa9a2d115265..4607a76dc78a 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
@@ -110,9 +110,6 @@
110/* Global variable to store the dtrace verbosity level */ 110/* Global variable to store the dtrace verbosity level */
111unsigned int ia_css_debug_trace_level = IA_CSS_DEBUG_WARNING; 111unsigned int ia_css_debug_trace_level = IA_CSS_DEBUG_WARNING;
112 112
113/* Assumes that IA_CSS_STREAM_FORMAT_BINARY_8 is last */
114#define N_IA_CSS_STREAM_FORMAT (IA_CSS_STREAM_FORMAT_BINARY_8+1)
115
116#define DPG_START "ia_css_debug_pipe_graph_dump_start " 113#define DPG_START "ia_css_debug_pipe_graph_dump_start "
117#define DPG_END " ia_css_debug_pipe_graph_dump_end\n" 114#define DPG_END " ia_css_debug_pipe_graph_dump_end\n"
118 115
@@ -141,8 +138,8 @@ static struct pipe_graph_class {
141 int width; 138 int width;
142 int eff_height; 139 int eff_height;
143 int eff_width; 140 int eff_width;
144 enum ia_css_stream_format stream_format; 141 enum atomisp_input_format stream_format;
145} pg_inst = {true, 0, 0, 0, 0, N_IA_CSS_STREAM_FORMAT}; 142} pg_inst = {true, 0, 0, 0, 0, N_ATOMISP_INPUT_FORMAT};
146 143
147static const char * const queue_id_to_str[] = { 144static const char * const queue_id_to_str[] = {
148 /* [SH_CSS_QUEUE_A_ID] =*/ "queue_A", 145 /* [SH_CSS_QUEUE_A_ID] =*/ "queue_A",
@@ -261,86 +258,86 @@ unsigned int ia_css_debug_get_dtrace_level(void)
261 return ia_css_debug_trace_level; 258 return ia_css_debug_trace_level;
262} 259}
263 260
264static const char *debug_stream_format2str(const enum ia_css_stream_format stream_format) 261static const char *debug_stream_format2str(const enum atomisp_input_format stream_format)
265{ 262{
266 switch (stream_format) { 263 switch (stream_format) {
267 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: 264 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
268 return "yuv420-8-legacy"; 265 return "yuv420-8-legacy";
269 case IA_CSS_STREAM_FORMAT_YUV420_8: 266 case ATOMISP_INPUT_FORMAT_YUV420_8:
270 return "yuv420-8"; 267 return "yuv420-8";
271 case IA_CSS_STREAM_FORMAT_YUV420_10: 268 case ATOMISP_INPUT_FORMAT_YUV420_10:
272 return "yuv420-10"; 269 return "yuv420-10";
273 case IA_CSS_STREAM_FORMAT_YUV420_16: 270 case ATOMISP_INPUT_FORMAT_YUV420_16:
274 return "yuv420-16"; 271 return "yuv420-16";
275 case IA_CSS_STREAM_FORMAT_YUV422_8: 272 case ATOMISP_INPUT_FORMAT_YUV422_8:
276 return "yuv422-8"; 273 return "yuv422-8";
277 case IA_CSS_STREAM_FORMAT_YUV422_10: 274 case ATOMISP_INPUT_FORMAT_YUV422_10:
278 return "yuv422-10"; 275 return "yuv422-10";
279 case IA_CSS_STREAM_FORMAT_YUV422_16: 276 case ATOMISP_INPUT_FORMAT_YUV422_16:
280 return "yuv422-16"; 277 return "yuv422-16";
281 case IA_CSS_STREAM_FORMAT_RGB_444: 278 case ATOMISP_INPUT_FORMAT_RGB_444:
282 return "rgb444"; 279 return "rgb444";
283 case IA_CSS_STREAM_FORMAT_RGB_555: 280 case ATOMISP_INPUT_FORMAT_RGB_555:
284 return "rgb555"; 281 return "rgb555";
285 case IA_CSS_STREAM_FORMAT_RGB_565: 282 case ATOMISP_INPUT_FORMAT_RGB_565:
286 return "rgb565"; 283 return "rgb565";
287 case IA_CSS_STREAM_FORMAT_RGB_666: 284 case ATOMISP_INPUT_FORMAT_RGB_666:
288 return "rgb666"; 285 return "rgb666";
289 case IA_CSS_STREAM_FORMAT_RGB_888: 286 case ATOMISP_INPUT_FORMAT_RGB_888:
290 return "rgb888"; 287 return "rgb888";
291 case IA_CSS_STREAM_FORMAT_RAW_6: 288 case ATOMISP_INPUT_FORMAT_RAW_6:
292 return "raw6"; 289 return "raw6";
293 case IA_CSS_STREAM_FORMAT_RAW_7: 290 case ATOMISP_INPUT_FORMAT_RAW_7:
294 return "raw7"; 291 return "raw7";
295 case IA_CSS_STREAM_FORMAT_RAW_8: 292 case ATOMISP_INPUT_FORMAT_RAW_8:
296 return "raw8"; 293 return "raw8";
297 case IA_CSS_STREAM_FORMAT_RAW_10: 294 case ATOMISP_INPUT_FORMAT_RAW_10:
298 return "raw10"; 295 return "raw10";
299 case IA_CSS_STREAM_FORMAT_RAW_12: 296 case ATOMISP_INPUT_FORMAT_RAW_12:
300 return "raw12"; 297 return "raw12";
301 case IA_CSS_STREAM_FORMAT_RAW_14: 298 case ATOMISP_INPUT_FORMAT_RAW_14:
302 return "raw14"; 299 return "raw14";
303 case IA_CSS_STREAM_FORMAT_RAW_16: 300 case ATOMISP_INPUT_FORMAT_RAW_16:
304 return "raw16"; 301 return "raw16";
305 case IA_CSS_STREAM_FORMAT_BINARY_8: 302 case ATOMISP_INPUT_FORMAT_BINARY_8:
306 return "binary8"; 303 return "binary8";
307 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT1: 304 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT1:
308 return "generic-short1"; 305 return "generic-short1";
309 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT2: 306 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT2:
310 return "generic-short2"; 307 return "generic-short2";
311 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT3: 308 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT3:
312 return "generic-short3"; 309 return "generic-short3";
313 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT4: 310 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT4:
314 return "generic-short4"; 311 return "generic-short4";
315 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT5: 312 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT5:
316 return "generic-short5"; 313 return "generic-short5";
317 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT6: 314 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT6:
318 return "generic-short6"; 315 return "generic-short6";
319 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT7: 316 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT7:
320 return "generic-short7"; 317 return "generic-short7";
321 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT8: 318 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT8:
322 return "generic-short8"; 319 return "generic-short8";
323 case IA_CSS_STREAM_FORMAT_YUV420_8_SHIFT: 320 case ATOMISP_INPUT_FORMAT_YUV420_8_SHIFT:
324 return "yuv420-8-shift"; 321 return "yuv420-8-shift";
325 case IA_CSS_STREAM_FORMAT_YUV420_10_SHIFT: 322 case ATOMISP_INPUT_FORMAT_YUV420_10_SHIFT:
326 return "yuv420-10-shift"; 323 return "yuv420-10-shift";
327 case IA_CSS_STREAM_FORMAT_EMBEDDED: 324 case ATOMISP_INPUT_FORMAT_EMBEDDED:
328 return "embedded-8"; 325 return "embedded-8";
329 case IA_CSS_STREAM_FORMAT_USER_DEF1: 326 case ATOMISP_INPUT_FORMAT_USER_DEF1:
330 return "user-def-8-type-1"; 327 return "user-def-8-type-1";
331 case IA_CSS_STREAM_FORMAT_USER_DEF2: 328 case ATOMISP_INPUT_FORMAT_USER_DEF2:
332 return "user-def-8-type-2"; 329 return "user-def-8-type-2";
333 case IA_CSS_STREAM_FORMAT_USER_DEF3: 330 case ATOMISP_INPUT_FORMAT_USER_DEF3:
334 return "user-def-8-type-3"; 331 return "user-def-8-type-3";
335 case IA_CSS_STREAM_FORMAT_USER_DEF4: 332 case ATOMISP_INPUT_FORMAT_USER_DEF4:
336 return "user-def-8-type-4"; 333 return "user-def-8-type-4";
337 case IA_CSS_STREAM_FORMAT_USER_DEF5: 334 case ATOMISP_INPUT_FORMAT_USER_DEF5:
338 return "user-def-8-type-5"; 335 return "user-def-8-type-5";
339 case IA_CSS_STREAM_FORMAT_USER_DEF6: 336 case ATOMISP_INPUT_FORMAT_USER_DEF6:
340 return "user-def-8-type-6"; 337 return "user-def-8-type-6";
341 case IA_CSS_STREAM_FORMAT_USER_DEF7: 338 case ATOMISP_INPUT_FORMAT_USER_DEF7:
342 return "user-def-8-type-7"; 339 return "user-def-8-type-7";
343 case IA_CSS_STREAM_FORMAT_USER_DEF8: 340 case ATOMISP_INPUT_FORMAT_USER_DEF8:
344 return "user-def-8-type-8"; 341 return "user-def-8-type-8";
345 342
346 default: 343 default:
@@ -2730,7 +2727,7 @@ void ia_css_debug_pipe_graph_dump_epilogue(void)
2730 } 2727 }
2731 2728
2732 2729
2733 if (pg_inst.stream_format != N_IA_CSS_STREAM_FORMAT) { 2730 if (pg_inst.stream_format != N_ATOMISP_INPUT_FORMAT) {
2734 /* An input stream format has been set so assume we have 2731 /* An input stream format has been set so assume we have
2735 * an input system and sensor 2732 * an input system and sensor
2736 */ 2733 */
@@ -2770,7 +2767,7 @@ void ia_css_debug_pipe_graph_dump_epilogue(void)
2770 pg_inst.height = 0; 2767 pg_inst.height = 0;
2771 pg_inst.eff_width = 0; 2768 pg_inst.eff_width = 0;
2772 pg_inst.eff_height = 0; 2769 pg_inst.eff_height = 0;
2773 pg_inst.stream_format = N_IA_CSS_STREAM_FORMAT; 2770 pg_inst.stream_format = N_ATOMISP_INPUT_FORMAT;
2774} 2771}
2775 2772
2776void 2773void
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c
index c031c70aee9b..1bed027435fd 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c
@@ -112,7 +112,7 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
112 width_b_factor = 1, start_column_b, 112 width_b_factor = 1, start_column_b,
113 left_padding = 0; 113 left_padding = 0;
114 input_formatter_cfg_t if_a_config, if_b_config; 114 input_formatter_cfg_t if_a_config, if_b_config;
115 enum ia_css_stream_format input_format; 115 enum atomisp_input_format input_format;
116 enum ia_css_err err = IA_CSS_SUCCESS; 116 enum ia_css_err err = IA_CSS_SUCCESS;
117 uint8_t if_config_index; 117 uint8_t if_config_index;
118 118
@@ -189,7 +189,7 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
189 bits_per_pixel = input_formatter_get_alignment(INPUT_FORMATTER0_ID) 189 bits_per_pixel = input_formatter_get_alignment(INPUT_FORMATTER0_ID)
190 * 8 / ISP_VEC_NELEMS; 190 * 8 / ISP_VEC_NELEMS;
191 switch (input_format) { 191 switch (input_format) {
192 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: 192 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
193 if (two_ppc) { 193 if (two_ppc) {
194 vmem_increment = 1; 194 vmem_increment = 1;
195 deinterleaving = 1; 195 deinterleaving = 1;
@@ -219,9 +219,9 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
219 start_column = start_column * deinterleaving / 2; 219 start_column = start_column * deinterleaving / 2;
220 } 220 }
221 break; 221 break;
222 case IA_CSS_STREAM_FORMAT_YUV420_8: 222 case ATOMISP_INPUT_FORMAT_YUV420_8:
223 case IA_CSS_STREAM_FORMAT_YUV420_10: 223 case ATOMISP_INPUT_FORMAT_YUV420_10:
224 case IA_CSS_STREAM_FORMAT_YUV420_16: 224 case ATOMISP_INPUT_FORMAT_YUV420_16:
225 if (two_ppc) { 225 if (two_ppc) {
226 vmem_increment = 1; 226 vmem_increment = 1;
227 deinterleaving = 1; 227 deinterleaving = 1;
@@ -246,9 +246,9 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
246 start_column *= deinterleaving; 246 start_column *= deinterleaving;
247 } 247 }
248 break; 248 break;
249 case IA_CSS_STREAM_FORMAT_YUV422_8: 249 case ATOMISP_INPUT_FORMAT_YUV422_8:
250 case IA_CSS_STREAM_FORMAT_YUV422_10: 250 case ATOMISP_INPUT_FORMAT_YUV422_10:
251 case IA_CSS_STREAM_FORMAT_YUV422_16: 251 case ATOMISP_INPUT_FORMAT_YUV422_16:
252 if (two_ppc) { 252 if (two_ppc) {
253 vmem_increment = 1; 253 vmem_increment = 1;
254 deinterleaving = 1; 254 deinterleaving = 1;
@@ -267,11 +267,11 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
267 start_column *= deinterleaving; 267 start_column *= deinterleaving;
268 } 268 }
269 break; 269 break;
270 case IA_CSS_STREAM_FORMAT_RGB_444: 270 case ATOMISP_INPUT_FORMAT_RGB_444:
271 case IA_CSS_STREAM_FORMAT_RGB_555: 271 case ATOMISP_INPUT_FORMAT_RGB_555:
272 case IA_CSS_STREAM_FORMAT_RGB_565: 272 case ATOMISP_INPUT_FORMAT_RGB_565:
273 case IA_CSS_STREAM_FORMAT_RGB_666: 273 case ATOMISP_INPUT_FORMAT_RGB_666:
274 case IA_CSS_STREAM_FORMAT_RGB_888: 274 case ATOMISP_INPUT_FORMAT_RGB_888:
275 num_vectors *= 2; 275 num_vectors *= 2;
276 if (two_ppc) { 276 if (two_ppc) {
277 deinterleaving = 2; /* BR in if_a, G in if_b */ 277 deinterleaving = 2; /* BR in if_a, G in if_b */
@@ -293,11 +293,11 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
293 num_vectors = num_vectors / 2 * deinterleaving; 293 num_vectors = num_vectors / 2 * deinterleaving;
294 buf_offset_b = buffer_width / 2 / ISP_VEC_NELEMS; 294 buf_offset_b = buffer_width / 2 / ISP_VEC_NELEMS;
295 break; 295 break;
296 case IA_CSS_STREAM_FORMAT_RAW_6: 296 case ATOMISP_INPUT_FORMAT_RAW_6:
297 case IA_CSS_STREAM_FORMAT_RAW_7: 297 case ATOMISP_INPUT_FORMAT_RAW_7:
298 case IA_CSS_STREAM_FORMAT_RAW_8: 298 case ATOMISP_INPUT_FORMAT_RAW_8:
299 case IA_CSS_STREAM_FORMAT_RAW_10: 299 case ATOMISP_INPUT_FORMAT_RAW_10:
300 case IA_CSS_STREAM_FORMAT_RAW_12: 300 case ATOMISP_INPUT_FORMAT_RAW_12:
301 if (two_ppc) { 301 if (two_ppc) {
302 int crop_col = (start_column % 2) == 1; 302 int crop_col = (start_column % 2) == 1;
303 vmem_increment = 2; 303 vmem_increment = 2;
@@ -332,8 +332,8 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
332 vectors_per_line = CEIL_DIV(cropped_width, ISP_VEC_NELEMS); 332 vectors_per_line = CEIL_DIV(cropped_width, ISP_VEC_NELEMS);
333 vectors_per_line = CEIL_MUL(vectors_per_line, deinterleaving); 333 vectors_per_line = CEIL_MUL(vectors_per_line, deinterleaving);
334 break; 334 break;
335 case IA_CSS_STREAM_FORMAT_RAW_14: 335 case ATOMISP_INPUT_FORMAT_RAW_14:
336 case IA_CSS_STREAM_FORMAT_RAW_16: 336 case ATOMISP_INPUT_FORMAT_RAW_16:
337 if (two_ppc) { 337 if (two_ppc) {
338 num_vectors *= 2; 338 num_vectors *= 2;
339 vmem_increment = 1; 339 vmem_increment = 1;
@@ -350,26 +350,26 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
350 } 350 }
351 buffer_height *= 2; 351 buffer_height *= 2;
352 break; 352 break;
353 case IA_CSS_STREAM_FORMAT_BINARY_8: 353 case ATOMISP_INPUT_FORMAT_BINARY_8:
354 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT1: 354 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT1:
355 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT2: 355 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT2:
356 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT3: 356 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT3:
357 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT4: 357 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT4:
358 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT5: 358 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT5:
359 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT6: 359 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT6:
360 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT7: 360 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT7:
361 case IA_CSS_STREAM_FORMAT_GENERIC_SHORT8: 361 case ATOMISP_INPUT_FORMAT_GENERIC_SHORT8:
362 case IA_CSS_STREAM_FORMAT_YUV420_8_SHIFT: 362 case ATOMISP_INPUT_FORMAT_YUV420_8_SHIFT:
363 case IA_CSS_STREAM_FORMAT_YUV420_10_SHIFT: 363 case ATOMISP_INPUT_FORMAT_YUV420_10_SHIFT:
364 case IA_CSS_STREAM_FORMAT_EMBEDDED: 364 case ATOMISP_INPUT_FORMAT_EMBEDDED:
365 case IA_CSS_STREAM_FORMAT_USER_DEF1: 365 case ATOMISP_INPUT_FORMAT_USER_DEF1:
366 case IA_CSS_STREAM_FORMAT_USER_DEF2: 366 case ATOMISP_INPUT_FORMAT_USER_DEF2:
367 case IA_CSS_STREAM_FORMAT_USER_DEF3: 367 case ATOMISP_INPUT_FORMAT_USER_DEF3:
368 case IA_CSS_STREAM_FORMAT_USER_DEF4: 368 case ATOMISP_INPUT_FORMAT_USER_DEF4:
369 case IA_CSS_STREAM_FORMAT_USER_DEF5: 369 case ATOMISP_INPUT_FORMAT_USER_DEF5:
370 case IA_CSS_STREAM_FORMAT_USER_DEF6: 370 case ATOMISP_INPUT_FORMAT_USER_DEF6:
371 case IA_CSS_STREAM_FORMAT_USER_DEF7: 371 case ATOMISP_INPUT_FORMAT_USER_DEF7:
372 case IA_CSS_STREAM_FORMAT_USER_DEF8: 372 case ATOMISP_INPUT_FORMAT_USER_DEF8:
373 break; 373 break;
374 } 374 }
375 if (width_a == 0) 375 if (width_a == 0)
@@ -420,9 +420,9 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
420 if_a_config.buf_eol_offset = 420 if_a_config.buf_eol_offset =
421 buffer_width * bits_per_pixel / 8 - line_width; 421 buffer_width * bits_per_pixel / 8 - line_width;
422 if_a_config.is_yuv420_format = 422 if_a_config.is_yuv420_format =
423 (input_format == IA_CSS_STREAM_FORMAT_YUV420_8) 423 (input_format == ATOMISP_INPUT_FORMAT_YUV420_8)
424 || (input_format == IA_CSS_STREAM_FORMAT_YUV420_10) 424 || (input_format == ATOMISP_INPUT_FORMAT_YUV420_10)
425 || (input_format == IA_CSS_STREAM_FORMAT_YUV420_16); 425 || (input_format == ATOMISP_INPUT_FORMAT_YUV420_16);
426 if_a_config.block_no_reqs = (config->mode != IA_CSS_INPUT_MODE_SENSOR); 426 if_a_config.block_no_reqs = (config->mode != IA_CSS_INPUT_MODE_SENSOR);
427 427
428 if (two_ppc) { 428 if (two_ppc) {
@@ -449,9 +449,9 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,
449 if_b_config.buf_eol_offset = 449 if_b_config.buf_eol_offset =
450 buffer_width * bits_per_pixel / 8 - line_width; 450 buffer_width * bits_per_pixel / 8 - line_width;
451 if_b_config.is_yuv420_format = 451 if_b_config.is_yuv420_format =
452 input_format == IA_CSS_STREAM_FORMAT_YUV420_8 452 input_format == ATOMISP_INPUT_FORMAT_YUV420_8
453 || input_format == IA_CSS_STREAM_FORMAT_YUV420_10 453 || input_format == ATOMISP_INPUT_FORMAT_YUV420_10
454 || input_format == IA_CSS_STREAM_FORMAT_YUV420_16; 454 || input_format == ATOMISP_INPUT_FORMAT_YUV420_16;
455 if_b_config.block_no_reqs = 455 if_b_config.block_no_reqs =
456 (config->mode != IA_CSS_INPUT_MODE_SENSOR); 456 (config->mode != IA_CSS_INPUT_MODE_SENSOR);
457 457
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h
index 47d0f7e53f47..545f9e2da59e 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h
@@ -42,12 +42,12 @@ void ia_css_inputfifo_send_input_frame(
42 unsigned int width, 42 unsigned int width,
43 unsigned int height, 43 unsigned int height,
44 unsigned int ch_id, 44 unsigned int ch_id,
45 enum ia_css_stream_format input_format, 45 enum atomisp_input_format input_format,
46 bool two_ppc); 46 bool two_ppc);
47 47
48void ia_css_inputfifo_start_frame( 48void ia_css_inputfifo_start_frame(
49 unsigned int ch_id, 49 unsigned int ch_id,
50 enum ia_css_stream_format input_format, 50 enum atomisp_input_format input_format,
51 bool two_ppc); 51 bool two_ppc);
52 52
53void ia_css_inputfifo_send_line( 53void ia_css_inputfifo_send_line(
@@ -59,7 +59,7 @@ void ia_css_inputfifo_send_line(
59 59
60void ia_css_inputfifo_send_embedded_line( 60void ia_css_inputfifo_send_embedded_line(
61 unsigned int ch_id, 61 unsigned int ch_id,
62 enum ia_css_stream_format data_type, 62 enum atomisp_input_format data_type,
63 const unsigned short *data, 63 const unsigned short *data,
64 unsigned int width); 64 unsigned int width);
65 65
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c
index 8dc74927e9a2..24ca4aaf8df1 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c
@@ -86,7 +86,7 @@ static unsigned int inputfifo_curr_ch_id, inputfifo_curr_fmt_type;
86#endif 86#endif
87struct inputfifo_instance { 87struct inputfifo_instance {
88 unsigned int ch_id; 88 unsigned int ch_id;
89 enum ia_css_stream_format input_format; 89 enum atomisp_input_format input_format;
90 bool two_ppc; 90 bool two_ppc;
91 bool streaming; 91 bool streaming;
92 unsigned int hblank_cycles; 92 unsigned int hblank_cycles;
@@ -466,21 +466,21 @@ static void inputfifo_send_frame(
466 466
467 467
468static enum inputfifo_mipi_data_type inputfifo_determine_type( 468static enum inputfifo_mipi_data_type inputfifo_determine_type(
469 enum ia_css_stream_format input_format) 469 enum atomisp_input_format input_format)
470{ 470{
471 enum inputfifo_mipi_data_type type; 471 enum inputfifo_mipi_data_type type;
472 472
473 type = inputfifo_mipi_data_type_regular; 473 type = inputfifo_mipi_data_type_regular;
474 if (input_format == IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY) { 474 if (input_format == ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY) {
475 type = 475 type =
476 inputfifo_mipi_data_type_yuv420_legacy; 476 inputfifo_mipi_data_type_yuv420_legacy;
477 } else if (input_format == IA_CSS_STREAM_FORMAT_YUV420_8 || 477 } else if (input_format == ATOMISP_INPUT_FORMAT_YUV420_8 ||
478 input_format == IA_CSS_STREAM_FORMAT_YUV420_10 || 478 input_format == ATOMISP_INPUT_FORMAT_YUV420_10 ||
479 input_format == IA_CSS_STREAM_FORMAT_YUV420_16) { 479 input_format == ATOMISP_INPUT_FORMAT_YUV420_16) {
480 type = 480 type =
481 inputfifo_mipi_data_type_yuv420; 481 inputfifo_mipi_data_type_yuv420;
482 } else if (input_format >= IA_CSS_STREAM_FORMAT_RGB_444 && 482 } else if (input_format >= ATOMISP_INPUT_FORMAT_RGB_444 &&
483 input_format <= IA_CSS_STREAM_FORMAT_RGB_888) { 483 input_format <= ATOMISP_INPUT_FORMAT_RGB_888) {
484 type = 484 type =
485 inputfifo_mipi_data_type_rgb; 485 inputfifo_mipi_data_type_rgb;
486 } 486 }
@@ -500,7 +500,7 @@ void ia_css_inputfifo_send_input_frame(
500 unsigned int width, 500 unsigned int width,
501 unsigned int height, 501 unsigned int height,
502 unsigned int ch_id, 502 unsigned int ch_id,
503 enum ia_css_stream_format input_format, 503 enum atomisp_input_format input_format,
504 bool two_ppc) 504 bool two_ppc)
505{ 505{
506 unsigned int fmt_type, hblank_cycles, marker_cycles; 506 unsigned int fmt_type, hblank_cycles, marker_cycles;
@@ -524,7 +524,7 @@ void ia_css_inputfifo_send_input_frame(
524 524
525void ia_css_inputfifo_start_frame( 525void ia_css_inputfifo_start_frame(
526 unsigned int ch_id, 526 unsigned int ch_id,
527 enum ia_css_stream_format input_format, 527 enum atomisp_input_format input_format,
528 bool two_ppc) 528 bool two_ppc)
529{ 529{
530 struct inputfifo_instance *s2mi; 530 struct inputfifo_instance *s2mi;
@@ -574,7 +574,7 @@ void ia_css_inputfifo_send_line(
574 574
575void ia_css_inputfifo_send_embedded_line( 575void ia_css_inputfifo_send_embedded_line(
576 unsigned int ch_id, 576 unsigned int ch_id,
577 enum ia_css_stream_format data_type, 577 enum atomisp_input_format data_type,
578 const unsigned short *data, 578 const unsigned short *data,
579 unsigned int width) 579 unsigned int width)
580{ 580{
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h
index 5f5ee28a157f..8c005db9766e 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h
@@ -90,7 +90,7 @@ enum ia_css_err ia_css_isys_convert_compressed_format(
90 struct ia_css_csi2_compression *comp, 90 struct ia_css_csi2_compression *comp,
91 struct input_system_cfg_s *cfg); 91 struct input_system_cfg_s *cfg);
92unsigned int ia_css_csi2_calculate_input_system_alignment( 92unsigned int ia_css_csi2_calculate_input_system_alignment(
93 enum ia_css_stream_format fmt_type); 93 enum atomisp_input_format fmt_type);
94#endif 94#endif
95 95
96#if !defined(USE_INPUT_SYSTEM_VERSION_2401) 96#if !defined(USE_INPUT_SYSTEM_VERSION_2401)
@@ -124,7 +124,7 @@ unsigned int ia_css_isys_rx_translate_irq_infos(unsigned int bits);
124 * format type must be sumitted correctly by the application. 124 * format type must be sumitted correctly by the application.
125 */ 125 */
126enum ia_css_err ia_css_isys_convert_stream_format_to_mipi_format( 126enum ia_css_err ia_css_isys_convert_stream_format_to_mipi_format(
127 enum ia_css_stream_format input_format, 127 enum atomisp_input_format input_format,
128 mipi_predictor_t compression, 128 mipi_predictor_t compression,
129 unsigned int *fmt_type); 129 unsigned int *fmt_type);
130 130
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c
index 65ddff137291..425bd3cc3f34 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c
@@ -229,7 +229,7 @@ void ia_css_isys_rx_clear_irq_info(enum mipi_port_id port, unsigned int irq_info
229#endif /* #if !defined(USE_INPUT_SYSTEM_VERSION_2401) */ 229#endif /* #if !defined(USE_INPUT_SYSTEM_VERSION_2401) */
230 230
231enum ia_css_err ia_css_isys_convert_stream_format_to_mipi_format( 231enum ia_css_err ia_css_isys_convert_stream_format_to_mipi_format(
232 enum ia_css_stream_format input_format, 232 enum atomisp_input_format input_format,
233 mipi_predictor_t compression, 233 mipi_predictor_t compression,
234 unsigned int *fmt_type) 234 unsigned int *fmt_type)
235{ 235{
@@ -244,25 +244,25 @@ enum ia_css_err ia_css_isys_convert_stream_format_to_mipi_format(
244 */ 244 */
245 if (compression != MIPI_PREDICTOR_NONE) { 245 if (compression != MIPI_PREDICTOR_NONE) {
246 switch (input_format) { 246 switch (input_format) {
247 case IA_CSS_STREAM_FORMAT_RAW_6: 247 case ATOMISP_INPUT_FORMAT_RAW_6:
248 *fmt_type = 6; 248 *fmt_type = 6;
249 break; 249 break;
250 case IA_CSS_STREAM_FORMAT_RAW_7: 250 case ATOMISP_INPUT_FORMAT_RAW_7:
251 *fmt_type = 7; 251 *fmt_type = 7;
252 break; 252 break;
253 case IA_CSS_STREAM_FORMAT_RAW_8: 253 case ATOMISP_INPUT_FORMAT_RAW_8:
254 *fmt_type = 8; 254 *fmt_type = 8;
255 break; 255 break;
256 case IA_CSS_STREAM_FORMAT_RAW_10: 256 case ATOMISP_INPUT_FORMAT_RAW_10:
257 *fmt_type = 10; 257 *fmt_type = 10;
258 break; 258 break;
259 case IA_CSS_STREAM_FORMAT_RAW_12: 259 case ATOMISP_INPUT_FORMAT_RAW_12:
260 *fmt_type = 12; 260 *fmt_type = 12;
261 break; 261 break;
262 case IA_CSS_STREAM_FORMAT_RAW_14: 262 case ATOMISP_INPUT_FORMAT_RAW_14:
263 *fmt_type = 14; 263 *fmt_type = 14;
264 break; 264 break;
265 case IA_CSS_STREAM_FORMAT_RAW_16: 265 case ATOMISP_INPUT_FORMAT_RAW_16:
266 *fmt_type = 16; 266 *fmt_type = 16;
267 break; 267 break;
268 default: 268 default:
@@ -277,96 +277,96 @@ enum ia_css_err ia_css_isys_convert_stream_format_to_mipi_format(
277 * MW: For some reason the mapping is not 1-to-1 277 * MW: For some reason the mapping is not 1-to-1
278 */ 278 */
279 switch (input_format) { 279 switch (input_format) {
280 case IA_CSS_STREAM_FORMAT_RGB_888: 280 case ATOMISP_INPUT_FORMAT_RGB_888:
281 *fmt_type = MIPI_FORMAT_RGB888; 281 *fmt_type = MIPI_FORMAT_RGB888;
282 break; 282 break;
283 case IA_CSS_STREAM_FORMAT_RGB_555: 283 case ATOMISP_INPUT_FORMAT_RGB_555:
284 *fmt_type = MIPI_FORMAT_RGB555; 284 *fmt_type = MIPI_FORMAT_RGB555;
285 break; 285 break;
286 case IA_CSS_STREAM_FORMAT_RGB_444: 286 case ATOMISP_INPUT_FORMAT_RGB_444:
287 *fmt_type = MIPI_FORMAT_RGB444; 287 *fmt_type = MIPI_FORMAT_RGB444;
288 break; 288 break;
289 case IA_CSS_STREAM_FORMAT_RGB_565: 289 case ATOMISP_INPUT_FORMAT_RGB_565:
290 *fmt_type = MIPI_FORMAT_RGB565; 290 *fmt_type = MIPI_FORMAT_RGB565;
291 break; 291 break;
292 case IA_CSS_STREAM_FORMAT_RGB_666: 292 case ATOMISP_INPUT_FORMAT_RGB_666:
293 *fmt_type = MIPI_FORMAT_RGB666; 293 *fmt_type = MIPI_FORMAT_RGB666;
294 break; 294 break;
295 case IA_CSS_STREAM_FORMAT_RAW_8: 295 case ATOMISP_INPUT_FORMAT_RAW_8:
296 *fmt_type = MIPI_FORMAT_RAW8; 296 *fmt_type = MIPI_FORMAT_RAW8;
297 break; 297 break;
298 case IA_CSS_STREAM_FORMAT_RAW_10: 298 case ATOMISP_INPUT_FORMAT_RAW_10:
299 *fmt_type = MIPI_FORMAT_RAW10; 299 *fmt_type = MIPI_FORMAT_RAW10;
300 break; 300 break;
301 case IA_CSS_STREAM_FORMAT_RAW_6: 301 case ATOMISP_INPUT_FORMAT_RAW_6:
302 *fmt_type = MIPI_FORMAT_RAW6; 302 *fmt_type = MIPI_FORMAT_RAW6;
303 break; 303 break;
304 case IA_CSS_STREAM_FORMAT_RAW_7: 304 case ATOMISP_INPUT_FORMAT_RAW_7:
305 *fmt_type = MIPI_FORMAT_RAW7; 305 *fmt_type = MIPI_FORMAT_RAW7;
306 break; 306 break;
307 case IA_CSS_STREAM_FORMAT_RAW_12: 307 case ATOMISP_INPUT_FORMAT_RAW_12:
308 *fmt_type = MIPI_FORMAT_RAW12; 308 *fmt_type = MIPI_FORMAT_RAW12;
309 break; 309 break;
310 case IA_CSS_STREAM_FORMAT_RAW_14: 310 case ATOMISP_INPUT_FORMAT_RAW_14:
311 *fmt_type = MIPI_FORMAT_RAW14; 311 *fmt_type = MIPI_FORMAT_RAW14;
312 break; 312 break;
313 case IA_CSS_STREAM_FORMAT_YUV420_8: 313 case ATOMISP_INPUT_FORMAT_YUV420_8:
314 *fmt_type = MIPI_FORMAT_YUV420_8; 314 *fmt_type = MIPI_FORMAT_YUV420_8;
315 break; 315 break;
316 case IA_CSS_STREAM_FORMAT_YUV420_10: 316 case ATOMISP_INPUT_FORMAT_YUV420_10:
317 *fmt_type = MIPI_FORMAT_YUV420_10; 317 *fmt_type = MIPI_FORMAT_YUV420_10;
318 break; 318 break;
319 case IA_CSS_STREAM_FORMAT_YUV422_8: 319 case ATOMISP_INPUT_FORMAT_YUV422_8:
320 *fmt_type = MIPI_FORMAT_YUV422_8; 320 *fmt_type = MIPI_FORMAT_YUV422_8;
321 break; 321 break;
322 case IA_CSS_STREAM_FORMAT_YUV422_10: 322 case ATOMISP_INPUT_FORMAT_YUV422_10:
323 *fmt_type = MIPI_FORMAT_YUV422_10; 323 *fmt_type = MIPI_FORMAT_YUV422_10;
324 break; 324 break;
325 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: 325 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
326 *fmt_type = MIPI_FORMAT_YUV420_8_LEGACY; 326 *fmt_type = MIPI_FORMAT_YUV420_8_LEGACY;
327 break; 327 break;
328 case IA_CSS_STREAM_FORMAT_EMBEDDED: 328 case ATOMISP_INPUT_FORMAT_EMBEDDED:
329 *fmt_type = MIPI_FORMAT_EMBEDDED; 329 *fmt_type = MIPI_FORMAT_EMBEDDED;
330 break; 330 break;
331#ifndef USE_INPUT_SYSTEM_VERSION_2401 331#ifndef USE_INPUT_SYSTEM_VERSION_2401
332 case IA_CSS_STREAM_FORMAT_RAW_16: 332 case ATOMISP_INPUT_FORMAT_RAW_16:
333 /* This is not specified by Arasan, so we use 333 /* This is not specified by Arasan, so we use
334 * 17 for now. 334 * 17 for now.
335 */ 335 */
336 *fmt_type = MIPI_FORMAT_RAW16; 336 *fmt_type = MIPI_FORMAT_RAW16;
337 break; 337 break;
338 case IA_CSS_STREAM_FORMAT_BINARY_8: 338 case ATOMISP_INPUT_FORMAT_BINARY_8:
339 *fmt_type = MIPI_FORMAT_BINARY_8; 339 *fmt_type = MIPI_FORMAT_BINARY_8;
340 break; 340 break;
341#else 341#else
342 case IA_CSS_STREAM_FORMAT_USER_DEF1: 342 case ATOMISP_INPUT_FORMAT_USER_DEF1:
343 *fmt_type = MIPI_FORMAT_CUSTOM0; 343 *fmt_type = MIPI_FORMAT_CUSTOM0;
344 break; 344 break;
345 case IA_CSS_STREAM_FORMAT_USER_DEF2: 345 case ATOMISP_INPUT_FORMAT_USER_DEF2:
346 *fmt_type = MIPI_FORMAT_CUSTOM1; 346 *fmt_type = MIPI_FORMAT_CUSTOM1;
347 break; 347 break;
348 case IA_CSS_STREAM_FORMAT_USER_DEF3: 348 case ATOMISP_INPUT_FORMAT_USER_DEF3:
349 *fmt_type = MIPI_FORMAT_CUSTOM2; 349 *fmt_type = MIPI_FORMAT_CUSTOM2;
350 break; 350 break;
351 case IA_CSS_STREAM_FORMAT_USER_DEF4: 351 case ATOMISP_INPUT_FORMAT_USER_DEF4:
352 *fmt_type = MIPI_FORMAT_CUSTOM3; 352 *fmt_type = MIPI_FORMAT_CUSTOM3;
353 break; 353 break;
354 case IA_CSS_STREAM_FORMAT_USER_DEF5: 354 case ATOMISP_INPUT_FORMAT_USER_DEF5:
355 *fmt_type = MIPI_FORMAT_CUSTOM4; 355 *fmt_type = MIPI_FORMAT_CUSTOM4;
356 break; 356 break;
357 case IA_CSS_STREAM_FORMAT_USER_DEF6: 357 case ATOMISP_INPUT_FORMAT_USER_DEF6:
358 *fmt_type = MIPI_FORMAT_CUSTOM5; 358 *fmt_type = MIPI_FORMAT_CUSTOM5;
359 break; 359 break;
360 case IA_CSS_STREAM_FORMAT_USER_DEF7: 360 case ATOMISP_INPUT_FORMAT_USER_DEF7:
361 *fmt_type = MIPI_FORMAT_CUSTOM6; 361 *fmt_type = MIPI_FORMAT_CUSTOM6;
362 break; 362 break;
363 case IA_CSS_STREAM_FORMAT_USER_DEF8: 363 case ATOMISP_INPUT_FORMAT_USER_DEF8:
364 *fmt_type = MIPI_FORMAT_CUSTOM7; 364 *fmt_type = MIPI_FORMAT_CUSTOM7;
365 break; 365 break;
366#endif 366#endif
367 367
368 case IA_CSS_STREAM_FORMAT_YUV420_16: 368 case ATOMISP_INPUT_FORMAT_YUV420_16:
369 case IA_CSS_STREAM_FORMAT_YUV422_16: 369 case ATOMISP_INPUT_FORMAT_YUV422_16:
370 default: 370 default:
371 return IA_CSS_ERR_INTERNAL_ERROR; 371 return IA_CSS_ERR_INTERNAL_ERROR;
372 } 372 }
@@ -448,34 +448,34 @@ enum ia_css_err ia_css_isys_convert_compressed_format(
448} 448}
449 449
450unsigned int ia_css_csi2_calculate_input_system_alignment( 450unsigned int ia_css_csi2_calculate_input_system_alignment(
451 enum ia_css_stream_format fmt_type) 451 enum atomisp_input_format fmt_type)
452{ 452{
453 unsigned int memory_alignment_in_bytes = HIVE_ISP_DDR_WORD_BYTES; 453 unsigned int memory_alignment_in_bytes = HIVE_ISP_DDR_WORD_BYTES;
454 454
455 switch (fmt_type) { 455 switch (fmt_type) {
456 case IA_CSS_STREAM_FORMAT_RAW_6: 456 case ATOMISP_INPUT_FORMAT_RAW_6:
457 case IA_CSS_STREAM_FORMAT_RAW_7: 457 case ATOMISP_INPUT_FORMAT_RAW_7:
458 case IA_CSS_STREAM_FORMAT_RAW_8: 458 case ATOMISP_INPUT_FORMAT_RAW_8:
459 case IA_CSS_STREAM_FORMAT_RAW_10: 459 case ATOMISP_INPUT_FORMAT_RAW_10:
460 case IA_CSS_STREAM_FORMAT_RAW_12: 460 case ATOMISP_INPUT_FORMAT_RAW_12:
461 case IA_CSS_STREAM_FORMAT_RAW_14: 461 case ATOMISP_INPUT_FORMAT_RAW_14:
462 memory_alignment_in_bytes = 2 * ISP_VEC_NELEMS; 462 memory_alignment_in_bytes = 2 * ISP_VEC_NELEMS;
463 break; 463 break;
464 case IA_CSS_STREAM_FORMAT_YUV420_8: 464 case ATOMISP_INPUT_FORMAT_YUV420_8:
465 case IA_CSS_STREAM_FORMAT_YUV422_8: 465 case ATOMISP_INPUT_FORMAT_YUV422_8:
466 case IA_CSS_STREAM_FORMAT_USER_DEF1: 466 case ATOMISP_INPUT_FORMAT_USER_DEF1:
467 case IA_CSS_STREAM_FORMAT_USER_DEF2: 467 case ATOMISP_INPUT_FORMAT_USER_DEF2:
468 case IA_CSS_STREAM_FORMAT_USER_DEF3: 468 case ATOMISP_INPUT_FORMAT_USER_DEF3:
469 case IA_CSS_STREAM_FORMAT_USER_DEF4: 469 case ATOMISP_INPUT_FORMAT_USER_DEF4:
470 case IA_CSS_STREAM_FORMAT_USER_DEF5: 470 case ATOMISP_INPUT_FORMAT_USER_DEF5:
471 case IA_CSS_STREAM_FORMAT_USER_DEF6: 471 case ATOMISP_INPUT_FORMAT_USER_DEF6:
472 case IA_CSS_STREAM_FORMAT_USER_DEF7: 472 case ATOMISP_INPUT_FORMAT_USER_DEF7:
473 case IA_CSS_STREAM_FORMAT_USER_DEF8: 473 case ATOMISP_INPUT_FORMAT_USER_DEF8:
474 /* Planar YUV formats need to have all planes aligned, this means 474 /* Planar YUV formats need to have all planes aligned, this means
475 * double the alignment for the Y plane if the horizontal decimation is 2. */ 475 * double the alignment for the Y plane if the horizontal decimation is 2. */
476 memory_alignment_in_bytes = 2 * HIVE_ISP_DDR_WORD_BYTES; 476 memory_alignment_in_bytes = 2 * HIVE_ISP_DDR_WORD_BYTES;
477 break; 477 break;
478 case IA_CSS_STREAM_FORMAT_EMBEDDED: 478 case ATOMISP_INPUT_FORMAT_EMBEDDED:
479 default: 479 default:
480 memory_alignment_in_bytes = HIVE_ISP_DDR_WORD_BYTES; 480 memory_alignment_in_bytes = HIVE_ISP_DDR_WORD_BYTES;
481 break; 481 break;
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
index 2f0b76a33414..c771e4b910f3 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
@@ -462,46 +462,46 @@ verify_copy_out_frame_format(struct ia_css_pipe *pipe)
462 assert(pipe->stream != NULL); 462 assert(pipe->stream != NULL);
463 463
464 switch (pipe->stream->config.input_config.format) { 464 switch (pipe->stream->config.input_config.format) {
465 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: 465 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
466 case IA_CSS_STREAM_FORMAT_YUV420_8: 466 case ATOMISP_INPUT_FORMAT_YUV420_8:
467 for (i=0; i<ARRAY_SIZE(yuv420_copy_formats) && !found; i++) 467 for (i=0; i<ARRAY_SIZE(yuv420_copy_formats) && !found; i++)
468 found = (out_fmt == yuv420_copy_formats[i]); 468 found = (out_fmt == yuv420_copy_formats[i]);
469 break; 469 break;
470 case IA_CSS_STREAM_FORMAT_YUV420_10: 470 case ATOMISP_INPUT_FORMAT_YUV420_10:
471 case IA_CSS_STREAM_FORMAT_YUV420_16: 471 case ATOMISP_INPUT_FORMAT_YUV420_16:
472 found = (out_fmt == IA_CSS_FRAME_FORMAT_YUV420_16); 472 found = (out_fmt == IA_CSS_FRAME_FORMAT_YUV420_16);
473 break; 473 break;
474 case IA_CSS_STREAM_FORMAT_YUV422_8: 474 case ATOMISP_INPUT_FORMAT_YUV422_8:
475 for (i=0; i<ARRAY_SIZE(yuv422_copy_formats) && !found; i++) 475 for (i=0; i<ARRAY_SIZE(yuv422_copy_formats) && !found; i++)
476 found = (out_fmt == yuv422_copy_formats[i]); 476 found = (out_fmt == yuv422_copy_formats[i]);
477 break; 477 break;
478 case IA_CSS_STREAM_FORMAT_YUV422_10: 478 case ATOMISP_INPUT_FORMAT_YUV422_10:
479 case IA_CSS_STREAM_FORMAT_YUV422_16: 479 case ATOMISP_INPUT_FORMAT_YUV422_16:
480 found = (out_fmt == IA_CSS_FRAME_FORMAT_YUV422_16 || 480 found = (out_fmt == IA_CSS_FRAME_FORMAT_YUV422_16 ||
481 out_fmt == IA_CSS_FRAME_FORMAT_YUV420_16); 481 out_fmt == IA_CSS_FRAME_FORMAT_YUV420_16);
482 break; 482 break;
483 case IA_CSS_STREAM_FORMAT_RGB_444: 483 case ATOMISP_INPUT_FORMAT_RGB_444:
484 case IA_CSS_STREAM_FORMAT_RGB_555: 484 case ATOMISP_INPUT_FORMAT_RGB_555:
485 case IA_CSS_STREAM_FORMAT_RGB_565: 485 case ATOMISP_INPUT_FORMAT_RGB_565:
486 found = (out_fmt == IA_CSS_FRAME_FORMAT_RGBA888 || 486 found = (out_fmt == IA_CSS_FRAME_FORMAT_RGBA888 ||
487 out_fmt == IA_CSS_FRAME_FORMAT_RGB565); 487 out_fmt == IA_CSS_FRAME_FORMAT_RGB565);
488 break; 488 break;
489 case IA_CSS_STREAM_FORMAT_RGB_666: 489 case ATOMISP_INPUT_FORMAT_RGB_666:
490 case IA_CSS_STREAM_FORMAT_RGB_888: 490 case ATOMISP_INPUT_FORMAT_RGB_888:
491 found = (out_fmt == IA_CSS_FRAME_FORMAT_RGBA888 || 491 found = (out_fmt == IA_CSS_FRAME_FORMAT_RGBA888 ||
492 out_fmt == IA_CSS_FRAME_FORMAT_YUV420); 492 out_fmt == IA_CSS_FRAME_FORMAT_YUV420);
493 break; 493 break;
494 case IA_CSS_STREAM_FORMAT_RAW_6: 494 case ATOMISP_INPUT_FORMAT_RAW_6:
495 case IA_CSS_STREAM_FORMAT_RAW_7: 495 case ATOMISP_INPUT_FORMAT_RAW_7:
496 case IA_CSS_STREAM_FORMAT_RAW_8: 496 case ATOMISP_INPUT_FORMAT_RAW_8:
497 case IA_CSS_STREAM_FORMAT_RAW_10: 497 case ATOMISP_INPUT_FORMAT_RAW_10:
498 case IA_CSS_STREAM_FORMAT_RAW_12: 498 case ATOMISP_INPUT_FORMAT_RAW_12:
499 case IA_CSS_STREAM_FORMAT_RAW_14: 499 case ATOMISP_INPUT_FORMAT_RAW_14:
500 case IA_CSS_STREAM_FORMAT_RAW_16: 500 case ATOMISP_INPUT_FORMAT_RAW_16:
501 found = (out_fmt == IA_CSS_FRAME_FORMAT_RAW) || 501 found = (out_fmt == IA_CSS_FRAME_FORMAT_RAW) ||
502 (out_fmt == IA_CSS_FRAME_FORMAT_RAW_PACKED); 502 (out_fmt == IA_CSS_FRAME_FORMAT_RAW_PACKED);
503 break; 503 break;
504 case IA_CSS_STREAM_FORMAT_BINARY_8: 504 case ATOMISP_INPUT_FORMAT_BINARY_8:
505 found = (out_fmt == IA_CSS_FRAME_FORMAT_BINARY_8); 505 found = (out_fmt == IA_CSS_FRAME_FORMAT_BINARY_8);
506 break; 506 break;
507 default: 507 default:
@@ -586,13 +586,13 @@ sh_css_config_input_network(struct ia_css_stream *stream)
586} 586}
587#elif !defined(HAS_NO_INPUT_SYSTEM) && defined(USE_INPUT_SYSTEM_VERSION_2401) 587#elif !defined(HAS_NO_INPUT_SYSTEM) && defined(USE_INPUT_SYSTEM_VERSION_2401)
588static unsigned int csi2_protocol_calculate_max_subpixels_per_line( 588static unsigned int csi2_protocol_calculate_max_subpixels_per_line(
589 enum ia_css_stream_format format, 589 enum atomisp_input_format format,
590 unsigned int pixels_per_line) 590 unsigned int pixels_per_line)
591{ 591{
592 unsigned int rval; 592 unsigned int rval;
593 593
594 switch (format) { 594 switch (format) {
595 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: 595 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
596 /* 596 /*
597 * The frame format layout is shown below. 597 * The frame format layout is shown below.
598 * 598 *
@@ -611,9 +611,9 @@ static unsigned int csi2_protocol_calculate_max_subpixels_per_line(
611 */ 611 */
612 rval = pixels_per_line * 2; 612 rval = pixels_per_line * 2;
613 break; 613 break;
614 case IA_CSS_STREAM_FORMAT_YUV420_8: 614 case ATOMISP_INPUT_FORMAT_YUV420_8:
615 case IA_CSS_STREAM_FORMAT_YUV420_10: 615 case ATOMISP_INPUT_FORMAT_YUV420_10:
616 case IA_CSS_STREAM_FORMAT_YUV420_16: 616 case ATOMISP_INPUT_FORMAT_YUV420_16:
617 /* 617 /*
618 * The frame format layout is shown below. 618 * The frame format layout is shown below.
619 * 619 *
@@ -630,9 +630,9 @@ static unsigned int csi2_protocol_calculate_max_subpixels_per_line(
630 */ 630 */
631 rval = pixels_per_line * 2; 631 rval = pixels_per_line * 2;
632 break; 632 break;
633 case IA_CSS_STREAM_FORMAT_YUV422_8: 633 case ATOMISP_INPUT_FORMAT_YUV422_8:
634 case IA_CSS_STREAM_FORMAT_YUV422_10: 634 case ATOMISP_INPUT_FORMAT_YUV422_10:
635 case IA_CSS_STREAM_FORMAT_YUV422_16: 635 case ATOMISP_INPUT_FORMAT_YUV422_16:
636 /* 636 /*
637 * The frame format layout is shown below. 637 * The frame format layout is shown below.
638 * 638 *
@@ -649,11 +649,11 @@ static unsigned int csi2_protocol_calculate_max_subpixels_per_line(
649 */ 649 */
650 rval = pixels_per_line * 2; 650 rval = pixels_per_line * 2;
651 break; 651 break;
652 case IA_CSS_STREAM_FORMAT_RGB_444: 652 case ATOMISP_INPUT_FORMAT_RGB_444:
653 case IA_CSS_STREAM_FORMAT_RGB_555: 653 case ATOMISP_INPUT_FORMAT_RGB_555:
654 case IA_CSS_STREAM_FORMAT_RGB_565: 654 case ATOMISP_INPUT_FORMAT_RGB_565:
655 case IA_CSS_STREAM_FORMAT_RGB_666: 655 case ATOMISP_INPUT_FORMAT_RGB_666:
656 case IA_CSS_STREAM_FORMAT_RGB_888: 656 case ATOMISP_INPUT_FORMAT_RGB_888:
657 /* 657 /*
658 * The frame format layout is shown below. 658 * The frame format layout is shown below.
659 * 659 *
@@ -670,22 +670,22 @@ static unsigned int csi2_protocol_calculate_max_subpixels_per_line(
670 */ 670 */
671 rval = pixels_per_line * 4; 671 rval = pixels_per_line * 4;
672 break; 672 break;
673 case IA_CSS_STREAM_FORMAT_RAW_6: 673 case ATOMISP_INPUT_FORMAT_RAW_6:
674 case IA_CSS_STREAM_FORMAT_RAW_7: 674 case ATOMISP_INPUT_FORMAT_RAW_7:
675 case IA_CSS_STREAM_FORMAT_RAW_8: 675 case ATOMISP_INPUT_FORMAT_RAW_8:
676 case IA_CSS_STREAM_FORMAT_RAW_10: 676 case ATOMISP_INPUT_FORMAT_RAW_10:
677 case IA_CSS_STREAM_FORMAT_RAW_12: 677 case ATOMISP_INPUT_FORMAT_RAW_12:
678 case IA_CSS_STREAM_FORMAT_RAW_14: 678 case ATOMISP_INPUT_FORMAT_RAW_14:
679 case IA_CSS_STREAM_FORMAT_RAW_16: 679 case ATOMISP_INPUT_FORMAT_RAW_16:
680 case IA_CSS_STREAM_FORMAT_BINARY_8: 680 case ATOMISP_INPUT_FORMAT_BINARY_8:
681 case IA_CSS_STREAM_FORMAT_USER_DEF1: 681 case ATOMISP_INPUT_FORMAT_USER_DEF1:
682 case IA_CSS_STREAM_FORMAT_USER_DEF2: 682 case ATOMISP_INPUT_FORMAT_USER_DEF2:
683 case IA_CSS_STREAM_FORMAT_USER_DEF3: 683 case ATOMISP_INPUT_FORMAT_USER_DEF3:
684 case IA_CSS_STREAM_FORMAT_USER_DEF4: 684 case ATOMISP_INPUT_FORMAT_USER_DEF4:
685 case IA_CSS_STREAM_FORMAT_USER_DEF5: 685 case ATOMISP_INPUT_FORMAT_USER_DEF5:
686 case IA_CSS_STREAM_FORMAT_USER_DEF6: 686 case ATOMISP_INPUT_FORMAT_USER_DEF6:
687 case IA_CSS_STREAM_FORMAT_USER_DEF7: 687 case ATOMISP_INPUT_FORMAT_USER_DEF7:
688 case IA_CSS_STREAM_FORMAT_USER_DEF8: 688 case ATOMISP_INPUT_FORMAT_USER_DEF8:
689 /* 689 /*
690 * The frame format layout is shown below. 690 * The frame format layout is shown below.
691 * 691 *
@@ -927,7 +927,7 @@ static bool sh_css_translate_stream_cfg_to_input_system_input_port_resolution(
927 unsigned int max_subpixels_per_line; 927 unsigned int max_subpixels_per_line;
928 unsigned int lines_per_frame; 928 unsigned int lines_per_frame;
929 unsigned int align_req_in_bytes; 929 unsigned int align_req_in_bytes;
930 enum ia_css_stream_format fmt_type; 930 enum atomisp_input_format fmt_type;
931 931
932 fmt_type = stream_cfg->isys_config[isys_stream_idx].format; 932 fmt_type = stream_cfg->isys_config[isys_stream_idx].format;
933 if ((stream_cfg->mode == IA_CSS_INPUT_MODE_SENSOR || 933 if ((stream_cfg->mode == IA_CSS_INPUT_MODE_SENSOR ||
@@ -936,11 +936,11 @@ static bool sh_css_translate_stream_cfg_to_input_system_input_port_resolution(
936 936
937 if (stream_cfg->source.port.compression.uncompressed_bits_per_pixel == 937 if (stream_cfg->source.port.compression.uncompressed_bits_per_pixel ==
938 UNCOMPRESSED_BITS_PER_PIXEL_10) { 938 UNCOMPRESSED_BITS_PER_PIXEL_10) {
939 fmt_type = IA_CSS_STREAM_FORMAT_RAW_10; 939 fmt_type = ATOMISP_INPUT_FORMAT_RAW_10;
940 } 940 }
941 else if (stream_cfg->source.port.compression.uncompressed_bits_per_pixel == 941 else if (stream_cfg->source.port.compression.uncompressed_bits_per_pixel ==
942 UNCOMPRESSED_BITS_PER_PIXEL_12) { 942 UNCOMPRESSED_BITS_PER_PIXEL_12) {
943 fmt_type = IA_CSS_STREAM_FORMAT_RAW_12; 943 fmt_type = ATOMISP_INPUT_FORMAT_RAW_12;
944 } 944 }
945 else 945 else
946 return false; 946 return false;
@@ -1391,7 +1391,7 @@ start_copy_on_sp(struct ia_css_pipe *pipe,
1391 ia_css_isys_rx_disable(); 1391 ia_css_isys_rx_disable();
1392#endif 1392#endif
1393 1393
1394 if (pipe->stream->config.input_config.format != IA_CSS_STREAM_FORMAT_BINARY_8) 1394 if (pipe->stream->config.input_config.format != ATOMISP_INPUT_FORMAT_BINARY_8)
1395 return IA_CSS_ERR_INTERNAL_ERROR; 1395 return IA_CSS_ERR_INTERNAL_ERROR;
1396 sh_css_sp_start_binary_copy(ia_css_pipe_get_pipe_num(pipe), out_frame, pipe->stream->config.pixels_per_clock == 2); 1396 sh_css_sp_start_binary_copy(ia_css_pipe_get_pipe_num(pipe), out_frame, pipe->stream->config.pixels_per_clock == 2);
1397 1397
@@ -6784,7 +6784,7 @@ static bool copy_on_sp(struct ia_css_pipe *pipe)
6784 6784
6785 rval &= (pipe->config.default_capture_config.mode == IA_CSS_CAPTURE_MODE_RAW); 6785 rval &= (pipe->config.default_capture_config.mode == IA_CSS_CAPTURE_MODE_RAW);
6786 6786
6787 rval &= ((pipe->stream->config.input_config.format == IA_CSS_STREAM_FORMAT_BINARY_8) || 6787 rval &= ((pipe->stream->config.input_config.format == ATOMISP_INPUT_FORMAT_BINARY_8) ||
6788 (pipe->config.mode == IA_CSS_PIPE_MODE_COPY)); 6788 (pipe->config.mode == IA_CSS_PIPE_MODE_COPY));
6789 6789
6790 return rval; 6790 return rval;
@@ -6817,7 +6817,7 @@ static enum ia_css_err load_capture_binaries(
6817 return err; 6817 return err;
6818 } 6818 }
6819 if (copy_on_sp(pipe) && 6819 if (copy_on_sp(pipe) &&
6820 pipe->stream->config.input_config.format == IA_CSS_STREAM_FORMAT_BINARY_8) { 6820 pipe->stream->config.input_config.format == ATOMISP_INPUT_FORMAT_BINARY_8) {
6821 ia_css_frame_info_init( 6821 ia_css_frame_info_init(
6822 &pipe->output_info[0], 6822 &pipe->output_info[0],
6823 JPEG_BYTES, 6823 JPEG_BYTES,
@@ -6915,7 +6915,7 @@ need_yuv_scaler_stage(const struct ia_css_pipe *pipe)
6915 6915
6916 /* TODO: make generic function */ 6916 /* TODO: make generic function */
6917 need_format_conversion = 6917 need_format_conversion =
6918 ((pipe->stream->config.input_config.format == IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY) && 6918 ((pipe->stream->config.input_config.format == ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY) &&
6919 (pipe->output_info[0].format != IA_CSS_FRAME_FORMAT_CSI_MIPI_LEGACY_YUV420_8)); 6919 (pipe->output_info[0].format != IA_CSS_FRAME_FORMAT_CSI_MIPI_LEGACY_YUV420_8));
6920 6920
6921 in_res = pipe->config.input_effective_res; 6921 in_res = pipe->config.input_effective_res;
@@ -7304,7 +7304,7 @@ load_yuvpp_binaries(struct ia_css_pipe *pipe)
7304 /* 7304 /*
7305 * NOTES 7305 * NOTES
7306 * - Why does the "yuvpp" pipe needs "isp_copy_binary" (i.e. ISP Copy) when 7306 * - Why does the "yuvpp" pipe needs "isp_copy_binary" (i.e. ISP Copy) when
7307 * its input is "IA_CSS_STREAM_FORMAT_YUV422_8"? 7307 * its input is "ATOMISP_INPUT_FORMAT_YUV422_8"?
7308 * 7308 *
7309 * In most use cases, the first stage in the "yuvpp" pipe is the "yuv_scale_ 7309 * In most use cases, the first stage in the "yuvpp" pipe is the "yuv_scale_
7310 * binary". However, the "yuv_scale_binary" does NOT support the input-frame 7310 * binary". However, the "yuv_scale_binary" does NOT support the input-frame
@@ -7319,7 +7319,7 @@ load_yuvpp_binaries(struct ia_css_pipe *pipe)
7319 * "yuv_scale_binary". 7319 * "yuv_scale_binary".
7320 */ 7320 */
7321 need_isp_copy_binary = 7321 need_isp_copy_binary =
7322 (pipe->stream->config.input_config.format == IA_CSS_STREAM_FORMAT_YUV422_8); 7322 (pipe->stream->config.input_config.format == ATOMISP_INPUT_FORMAT_YUV422_8);
7323#else /* !USE_INPUT_SYSTEM_VERSION_2401 */ 7323#else /* !USE_INPUT_SYSTEM_VERSION_2401 */
7324 need_isp_copy_binary = true; 7324 need_isp_copy_binary = true;
7325#endif /* USE_INPUT_SYSTEM_VERSION_2401 */ 7325#endif /* USE_INPUT_SYSTEM_VERSION_2401 */
@@ -7627,11 +7627,11 @@ create_host_yuvpp_pipeline(struct ia_css_pipe *pipe)
7627 * Bayer-Quad RAW. 7627 * Bayer-Quad RAW.
7628 */ 7628 */
7629 int in_frame_format; 7629 int in_frame_format;
7630 if (pipe->stream->config.input_config.format == IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY) { 7630 if (pipe->stream->config.input_config.format == ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY) {
7631 in_frame_format = IA_CSS_FRAME_FORMAT_CSI_MIPI_LEGACY_YUV420_8; 7631 in_frame_format = IA_CSS_FRAME_FORMAT_CSI_MIPI_LEGACY_YUV420_8;
7632 } else if (pipe->stream->config.input_config.format == IA_CSS_STREAM_FORMAT_YUV422_8) { 7632 } else if (pipe->stream->config.input_config.format == ATOMISP_INPUT_FORMAT_YUV422_8) {
7633 /* 7633 /*
7634 * When the sensor output frame format is "IA_CSS_STREAM_FORMAT_YUV422_8", 7634 * When the sensor output frame format is "ATOMISP_INPUT_FORMAT_YUV422_8",
7635 * the "isp_copy_var" binary is selected as the first stage in the yuvpp 7635 * the "isp_copy_var" binary is selected as the first stage in the yuvpp
7636 * pipe. 7636 * pipe.
7637 * 7637 *
@@ -7812,7 +7812,7 @@ create_host_copy_pipeline(struct ia_css_pipe *pipe,
7812 out_frame->flash_state = IA_CSS_FRAME_FLASH_STATE_NONE; 7812 out_frame->flash_state = IA_CSS_FRAME_FLASH_STATE_NONE;
7813 7813
7814 if (copy_on_sp(pipe) && 7814 if (copy_on_sp(pipe) &&
7815 pipe->stream->config.input_config.format == IA_CSS_STREAM_FORMAT_BINARY_8) { 7815 pipe->stream->config.input_config.format == ATOMISP_INPUT_FORMAT_BINARY_8) {
7816 ia_css_frame_info_init( 7816 ia_css_frame_info_init(
7817 &out_frame->info, 7817 &out_frame->info,
7818 JPEG_BYTES, 7818 JPEG_BYTES,
@@ -8327,7 +8327,7 @@ sh_css_pipe_get_output_frame_info(struct ia_css_pipe *pipe,
8327 8327
8328 *info = pipe->output_info[idx]; 8328 *info = pipe->output_info[idx];
8329 if (copy_on_sp(pipe) && 8329 if (copy_on_sp(pipe) &&
8330 pipe->stream->config.input_config.format == IA_CSS_STREAM_FORMAT_BINARY_8) { 8330 pipe->stream->config.input_config.format == ATOMISP_INPUT_FORMAT_BINARY_8) {
8331 ia_css_frame_info_init( 8331 ia_css_frame_info_init(
8332 info, 8332 info,
8333 JPEG_BYTES, 8333 JPEG_BYTES,
@@ -8388,7 +8388,7 @@ ia_css_stream_send_input_line(const struct ia_css_stream *stream,
8388 8388
8389void 8389void
8390ia_css_stream_send_input_embedded_line(const struct ia_css_stream *stream, 8390ia_css_stream_send_input_embedded_line(const struct ia_css_stream *stream,
8391 enum ia_css_stream_format format, 8391 enum atomisp_input_format format,
8392 const unsigned short *data, 8392 const unsigned short *data,
8393 unsigned int width) 8393 unsigned int width)
8394{ 8394{
@@ -9359,7 +9359,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
9359 9359
9360#if defined(USE_INPUT_SYSTEM_VERSION_2) 9360#if defined(USE_INPUT_SYSTEM_VERSION_2)
9361 /* We don't support metadata for JPEG stream, since they both use str2mem */ 9361 /* We don't support metadata for JPEG stream, since they both use str2mem */
9362 if (stream_config->input_config.format == IA_CSS_STREAM_FORMAT_BINARY_8 && 9362 if (stream_config->input_config.format == ATOMISP_INPUT_FORMAT_BINARY_8 &&
9363 stream_config->metadata_config.resolution.height > 0) { 9363 stream_config->metadata_config.resolution.height > 0) {
9364 err = IA_CSS_ERR_INVALID_ARGUMENTS; 9364 err = IA_CSS_ERR_INVALID_ARGUMENTS;
9365 IA_CSS_LEAVE_ERR(err); 9365 IA_CSS_LEAVE_ERR(err);
@@ -10138,7 +10138,7 @@ ia_css_temp_pipe_to_pipe_id(const struct ia_css_pipe *pipe, enum ia_css_pipe_id
10138 return IA_CSS_SUCCESS; 10138 return IA_CSS_SUCCESS;
10139} 10139}
10140 10140
10141enum ia_css_stream_format 10141enum atomisp_input_format
10142ia_css_stream_get_format(const struct ia_css_stream *stream) 10142ia_css_stream_get_format(const struct ia_css_stream *stream)
10143{ 10143{
10144 return stream->config.input_config.format; 10144 return stream->config.input_config.format;
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
index 0c2e5e3a007a..a6a00024bae8 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
@@ -104,7 +104,7 @@ static bool ia_css_mipi_is_source_port_valid(struct ia_css_pipe *pipe,
104enum ia_css_err 104enum ia_css_err
105ia_css_mipi_frame_calculate_size(const unsigned int width, 105ia_css_mipi_frame_calculate_size(const unsigned int width,
106 const unsigned int height, 106 const unsigned int height,
107 const enum ia_css_stream_format format, 107 const enum atomisp_input_format format,
108 const bool hasSOLandEOL, 108 const bool hasSOLandEOL,
109 const unsigned int embedded_data_size_words, 109 const unsigned int embedded_data_size_words,
110 unsigned int *size_mem_words) 110 unsigned int *size_mem_words)
@@ -136,16 +136,16 @@ ia_css_mipi_frame_calculate_size(const unsigned int width,
136 width_padded, height, format, hasSOLandEOL, embedded_data_size_words); 136 width_padded, height, format, hasSOLandEOL, embedded_data_size_words);
137 137
138 switch (format) { 138 switch (format) {
139 case IA_CSS_STREAM_FORMAT_RAW_6: /* 4p, 3B, 24bits */ 139 case ATOMISP_INPUT_FORMAT_RAW_6: /* 4p, 3B, 24bits */
140 bits_per_pixel = 6; break; 140 bits_per_pixel = 6; break;
141 case IA_CSS_STREAM_FORMAT_RAW_7: /* 8p, 7B, 56bits */ 141 case ATOMISP_INPUT_FORMAT_RAW_7: /* 8p, 7B, 56bits */
142 bits_per_pixel = 7; break; 142 bits_per_pixel = 7; break;
143 case IA_CSS_STREAM_FORMAT_RAW_8: /* 1p, 1B, 8bits */ 143 case ATOMISP_INPUT_FORMAT_RAW_8: /* 1p, 1B, 8bits */
144 case IA_CSS_STREAM_FORMAT_BINARY_8: /* 8bits, TODO: check. */ 144 case ATOMISP_INPUT_FORMAT_BINARY_8: /* 8bits, TODO: check. */
145 case IA_CSS_STREAM_FORMAT_YUV420_8: /* odd 2p, 2B, 16bits, even 2p, 4B, 32bits */ 145 case ATOMISP_INPUT_FORMAT_YUV420_8: /* odd 2p, 2B, 16bits, even 2p, 4B, 32bits */
146 bits_per_pixel = 8; break; 146 bits_per_pixel = 8; break;
147 case IA_CSS_STREAM_FORMAT_YUV420_10: /* odd 4p, 5B, 40bits, even 4p, 10B, 80bits */ 147 case ATOMISP_INPUT_FORMAT_YUV420_10: /* odd 4p, 5B, 40bits, even 4p, 10B, 80bits */
148 case IA_CSS_STREAM_FORMAT_RAW_10: /* 4p, 5B, 40bits */ 148 case ATOMISP_INPUT_FORMAT_RAW_10: /* 4p, 5B, 40bits */
149#if !defined(HAS_NO_PACKED_RAW_PIXELS) 149#if !defined(HAS_NO_PACKED_RAW_PIXELS)
150 /* The changes will be reverted as soon as RAW 150 /* The changes will be reverted as soon as RAW
151 * Buffers are deployed by the 2401 Input System 151 * Buffers are deployed by the 2401 Input System
@@ -156,26 +156,26 @@ ia_css_mipi_frame_calculate_size(const unsigned int width,
156 bits_per_pixel = 16; 156 bits_per_pixel = 16;
157#endif 157#endif
158 break; 158 break;
159 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: /* 2p, 3B, 24bits */ 159 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY: /* 2p, 3B, 24bits */
160 case IA_CSS_STREAM_FORMAT_RAW_12: /* 2p, 3B, 24bits */ 160 case ATOMISP_INPUT_FORMAT_RAW_12: /* 2p, 3B, 24bits */
161 bits_per_pixel = 12; break; 161 bits_per_pixel = 12; break;
162 case IA_CSS_STREAM_FORMAT_RAW_14: /* 4p, 7B, 56bits */ 162 case ATOMISP_INPUT_FORMAT_RAW_14: /* 4p, 7B, 56bits */
163 bits_per_pixel = 14; break; 163 bits_per_pixel = 14; break;
164 case IA_CSS_STREAM_FORMAT_RGB_444: /* 1p, 2B, 16bits */ 164 case ATOMISP_INPUT_FORMAT_RGB_444: /* 1p, 2B, 16bits */
165 case IA_CSS_STREAM_FORMAT_RGB_555: /* 1p, 2B, 16bits */ 165 case ATOMISP_INPUT_FORMAT_RGB_555: /* 1p, 2B, 16bits */
166 case IA_CSS_STREAM_FORMAT_RGB_565: /* 1p, 2B, 16bits */ 166 case ATOMISP_INPUT_FORMAT_RGB_565: /* 1p, 2B, 16bits */
167 case IA_CSS_STREAM_FORMAT_YUV422_8: /* 2p, 4B, 32bits */ 167 case ATOMISP_INPUT_FORMAT_YUV422_8: /* 2p, 4B, 32bits */
168 bits_per_pixel = 16; break; 168 bits_per_pixel = 16; break;
169 case IA_CSS_STREAM_FORMAT_RGB_666: /* 4p, 9B, 72bits */ 169 case ATOMISP_INPUT_FORMAT_RGB_666: /* 4p, 9B, 72bits */
170 bits_per_pixel = 18; break; 170 bits_per_pixel = 18; break;
171 case IA_CSS_STREAM_FORMAT_YUV422_10: /* 2p, 5B, 40bits */ 171 case ATOMISP_INPUT_FORMAT_YUV422_10: /* 2p, 5B, 40bits */
172 bits_per_pixel = 20; break; 172 bits_per_pixel = 20; break;
173 case IA_CSS_STREAM_FORMAT_RGB_888: /* 1p, 3B, 24bits */ 173 case ATOMISP_INPUT_FORMAT_RGB_888: /* 1p, 3B, 24bits */
174 bits_per_pixel = 24; break; 174 bits_per_pixel = 24; break;
175 175
176 case IA_CSS_STREAM_FORMAT_YUV420_16: /* Not supported */ 176 case ATOMISP_INPUT_FORMAT_YUV420_16: /* Not supported */
177 case IA_CSS_STREAM_FORMAT_YUV422_16: /* Not supported */ 177 case ATOMISP_INPUT_FORMAT_YUV422_16: /* Not supported */
178 case IA_CSS_STREAM_FORMAT_RAW_16: /* TODO: not specified in MIPI SPEC, check */ 178 case ATOMISP_INPUT_FORMAT_RAW_16: /* TODO: not specified in MIPI SPEC, check */
179 default: 179 default:
180 return IA_CSS_ERR_INVALID_ARGUMENTS; 180 return IA_CSS_ERR_INVALID_ARGUMENTS;
181 } 181 }
@@ -183,9 +183,9 @@ ia_css_mipi_frame_calculate_size(const unsigned int width,
183 odd_line_bytes = (width_padded * bits_per_pixel + 7) >> 3; /* ceil ( bits per line / 8) */ 183 odd_line_bytes = (width_padded * bits_per_pixel + 7) >> 3; /* ceil ( bits per line / 8) */
184 184
185 /* Even lines for YUV420 formats are double in bits_per_pixel. */ 185 /* Even lines for YUV420 formats are double in bits_per_pixel. */
186 if (format == IA_CSS_STREAM_FORMAT_YUV420_8 186 if (format == ATOMISP_INPUT_FORMAT_YUV420_8
187 || format == IA_CSS_STREAM_FORMAT_YUV420_10 187 || format == ATOMISP_INPUT_FORMAT_YUV420_10
188 || format == IA_CSS_STREAM_FORMAT_YUV420_16) { 188 || format == ATOMISP_INPUT_FORMAT_YUV420_16) {
189 even_line_bytes = (width_padded * 2 * bits_per_pixel + 7) >> 3; /* ceil ( bits per line / 8) */ 189 even_line_bytes = (width_padded * 2 * bits_per_pixel + 7) >> 3; /* ceil ( bits per line / 8) */
190 } else { 190 } else {
191 even_line_bytes = odd_line_bytes; 191 even_line_bytes = odd_line_bytes;
@@ -285,7 +285,7 @@ calculate_mipi_buff_size(
285#else 285#else
286 unsigned int width; 286 unsigned int width;
287 unsigned int height; 287 unsigned int height;
288 enum ia_css_stream_format format; 288 enum atomisp_input_format format;
289 bool pack_raw_pixels; 289 bool pack_raw_pixels;
290 290
291 unsigned int width_padded; 291 unsigned int width_padded;
@@ -348,15 +348,15 @@ calculate_mipi_buff_size(
348 348
349 bits_per_pixel = sh_css_stream_format_2_bits_per_subpixel(format); 349 bits_per_pixel = sh_css_stream_format_2_bits_per_subpixel(format);
350 bits_per_pixel = 350 bits_per_pixel =
351 (format == IA_CSS_STREAM_FORMAT_RAW_10 && pack_raw_pixels) ? bits_per_pixel : 16; 351 (format == ATOMISP_INPUT_FORMAT_RAW_10 && pack_raw_pixels) ? bits_per_pixel : 16;
352 if (bits_per_pixel == 0) 352 if (bits_per_pixel == 0)
353 return IA_CSS_ERR_INTERNAL_ERROR; 353 return IA_CSS_ERR_INTERNAL_ERROR;
354 354
355 odd_line_bytes = (width_padded * bits_per_pixel + 7) >> 3; /* ceil ( bits per line / 8) */ 355 odd_line_bytes = (width_padded * bits_per_pixel + 7) >> 3; /* ceil ( bits per line / 8) */
356 356
357 /* Even lines for YUV420 formats are double in bits_per_pixel. */ 357 /* Even lines for YUV420 formats are double in bits_per_pixel. */
358 if (format == IA_CSS_STREAM_FORMAT_YUV420_8 358 if (format == ATOMISP_INPUT_FORMAT_YUV420_8
359 || format == IA_CSS_STREAM_FORMAT_YUV420_10) { 359 || format == ATOMISP_INPUT_FORMAT_YUV420_10) {
360 even_line_bytes = (width_padded * 2 * bits_per_pixel + 7) >> 3; /* ceil ( bits per line / 8) */ 360 even_line_bytes = (width_padded * 2 * bits_per_pixel + 7) >> 3; /* ceil ( bits per line / 8) */
361 } else { 361 } else {
362 even_line_bytes = odd_line_bytes; 362 even_line_bytes = odd_line_bytes;
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c
index ba2b96e330d0..43529b1605c3 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c
@@ -1741,7 +1741,7 @@ ia_css_process_zoom_and_motion(
1741 out_infos[0] = &args->out_frame[0]->info; 1741 out_infos[0] = &args->out_frame[0]->info;
1742 info = &stage->firmware->info.isp; 1742 info = &stage->firmware->info.isp;
1743 ia_css_binary_fill_info(info, false, false, 1743 ia_css_binary_fill_info(info, false, false,
1744 IA_CSS_STREAM_FORMAT_RAW_10, 1744 ATOMISP_INPUT_FORMAT_RAW_10,
1745 args->in_frame ? &args->in_frame->info : NULL, 1745 args->in_frame ? &args->in_frame->info : NULL,
1746 NULL, 1746 NULL,
1747 out_infos, 1747 out_infos,
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c
index 93f7c50511d8..85263725540d 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c
@@ -754,7 +754,7 @@ sh_css_sp_write_frame_pointers(const struct sh_css_binary_args *args)
754 754
755static void 755static void
756sh_css_sp_init_group(bool two_ppc, 756sh_css_sp_init_group(bool two_ppc,
757 enum ia_css_stream_format input_format, 757 enum atomisp_input_format input_format,
758 bool no_isp_sync, 758 bool no_isp_sync,
759 uint8_t if_config_index) 759 uint8_t if_config_index)
760{ 760{
@@ -1117,7 +1117,7 @@ sp_init_stage(struct ia_css_pipeline_stage *stage,
1117 out_infos[0] = &args->out_frame[0]->info; 1117 out_infos[0] = &args->out_frame[0]->info;
1118 info = &firmware->info.isp; 1118 info = &firmware->info.isp;
1119 ia_css_binary_fill_info(info, false, false, 1119 ia_css_binary_fill_info(info, false, false,
1120 IA_CSS_STREAM_FORMAT_RAW_10, 1120 ATOMISP_INPUT_FORMAT_RAW_10,
1121 args->in_frame ? &args->in_frame->info : NULL, 1121 args->in_frame ? &args->in_frame->info : NULL,
1122 NULL, 1122 NULL,
1123 out_infos, 1123 out_infos,
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c
index 52d0a6471597..77f135e7dc3c 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c
@@ -16,55 +16,55 @@
16#include <ia_css_stream_format.h> 16#include <ia_css_stream_format.h>
17 17
18unsigned int sh_css_stream_format_2_bits_per_subpixel( 18unsigned int sh_css_stream_format_2_bits_per_subpixel(
19 enum ia_css_stream_format format) 19 enum atomisp_input_format format)
20{ 20{
21 unsigned int rval; 21 unsigned int rval;
22 22
23 switch (format) { 23 switch (format) {
24 case IA_CSS_STREAM_FORMAT_RGB_444: 24 case ATOMISP_INPUT_FORMAT_RGB_444:
25 rval = 4; 25 rval = 4;
26 break; 26 break;
27 case IA_CSS_STREAM_FORMAT_RGB_555: 27 case ATOMISP_INPUT_FORMAT_RGB_555:
28 rval = 5; 28 rval = 5;
29 break; 29 break;
30 case IA_CSS_STREAM_FORMAT_RGB_565: 30 case ATOMISP_INPUT_FORMAT_RGB_565:
31 case IA_CSS_STREAM_FORMAT_RGB_666: 31 case ATOMISP_INPUT_FORMAT_RGB_666:
32 case IA_CSS_STREAM_FORMAT_RAW_6: 32 case ATOMISP_INPUT_FORMAT_RAW_6:
33 rval = 6; 33 rval = 6;
34 break; 34 break;
35 case IA_CSS_STREAM_FORMAT_RAW_7: 35 case ATOMISP_INPUT_FORMAT_RAW_7:
36 rval = 7; 36 rval = 7;
37 break; 37 break;
38 case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: 38 case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
39 case IA_CSS_STREAM_FORMAT_YUV420_8: 39 case ATOMISP_INPUT_FORMAT_YUV420_8:
40 case IA_CSS_STREAM_FORMAT_YUV422_8: 40 case ATOMISP_INPUT_FORMAT_YUV422_8:
41 case IA_CSS_STREAM_FORMAT_RGB_888: 41 case ATOMISP_INPUT_FORMAT_RGB_888:
42 case IA_CSS_STREAM_FORMAT_RAW_8: 42 case ATOMISP_INPUT_FORMAT_RAW_8:
43 case IA_CSS_STREAM_FORMAT_BINARY_8: 43 case ATOMISP_INPUT_FORMAT_BINARY_8:
44 case IA_CSS_STREAM_FORMAT_USER_DEF1: 44 case ATOMISP_INPUT_FORMAT_USER_DEF1:
45 case IA_CSS_STREAM_FORMAT_USER_DEF2: 45 case ATOMISP_INPUT_FORMAT_USER_DEF2:
46 case IA_CSS_STREAM_FORMAT_USER_DEF3: 46 case ATOMISP_INPUT_FORMAT_USER_DEF3:
47 case IA_CSS_STREAM_FORMAT_USER_DEF4: 47 case ATOMISP_INPUT_FORMAT_USER_DEF4:
48 case IA_CSS_STREAM_FORMAT_USER_DEF5: 48 case ATOMISP_INPUT_FORMAT_USER_DEF5:
49 case IA_CSS_STREAM_FORMAT_USER_DEF6: 49 case ATOMISP_INPUT_FORMAT_USER_DEF6:
50 case IA_CSS_STREAM_FORMAT_USER_DEF7: 50 case ATOMISP_INPUT_FORMAT_USER_DEF7:
51 case IA_CSS_STREAM_FORMAT_USER_DEF8: 51 case ATOMISP_INPUT_FORMAT_USER_DEF8:
52 rval = 8; 52 rval = 8;
53 break; 53 break;
54 case IA_CSS_STREAM_FORMAT_YUV420_10: 54 case ATOMISP_INPUT_FORMAT_YUV420_10:
55 case IA_CSS_STREAM_FORMAT_YUV422_10: 55 case ATOMISP_INPUT_FORMAT_YUV422_10:
56 case IA_CSS_STREAM_FORMAT_RAW_10: 56 case ATOMISP_INPUT_FORMAT_RAW_10:
57 rval = 10; 57 rval = 10;
58 break; 58 break;
59 case IA_CSS_STREAM_FORMAT_RAW_12: 59 case ATOMISP_INPUT_FORMAT_RAW_12:
60 rval = 12; 60 rval = 12;
61 break; 61 break;
62 case IA_CSS_STREAM_FORMAT_RAW_14: 62 case ATOMISP_INPUT_FORMAT_RAW_14:
63 rval = 14; 63 rval = 14;
64 break; 64 break;
65 case IA_CSS_STREAM_FORMAT_RAW_16: 65 case ATOMISP_INPUT_FORMAT_RAW_16:
66 case IA_CSS_STREAM_FORMAT_YUV420_16: 66 case ATOMISP_INPUT_FORMAT_YUV420_16:
67 case IA_CSS_STREAM_FORMAT_YUV422_16: 67 case ATOMISP_INPUT_FORMAT_YUV422_16:
68 rval = 16; 68 rval = 16;
69 break; 69 break;
70 default: 70 default:
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h
index aab2b6207051..b699f538e0dd 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h
@@ -18,6 +18,6 @@
18#include <ia_css_stream_format.h> 18#include <ia_css_stream_format.h>
19 19
20unsigned int sh_css_stream_format_2_bits_per_subpixel( 20unsigned int sh_css_stream_format_2_bits_per_subpixel(
21 enum ia_css_stream_format format); 21 enum atomisp_input_format format);
22 22
23#endif /* __SH_CSS_STREAM_FORMAT_H */ 23#endif /* __SH_CSS_STREAM_FORMAT_H */
generated by cgit v1.2.2 (git 2.25.0) at 2025-06-10 22:56:36 -0400