From b82cd6b7f587bb6638d6a1cc5254437a9f69a4be Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 29 Apr 2020 21:55:48 +0200 Subject: [PATCH] media: atomisp: make all file names unique at atomisp driver The *system_*.h files contain ISP-specific definitions, and are used everywhere. While the best would be to get rid of those in favor of some ISP-specific structs, a change like that would require lots of changes. So, instead, let's rename those files replacing them by new ones with ISP ifdefs on it, in order to select between the two different versions. We shall later convert this to some abrstraction layer, but this change should help to be able to build support for either ISP2400 or ISP2401. Signed-off-by: Mauro Carvalho Chehab --- .../media/atomisp/pci/atomisp2/css2400/input_system_global.h | 10 ++++++++++ .../media/atomisp/pci/atomisp2/css2400/input_system_local.h | 10 ++++++++++ .../media/atomisp/pci/atomisp2/css2400/input_system_private.h | 10 ++++++++++ .../media/atomisp/pci/atomisp2/css2400/input_system_public.h | 8 ++++++++ .../host/input_system_local.h => isp2400_input_system_local.h} | 0 .../input_system_private.h => isp2400_input_system_private.h} | 0 .../input_system_public.h => isp2400_input_system_public.h} | 0 .../system_global.h => isp2400_system_global.h} | 0 .../host/system_local.h => isp2400_system_local.h} | 0 .../input_system_global.h => isp2401_input_system_global.h} | 0 .../host/input_system_local.h => isp2401_input_system_local.h} | 0 .../input_system_private.h => isp2401_input_system_private.h} | 0 .../system_global.h => isp2401_system_global.h} | 0 .../host/system_local.h => isp2401_system_local.h} | 0 .../staging/media/atomisp/pci/atomisp2/css2400/system_global.h | 10 ++++++++++ .../staging/media/atomisp/pci/atomisp2/css2400/system_local.h | 10 ++++++++++ .../input_system_global.h => isp2400_input_system_global.h} | 0 17 files changed, 58 insertions(+) create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_global.h create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_local.h create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_private.h create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_public.h rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{hive_isp_css_common/host/input_system_local.h => isp2400_input_system_local.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{hive_isp_css_common/host/input_system_private.h => isp2400_input_system_private.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{hive_isp_css_include/host/input_system_public.h => isp2400_input_system_public.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{hive_isp_css_common/system_global.h => isp2400_system_global.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{hive_isp_css_common/host/system_local.h => isp2400_system_local.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{css_2401_csi2p_system/input_system_global.h => isp2401_input_system_global.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{css_2401_csi2p_system/host/input_system_local.h => isp2401_input_system_local.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{css_2401_csi2p_system/host/input_system_private.h => isp2401_input_system_private.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{css_2401_csi2p_system/system_global.h => isp2401_system_global.h} (100%) rename drivers/staging/media/atomisp/pci/atomisp2/css2400/{css_2401_csi2p_system/host/system_local.h => isp2401_system_local.h} (100%) create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/system_global.h create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/system_local.h rename drivers/staging/media/atomisp/pci/atomisp2/{css2400/hive_isp_css_common/input_system_global.h => isp2400_input_system_global.h} (100%) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_global.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_global.h new file mode 100644 index 000000000000..e75c2f29042d --- /dev/null +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_global.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * (c) 2020 Mauro Carvalho Chehab + */ + +#ifdef ISP2401 +# include "isp2401_input_system_global.h" +#else +# include "isp2400_input_system_global.h" +#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_local.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_local.h new file mode 100644 index 000000000000..8533a1e017e4 --- /dev/null +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_local.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * (c) 2020 Mauro Carvalho Chehab + */ + +#ifdef ISP2401 +# include "isp2401_input_system_local.h" +#else +# include "isp2400_input_system_local.h" +#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_private.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_private.h new file mode 100644 index 000000000000..69c63a79a30c --- /dev/null +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_private.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * (c) 2020 Mauro Carvalho Chehab + */ + +#ifdef ISP2401 +# include "isp2401_input_system_private.h" +#else +# include "isp2400_input_system_private.h" +#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_public.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_public.h new file mode 100644 index 000000000000..17682c86bceb --- /dev/null +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/input_system_public.h @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * (c) 2020 Mauro Carvalho Chehab + */ + +#ifndef ISP2401 +# include "isp2400_input_system_public.h" +#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_local.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_local.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_local.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_local.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_private.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_private.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_private.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_private.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_system_public.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_public.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_system_public.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_input_system_public.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/system_global.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_system_global.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/system_global.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_system_global.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/system_local.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_system_local.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/system_local.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2400_system_local.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/input_system_global.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_global.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/input_system_global.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_global.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_local.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_local.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_local.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_local.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_private.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_private.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_private.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_input_system_private.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/system_global.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_system_global.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/system_global.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_system_global.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/system_local.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_system_local.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/system_local.h rename to drivers/staging/media/atomisp/pci/atomisp2/css2400/isp2401_system_local.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/system_global.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/system_global.h new file mode 100644 index 000000000000..7f833c15f3ce --- /dev/null +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/system_global.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * (c) 2020 Mauro Carvalho Chehab + */ + +#ifdef ISP2401 +# include "isp2401_system_global.h" +#else +# include "isp2400_system_global.h" +#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/system_local.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/system_local.h new file mode 100644 index 000000000000..fbb5daadac9f --- /dev/null +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/system_local.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * (c) 2020 Mauro Carvalho Chehab + */ + +#ifdef ISP2401 +# include "isp2401_system_local.h" +#else +# include "isp2400_system_local.h" +#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_system_global.h b/drivers/staging/media/atomisp/pci/atomisp2/isp2400_input_system_global.h similarity index 100% rename from drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_system_global.h rename to drivers/staging/media/atomisp/pci/atomisp2/isp2400_input_system_global.h -- 2.11.0