Commit bb4924c2 authored by Tsuchiya Yuto's avatar Tsuchiya Yuto Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: pci: release_version is now irci_stable_candrpv_0415_20150521_0458 

Now that we made atomisp work with firmware version
irci_stable_candrpv_0415_20150521_0458 also for ISP2401, the
release_version for ISP2401 is not irci_ecr-master_20150911_0724
anymore.

So, use the same release_version for both ISP2400 and ISP2401 (i.e.,
irci_stable_candrpv_0415_20150521_0458).

Referred to the following diff to make this patch:
- https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/diff/drivers/staging/media/atomisp/pci/sh_css_firmware.c?id=3c0538fbad9f1d07d588f631e380256d941e3d3a


  ("media: atomisp: get rid of most checks for ISP2401 version")
  changes for file sh_css_firmware.c

Signed-off-by: default avatarTsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent b37bca2e

drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Release Version: irci_stable_candrpv_0415_20150521_0458 */

/* Release Version: irci_ecr-master_20150911_0724 */

/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Release Version: irci_stable_candrpv_0415_20150521_0458 */

/* Release Version: irci_ecr-master_20150911_0724 */

/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Release Version: irci_stable_candrpv_0415_20150521_0458 */

/* Release Version: irci_ecr-master_20150911_0724 */

/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Release Version: irci_stable_candrpv_0415_20150521_0458 */

/* Release Version: irci_ecr-master_20150911_0724 */

/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

drivers/staging/media/atomisp/pci/sh_css_firmware.c

+1 −15
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ static struct firmware_header *firmware_header; 
 * which will be replaced with the actual RELEASE_VERSION

 * during package generation. Please do not modify

 */

static const char *isp2400_release_version = STR(irci_stable_candrpv_0415_20150521_0458);

static const char *isp2401_release_version = STR(irci_ecr - master_20150911_0724);

static const char *release_version = STR(irci_stable_candrpv_0415_20150521_0458);



#define MAX_FW_REL_VER_NAME	300

static char FW_rel_ver_name[MAX_FW_REL_VER_NAME] = "---";
@@ -190,13 +189,6 @@ sh_css_check_firmware_version(struct device *dev, const char *fw_data) 
{

	struct sh_css_fw_bi_file_h *file_header;



	const char *release_version;



	if (!IS_ISP2401)

		release_version = isp2400_release_version;

	else

		release_version = isp2401_release_version;



	firmware_header = (struct firmware_header *)fw_data;

	file_header = &firmware_header->file_header;
@@ -232,12 +224,6 @@ sh_css_load_firmware(struct device *dev, const char *fw_data, 
	struct ia_css_fw_info *binaries;

	struct sh_css_fw_bi_file_h *file_header;

	int ret;

	const char *release_version;



	if (!IS_ISP2401)

		release_version = isp2400_release_version;

	else

		release_version = isp2401_release_version;



	firmware_header = (struct firmware_header *)fw_data;

	file_header = &firmware_header->file_header;