UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] atomisp: de-duplicate sh_css_mmu_set_page_table_base_index 

Between the ISP2400 and ISP2401 code base this function moved file. The merge
of the drivers left us with two version in ifdefs. Resolve this down to a
single copy.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Alan Cox 2017-05-26 12:29:48 -03:00 committed by Mauro Carvalho Chehab
parent 4950cfecd1
commit fc99349413
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu_private.h
View File

@ -1,4 +1,3 @@
#ifdef ISP2401
/* /*
* Support for Intel Camera Imaging ISP subsystem. * Support for Intel Camera Imaging ISP subsystem.
* Copyright (c) 2015, Intel Corporation. * Copyright (c) 2015, Intel Corporation.
@ -28,4 +27,3 @@ void
sh_css_mmu_set_page_table_base_index(hrt_data base_index); sh_css_mmu_set_page_table_base_index(hrt_data base_index);
#endif /* __IA_CSS_MMU_PRIVATE_H */ #endif /* __IA_CSS_MMU_PRIVATE_H */
#endif

24
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
View File

@ -64,7 +64,7 @@
#include "input_system.h" #include "input_system.h"
#endif #endif
#include "mmu_device.h" /* mmu_set_page_table_base_index(), ... */ #include "mmu_device.h" /* mmu_set_page_table_base_index(), ... */
//#include "ia_css_mmu_private.h" /* sh_css_mmu_set_page_table_base_index() */ #include "ia_css_mmu_private.h" /* sh_css_mmu_set_page_table_base_index() */
#include "gdc_device.h" /* HRT_GDC_N */ #include "gdc_device.h" /* HRT_GDC_N */
#include "dma.h" /* dma_set_max_burst_size() */ #include "dma.h" /* dma_set_max_burst_size() */
#include "irq.h" /* virq */ #include "irq.h" /* virq */
@ -242,11 +242,6 @@ ia_css_reset_defaults(struct sh_css* css);
static void static void
sh_css_init_host_sp_control_vars(void); sh_css_init_host_sp_control_vars(void);
#ifndef ISP2401
static void
sh_css_mmu_set_page_table_base_index(hrt_data base_index);
#endif
static enum ia_css_err set_num_primary_stages(unsigned int *num, enum ia_css_pipe_version version); static enum ia_css_err set_num_primary_stages(unsigned int *num, enum ia_css_pipe_version version);
static bool static bool
@ -2595,23 +2590,6 @@ ia_css_uninit(void)
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_uninit() leave: return_void\n"); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_uninit() leave: return_void\n");
} }
#ifndef ISP2401
/* Deprecated, this is an HRT backend function (memory_access.h) */
static void
sh_css_mmu_set_page_table_base_index(hrt_data base_index)
{
int i;
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "sh_css_mmu_set_page_table_base_index() enter: base_index=0x%08x\n",base_index);
my_css.page_table_base_index = base_index;
for (i = 0; i < (int)N_MMU_ID; i++) {
mmu_ID_t mmu_id = (mmu_ID_t)i;
mmu_set_page_table_base_index(mmu_id, base_index);
mmu_invalidate_cache(mmu_id);
}
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "sh_css_mmu_set_page_table_base_index() leave: return_void\n");
}
#endif
#if defined(HAS_IRQ_MAP_VERSION_2) #if defined(HAS_IRQ_MAP_VERSION_2)
enum ia_css_err ia_css_irq_translate( enum ia_css_err ia_css_irq_translate(
unsigned int *irq_infos) unsigned int *irq_infos)

6
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mmu.c
View File

@ -13,16 +13,12 @@
*/ */
#include "ia_css_mmu.h" #include "ia_css_mmu.h"
#ifdef ISP2401
#include "ia_css_mmu_private.h" #include "ia_css_mmu_private.h"
#endif
#include <ia_css_debug.h> #include <ia_css_debug.h>
#include "sh_css_sp.h" #include "sh_css_sp.h"
#include "sh_css_firmware.h" #include "sh_css_firmware.h"
#include "sp.h" #include "sp.h"
#ifdef ISP2401
#include "mmu_device.h" #include "mmu_device.h"
#endif
void void
ia_css_mmu_invalidate_cache(void) ia_css_mmu_invalidate_cache(void)
@ -44,7 +40,6 @@ ia_css_mmu_invalidate_cache(void)
} }
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_mmu_invalidate_cache() leave\n"); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_mmu_invalidate_cache() leave\n");
} }
#ifdef ISP2401
/* Deprecated, this is an HRT backend function (memory_access.h) */ /* Deprecated, this is an HRT backend function (memory_access.h) */
void void
@ -59,4 +54,3 @@ sh_css_mmu_set_page_table_base_index(hrt_data base_index)
} }
IA_CSS_LEAVE_PRIVATE(""); IA_CSS_LEAVE_PRIVATE("");
} }
#endif