diff options
Diffstat (limited to 'drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c')
-rw-r--r-- | drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c index de442f1fa6ba..d0a43c44963c 100644 --- a/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c +++ b/drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c @@ -15,17 +15,16 @@ #include "input_system.h" -#ifdef HAS_INPUT_SYSTEM_VERSION_2 #include "ia_css_isys.h" #include "platform_support.h" -#ifdef USE_INPUT_SYSTEM_VERSION_2401 -#include "isys_dma.h" /* isys2401_dma_set_max_burst_size() */ +#ifdef ISP2401 +#include "isys_dma_public.h" /* isys2401_dma_set_max_burst_size() */ #include "isys_irq.h" #endif -#if defined(USE_INPUT_SYSTEM_VERSION_2) -input_system_error_t ia_css_isys_init(void) +#if !defined(ISP2401) +input_system_err_t ia_css_isys_init(void) { backend_channel_cfg_t backend_ch0; backend_channel_cfg_t backend_ch1; @@ -33,7 +32,7 @@ input_system_error_t ia_css_isys_init(void) target_cfg2400_t targetC; u32 acq_mem_region_size = 24; u32 acq_nof_mem_regions = 2; - input_system_error_t error = INPUT_SYSTEM_ERR_NO_ERROR; + input_system_err_t error = INPUT_SYSTEM_ERR_NO_ERROR; memset(&backend_ch0, 0, sizeof(backend_channel_cfg_t)); memset(&backend_ch1, 0, sizeof(backend_channel_cfg_t)); @@ -87,8 +86,8 @@ input_system_error_t ia_css_isys_init(void) return error; } -#elif defined(USE_INPUT_SYSTEM_VERSION_2401) -input_system_error_t ia_css_isys_init(void) +#elif defined(ISP2401) +input_system_err_t ia_css_isys_init(void) { ia_css_isys_csi_rx_lut_rmgr_init(); ia_css_isys_ibuf_rmgr_init(); @@ -107,11 +106,11 @@ input_system_error_t ia_css_isys_init(void) } #endif -#if defined(USE_INPUT_SYSTEM_VERSION_2) +#if !defined(ISP2401) void ia_css_isys_uninit(void) { } -#elif defined(USE_INPUT_SYSTEM_VERSION_2401) +#elif defined(ISP2401) void ia_css_isys_uninit(void) { ia_css_isys_csi_rx_lut_rmgr_uninit(); @@ -121,4 +120,3 @@ void ia_css_isys_uninit(void) } #endif -#endif |