andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #982 from hzhuang1/fix_hikey960 

Fix hikey960
This commit is contained in:
davidcunado-arm 2017-06-13 09:21:09 +01:00 committed by GitHub
parent c396b7368a 8aa928accf
commit 42fb35a8e6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ufs/ufs.c
View File

@ -45,7 +45,7 @@ int ufshc_send_uic_cmd(uintptr_t base, uic_cmd_t *cmd)
data = mmio_read_32(base + IS);
} while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS);
return mmio_read_32(base + UCMDARG2) && CONFIG_RESULT_CODE_MASK;
return mmio_read_32(base + UCMDARG2) & CONFIG_RESULT_CODE_MASK;
}
int ufshc_dme_get(unsigned int attr, unsigned int idx, unsigned int *val)
@ -77,7 +77,7 @@ int ufshc_dme_get(unsigned int attr, unsigned int idx, unsigned int *val)
return -EINVAL;
} while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS);
data = mmio_read_32(base + UCMDARG2) && CONFIG_RESULT_CODE_MASK;
data = mmio_read_32(base + UCMDARG2) & CONFIG_RESULT_CODE_MASK;
assert(data == 0);
*val = mmio_read_32(base + UCMDARG3);
@ -106,7 +106,7 @@ int ufshc_dme_set(unsigned int attr, unsigned int idx, unsigned int val)
return -EINVAL;
} while ((data & UFS_INT_UCCS) == 0);
mmio_write_32(base + IS, UFS_INT_UCCS);
data = mmio_read_32(base + UCMDARG2) && CONFIG_RESULT_CODE_MASK;
data = mmio_read_32(base + UCMDARG2) & CONFIG_RESULT_CODE_MASK;
assert(data == 0);
return 0;
}

4
plat/hisilicon/hikey960/hikey960_boardid.c
View File

@ -111,9 +111,7 @@ static int adcin_data_remap(unsigned int adcin_value)
{
int ret;
if (adcin_value < HKADC_DATA_GRADE0)
ret = BOARDID_UNKNOWN;
else if (adcin_value < HKADC_DATA_GRADE1)
if (adcin_value < HKADC_DATA_GRADE1)
ret = BOARDID_VALUE0;
else if (adcin_value < HKADC_DATA_GRADE2)
ret = BOARDID_VALUE1;