diff options
author | 2018-06-07 12:34:37 -0700 | |
---|---|---|
committer | 2018-06-07 12:34:37 -0700 | |
commit | 3036bc45364f98515a2c446d7fac2c34dcfbeff4 (patch) | |
tree | f565c03254413b779981ee5e9ed81b19d5b62c78 /drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h | |
parent | Merge tag 'powerpc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
parent | media: omap2: fix compile-testing with FB_OMAP2=m (diff) | |
download | linux-3036bc45364f98515a2c446d7fac2c34dcfbeff4.tar.gz linux-3036bc45364f98515a2c446d7fac2c34dcfbeff4.tar.bz2 linux-3036bc45364f98515a2c446d7fac2c34dcfbeff4.zip |
Merge tag 'media/v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- remove of atomisp driver from staging, as nobody would have time to
dedicate huge efforts to fix all the problems there. Also, we have a
feeling that the driver may not even run the way it is.
- move Zoran driver to staging, in order to be either fixed to use VB2
and the proper media kAPIs or to be removed
- remove videobuf-dvb driver, with is unused for a while
- some V4L2 documentation fixes/improvements
- new sensor drivers: imx258 and ov7251
- a new driver was added to allow using I2C transparent drivers
- several improvements at the ddbridge driver
- several improvements at the ISDB pt1 driver, making it more coherent
with the DVB framework
- added a new platform driver for MIPI CSI-2 RX: cadence
- now, all media drivers can be compiled on x86 with COMPILE_TEST
- almost all media drivers now build on non-x86 architectures with
COMPILE_TEST
- lots of other random stuff: cleanups, support for new board models,
bug fixes, etc
* tag 'media/v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (464 commits)
media: omap2: fix compile-testing with FB_OMAP2=m
media: media/radio/Kconfig: add back RADIO_ISA
media: v4l2-ioctl.c: fix missing unlock in __video_do_ioctl()
media: pxa_camera: ignore -ENOIOCTLCMD from v4l2_subdev_call for s_power
media: arch: sh: migor: Fix TW9910 PDN gpio
media: staging: tegra-vde: Reset VDE regardless of memory client resetting failure
media: marvel-ccic: mmp: select VIDEOBUF2_VMALLOC/DMA_CONTIG
media: marvel-ccic: allow ccic and mmp drivers to coexist
media: uvcvideo: Prevent setting unavailable flags
media: ddbridge: conditionally enable fast TS for stv0910-equipped bridges
media: dvb-frontends/stv0910: make TS speed configurable
media: ddbridge/mci: add identifiers to function definition arguments
media: ddbridge/mci: protect against out-of-bounds array access in stop()
media: rc: ensure input/lirc device can be opened after register
media: rc: nuvoton: Keep device enabled during reg init
media: rc: nuvoton: Keep track of users on CIR enable/disable
media: rc: nuvoton: Tweak the interrupt enabling dance
media: uvcvideo: Support realtek's UVC 1.5 device
media: uvcvideo: Fix driver reference counting
media: gspca_zc3xx: Enable short exposure times for OV7648
...
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h')
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h deleted file mode 100644 index 4505775b224c..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - */ - -#ifndef __GDC_GLOBAL_H_INCLUDED__ -#define __GDC_GLOBAL_H_INCLUDED__ - -#define IS_GDC_VERSION_2 - -#include <type_support.h> -#include "gdc_v2_defs.h" - -/* - * Storage addresses for packed data transfer - */ -#define GDC_PARAM_ICX_LEFT_ROUNDED_IDX 0 -#define GDC_PARAM_OXDIM_FLOORED_IDX 1 -#define GDC_PARAM_OXDIM_LAST_IDX 2 -#define GDC_PARAM_WOIX_LAST_IDX 3 -#define GDC_PARAM_IY_TOPLEFT_IDX 4 -#define GDC_PARAM_CHUNK_CNT_IDX 5 -/*#define GDC_PARAM_ELEMENTS_PER_XMEM_ADDR_IDX 6 */ /* Derived from bpp */ -#define GDC_PARAM_BPP_IDX 6 -#define GDC_PARAM_BLOCK_HEIGHT_IDX 7 -/*#define GDC_PARAM_DMA_CHANNEL_STRIDE_A_IDX 8*/ /* The DMA stride == the GDC buffer stride */ -#define GDC_PARAM_WOIX_IDX 8 -#define GDC_PARAM_DMA_CHANNEL_STRIDE_B_IDX 9 -#define GDC_PARAM_DMA_CHANNEL_WIDTH_A_IDX 10 -#define GDC_PARAM_DMA_CHANNEL_WIDTH_B_IDX 11 -#define GDC_PARAM_VECTORS_PER_LINE_IN_IDX 12 -#define GDC_PARAM_VECTORS_PER_LINE_OUT_IDX 13 -#define GDC_PARAM_VMEM_IN_DIMY_IDX 14 -#define GDC_PARAM_COMMAND_IDX 15 -#define N_GDC_PARAM 16 - -/* Because of the packed parameter transfer max(params) == max(fragments) */ -#define N_GDC_FRAGMENTS N_GDC_PARAM - -/* The GDC is capable of higher internal precision than the parameter data structures */ -#define HRT_GDC_COORD_SCALE_BITS 6 -#define HRT_GDC_COORD_SCALE (1 << HRT_GDC_COORD_SCALE_BITS) - -typedef enum { - GDC_CH0_ID = 0, - N_GDC_CHANNEL_ID -} gdc_channel_ID_t; - -typedef enum { - gdc_8_bpp = 8, - gdc_10_bpp = 10, - gdc_12_bpp = 12, - gdc_14_bpp = 14 -} gdc_bits_per_pixel_t; - -typedef struct gdc_scale_param_mem_s { - uint16_t params[N_GDC_PARAM]; - uint16_t ipx_start_array[N_GDC_PARAM]; - uint16_t ibuf_offset[N_GDC_PARAM]; - uint16_t obuf_offset[N_GDC_PARAM]; -} gdc_scale_param_mem_t; - -typedef struct gdc_warp_param_mem_s { - uint32_t origin_x; - uint32_t origin_y; - uint32_t in_addr_offset; - uint32_t in_block_width; - uint32_t in_block_height; - uint32_t p0_x; - uint32_t p0_y; - uint32_t p1_x; - uint32_t p1_y; - uint32_t p2_x; - uint32_t p2_y; - uint32_t p3_x; - uint32_t p3_y; - uint32_t padding[3]; -} gdc_warp_param_mem_t; - - -#endif /* __GDC_GLOBAL_H_INCLUDED__ */ |