Commit 17c3827b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp: don't set hpll_freq twice with different values

The logic which sets the hpll_freq for BYT sets hpll_freq
to 1600MHz, but ignores it, and sets it again after reading
from-device-specific EFI vars (this time, using a default
of 2000MHz).

Remove the first set, as this will be overriden anyway.

While here, do minor adjustments on comments and on a
printk message.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c371af68
...@@ -1653,10 +1653,12 @@ static int atomisp_pci_probe(struct pci_dev *dev, ...@@ -1653,10 +1653,12 @@ static int atomisp_pci_probe(struct pci_dev *dev,
* resolution accordingly. * resolution accordingly.
*/ */
isp->dfs = &dfs_config_byt; isp->dfs = &dfs_config_byt;
isp->hpll_freq = HPLL_FREQ_1600MHZ;
/* HPLL frequency is known to be device-specific, but we don't /*
* HPLL frequency is known to be device-specific, but we don't
* have specs yet for exactly how it varies. Default to * have specs yet for exactly how it varies. Default to
* BYT-CR but let provisioning set it via EFI variable */ * BYT-CR but let provisioning set it via EFI variable
*/
isp->hpll_freq = gmin_get_var_int(&dev->dev, false, "HpllFreq", isp->hpll_freq = gmin_get_var_int(&dev->dev, false, "HpllFreq",
HPLL_FREQ_2000MHZ); HPLL_FREQ_2000MHZ);
...@@ -1708,7 +1710,7 @@ static int atomisp_pci_probe(struct pci_dev *dev, ...@@ -1708,7 +1710,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
default: default:
isp->hpll_freq = HPLL_FREQ_1600MHZ; isp->hpll_freq = HPLL_FREQ_1600MHZ;
dev_warn(isp->dev, dev_warn(isp->dev,
"read HPLL from cck failed.default 1600MHz.\n"); "read HPLL from cck failed. Default to 1600 MHz.\n");
} }
break; break;
default: default:
......
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