diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-05-20 12:01:52 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-05-20 12:32:23 +0200 |
| commit | 44380aa822bf190102d46392cf806d88271fd555 (patch) | |
| tree | 6daf7c24e8557dd9aa0b902b02fb2ea1e8da4091 | |
| parent | 113d2bac408b8f7168532afaed88097df1d260ce (diff) | |
media: atomisp: unify the version for isp2401 a0 and b0 versionsold/cs_44380aa822bf
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>
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c index 592c41bb5166..694268d133c0 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -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 == |