OSDN Git Service

media: atomisp: unify the version for isp2401 a0 and b0 versions
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 20 May 2020 10:01:52 +0000 (12:01 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 20 May 2020 13:02:58 +0000 (15:02 +0200)
Based on Yocto Aero's repository, the file name for the isp2401
is the same for the B0 release.

So, unify it at the driver.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/atomisp_v4l2.c

index 592c41b..694268d 100644 (file)
@@ -1449,14 +1449,8 @@ atomisp_load_firmware(struct atomisp_device *isp)
        if (skip_fwload)
                return NULL;
 
-       if (isp->media_dev.hw_revision ==
-           ((ATOMISP_HW_REVISION_ISP2401 << ATOMISP_HW_REVISION_SHIFT)
-            | ATOMISP_HW_STEPPING_B0))
-               fw_path = "shisp_2401b0_v21.bin";
-
-       if (isp->media_dev.hw_revision ==
-           ((ATOMISP_HW_REVISION_ISP2401 << ATOMISP_HW_REVISION_SHIFT)
-            | ATOMISP_HW_STEPPING_A0))
+       if ((isp->media_dev.hw_revision  >> ATOMISP_HW_REVISION_SHIFT)
+            == ATOMISP_HW_REVISION_ISP2401)
                fw_path = "shisp_2401a0_v21.bin";
 
        if (isp->media_dev.hw_revision ==