That's the last header file which had ifdefs for ISP2401.

The problem is that the conflicting dependencies were on another
file (sh_css_defs.h). Move the conflicting code to it, adding
a prefix which would describe what version the macro applies.

Then, ensure that binary.c will use the right version,
according with the hardware version.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Most of the remaining ifdefs check for ISP2401 are trivial.

Get rid of them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Those files aren't used. So, just get rid of them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The contents of this file is identical to ipu2_io_ls, except
for the bayer directory, with is only at ipu2_io_ls.

So, get rid of the duplicated code.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

This file is different than the anr1 version. So, let's name
it differently.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

There are two instances of those, one for isp2401 and another
one for isp2400, both with identical contents, except for
comments and an ifdef.

Get rid of one of them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Some BIOSes seem to use different names for some regulators.

Use regulator_get_optional() for the first attempt, in order
to avoid using the dummy regulator and produce a warning, in
the case that the first attempt fails.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Those were extracted from an ACPI dump:

 * Original Table Header:
 *     Signature        "DSDT"
 *     Length           0x0001A0BD (106685)
 *     Revision         0x02
 *     Checksum         0x76
 *     OEM ID           "_ASUS_"
 *     OEM Table ID     "Notebook"
 *     OEM Revision     0x01072009 (17244169)
 *     Compiler ID      "INTL"
 *     Compiler Version 0x20120913 (538052883)
 */
DefinitionBlock ("", "DSDT", 2, "_ASUS_", "Notebook", 0x01072009)
...
                    Local0 = Package (0x12)
                        {
                            "CamId",
                            "ov2680",
                            "CamType",
                            "1",
                            "CsiPort",
                            "0",
                            "CsiLanes",
                            "1",
                            "CsiFmt",
                            "15",
                            "CsiBayer",
                            "0",
                            "CamClk",
                            "1",
                            "Regulator1p8v",
                            "0",
                            "Regulator2p8v",
                            "0"
                        }

Note: the DMI_MATCH() line probably needs to be tweaked.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The last header (hive_isp_css_2401_irq_types_hrt.h) is also
almost identical, except by an if ISP2400 inside a comment
block.

Remove the duplication and keep just one file.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

While those headers are different, the different fields
aren't used at the driver. So, remove those different
unused fields, rename one define and use just one header
for all 3 different versions of the ISP.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Nothing here is really used by the driver. So, let's just
get rid of them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Those files have identical contents, but are located at
different parts of the driver. As their contents are identical,
we can simply remove them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The isp_capture_defs.h contain several unused defines.
Get rid of some of them, making all 3 instances identical.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Those 4 header files aren't used anyware. So, send them to
the trash can.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

On several header files, the dependency for ISP2401 is
trivial: for example, it just adds new fields on structs or
declare new functions.

Get rid of those trivial cases.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Those vars aren't used anymore at this driver. Get rid of
them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

None of those SH_CSS_BINARY_ID_* symbols are used by this driver
anymore. So, get rid of all of them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Get rid of all those ifdefs that were checking for ISP2401 inside
sh_css.c.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Don't hide those small functions behind ifdefs.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

There are no ia_css_set_system_mode() nor
ia_css_is_system_mode_suspend_or_resume() functions at the driver.

So, get rid of the code that would try to call it.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

It doesn't make any sense to change the number of parameters
for this function depending on the ISP version.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The css_trace header for ISP2401 also builds on older versions, and
seems to be compatible with all versions. So, remove all ifdefs
in favor of the CSP2401 version.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

This patch addresses what it sounds to be a change at the
name of some ACPI registers on newer ACPI tables.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The CSS version returned by ISP2400 is different than the one
returned by ISP2401.

While we could return just one version for both, as this sounds
like just an informative string, for now, let's keep returning
different versions, as we don't know if this would affect
userspace.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

As namespaces aren't duplicated here, just remove the ifdefs.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Instead of packing parameters differently on ISP2400 and ISP2401,
use just one way of passing them for both.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The way atomisp_dfs_tables.h is defined, it ends by duplicating
all data structs there on both atomisp_v4l2.c and atomisp_cmd.c.

Change the logic in order to place the definitions only on a single
place.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

This header is really version-independent. So, just get rid
of the macros from it.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

This function call has two parameters that are used only with
ISP2401, enclosed on some ugly ifdefs. Make the function independent,
passing NULL values for ISP2400.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Use the same struct for both ISP2400 and ISP2401.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

There are several #ifdefs checking for ISP version there. Some
of them are just two different ways to represent the same contants,
while 3 parameters are actually different, depending on the ISP
version.

Change the header in a way that it will be compatible with both
versions, and change dependent code to keep running, removing
ifdefs there only when possible.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

There are two ioctls that are only available with ISP2401. Yet,
at the compat level, we don't really need to take care, as
the native ioctl handler will already return an error code if
the ioctl doesn't exist.

So, let's just remove the ifdefs here.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Remove ifdefs that check ISP version from the code, switching
to specific ISP-dependent code at runtime.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The ifdefs there are meaningless. Just remove them for good.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Remove ISP-version-dependent ifdefs.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Add a runtime check to use the proper wdt timer init at runtime,
depending on the chipset revision.

For now, we can't get rid of the remaining version checks, as
the rest of the code is not prepared yet to detect the ISP
version on runtime.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Replace #ifdef occurrences there with runtime checks.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Those ifs can easily be removed without breaking the code.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

There's a dependency on this header for the ISP model. While
this sounds really weird (as just one resolution needs it),
as we don't know what's the right value, let's just keep it.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The logic there has lots of ifdef dependencies if the hardware
is either ISP2400 or ISP2041.

Replace them by runtime checks.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>