mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 13:49:24 -04:00
Merge "scsi: ufshcd: Properly set the device Icc Level"
This commit is contained in:
commit
95d17c2e1d
2 changed files with 6 additions and 3 deletions
|
|
@ -7614,7 +7614,9 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba,
|
|||
* vendors don't use this rail for embedded UFS devices as well. So
|
||||
* it is normal that VCCQ rail may not be provided for given platform.
|
||||
*/
|
||||
if (!hba->vreg_info.vcc || !hba->vreg_info.vccq2) {
|
||||
if (!hba->vreg_info.vcc ||
|
||||
(!hba->vreg_info.vccq && hba->dev_info.wspecversion >= 0x300) ||
|
||||
(!hba->vreg_info.vccq2 && hba->dev_info.wspecversion < 0x300)) {
|
||||
dev_err(hba->dev, "%s: Regulator capability was not set, bActiveICCLevel=%d\n",
|
||||
__func__, icc_level);
|
||||
goto out;
|
||||
|
|
|
|||
|
|
@ -6881,8 +6881,9 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba,
|
|||
{
|
||||
u32 icc_level = 0;
|
||||
|
||||
if (!hba->vreg_info.vcc || !hba->vreg_info.vccq ||
|
||||
!hba->vreg_info.vccq2) {
|
||||
if (!hba->vreg_info.vcc ||
|
||||
(!hba->vreg_info.vccq && hba->dev_info.wspecversion >= 0x300) ||
|
||||
(!hba->vreg_info.vccq2 && hba->dev_info.wspecversion < 0x300)) {
|
||||
dev_err(hba->dev,
|
||||
"%s: Regulator capability was not set, actvIccLevel=%d",
|
||||
__func__, icc_level);
|
||||
|
|
|
|||
Loading…
Reference in a new issue