Commit 99723116 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp: make dfs_config_merr_117a struct const

This setting is used only for one of te Merryfield PCI IDs.

As this is an ISP2400, we can just get rid of a version
test, writing the right value directly inside the struct.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 25bccb98
...@@ -217,7 +217,7 @@ static const struct atomisp_dfs_config dfs_config_merr_1179 = { ...@@ -217,7 +217,7 @@ static const struct atomisp_dfs_config dfs_config_merr_1179 = {
.dfs_table_size = ARRAY_SIZE(dfs_rules_merr_1179), .dfs_table_size = ARRAY_SIZE(dfs_rules_merr_1179),
}; };
static struct atomisp_freq_scaling_rule dfs_rules_merr_117a[] = { static const struct atomisp_freq_scaling_rule dfs_rules_merr_117a[] = {
{ {
.width = 1920, .width = 1920,
.height = 1080, .height = 1080,
...@@ -229,11 +229,7 @@ static struct atomisp_freq_scaling_rule dfs_rules_merr_117a[] = { ...@@ -229,11 +229,7 @@ static struct atomisp_freq_scaling_rule dfs_rules_merr_117a[] = {
.width = 1080, .width = 1080,
.height = 1920, .height = 1920,
.fps = 30, .fps = 30,
/* .isp_freq = ISP_FREQ_266MHZ,
* FIXME: this is weird, but .isp_freq depends on
* the chip being ISP2400 or ISP2401. So, this should be
* initialized on runtime.
*/
.run_mode = ATOMISP_RUN_MODE_VIDEO, .run_mode = ATOMISP_RUN_MODE_VIDEO,
}, },
{ {
...@@ -1629,15 +1625,6 @@ static int atomisp_pci_probe(struct pci_dev *dev, ...@@ -1629,15 +1625,6 @@ static int atomisp_pci_probe(struct pci_dev *dev,
isp->dfs = &dfs_config_merr_1179; isp->dfs = &dfs_config_merr_1179;
break; break;
case ATOMISP_PCI_DEVICE_SOC_MRFLD_117A: case ATOMISP_PCI_DEVICE_SOC_MRFLD_117A:
/*
* FIXME: This should likely be uneeded. Either one
* value is likely the correct one for this resolution
*/
if (!atomisp_hw_is_isp2401)
dfs_rules_merr_117a[1].isp_freq = ISP_FREQ_266MHZ;
else
dfs_rules_merr_117a[1].isp_freq = ISP_FREQ_400MHZ;
isp->dfs = &dfs_config_merr_117a; isp->dfs = &dfs_config_merr_117a;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment