diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-06-13 09:21:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 09:21:09 +0100 |
| commit | 42fb35a8e6d1ec6068972a419b5cd407648da7c1 (patch) | |
| tree | fec90049353f488602943e64d7de72afba0d9009 | |
| parent | c396b7368a04e561e1f684797f541bfce8037241 (diff) | |
| parent | 8aa928accff5808243318106c3579d318dc2050b (diff) | |
Merge pull request #982 from hzhuang1/fix_hikey960
Fix hikey960
| -rw-r--r-- | drivers/ufs/ufs.c | 6 | ||||
| -rw-r--r-- | plat/hisilicon/hikey960/hikey960_boardid.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index dbfcd0ff..d513d0a5 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -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; } diff --git a/plat/hisilicon/hikey960/hikey960_boardid.c b/plat/hisilicon/hikey960/hikey960_boardid.c index ac3e0385..90faa9d3 100644 --- a/plat/hisilicon/hikey960/hikey960_boardid.c +++ b/plat/hisilicon/hikey960/hikey960_boardid.c @@ -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; |