| commit | 090aac9db6f769910ecbc2885ca426a7364ffe57 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <[email protected]> | Wed Jan 17 20:17:29 2018 +0000 |
| committer | android-build-merger <[email protected]> | Wed Jan 17 20:17:29 2018 +0000 |
| tree | 0875bf46c0a880d19efd627912ed3ff5e6ebf50e | |
| parent | 07f5202bf49953143a809608736fae6402b21b27 [diff] | |
| parent | 2afd8f04b38aca9a7b9b1148da1756272c32fa4e [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey' into atf am: 8608ac5262 am: 2afd8f04b3 Change-Id: I6476ff0764e976ce4b3a684c1ea0ff3d702fb09c
diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c index 6dfada7..d6b5a3d 100644 --- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c
@@ -642,6 +642,8 @@ } /* GPIO005 - PMU SSI, 10mA */ mmio_write_32(IOCG_006_REG, 2 << 4); + /* GPIO213 - PCIE_CLKREQ_N */ + mmio_write_32(IOMG_AO_033_REG, 1); } /*
diff --git a/plat/hisilicon/hikey960/include/hi3660.h b/plat/hisilicon/hikey960/include/hi3660.h index 83d1b36..ab7b8aa 100644 --- a/plat/hisilicon/hikey960/include/hi3660.h +++ b/plat/hisilicon/hikey960/include/hi3660.h
@@ -335,6 +335,8 @@ #define IOMG_AO_026_REG (IOMG_AO_REG_BASE + 0x068) /* GPIO219: PD interrupt. pull up */ #define IOMG_AO_039_REG (IOMG_AO_REG_BASE + 0x09C) +/* GPIO213: PCIE_CLKREQ_N */ +#define IOMG_AO_033_REG (IOMG_AO_REG_BASE + 0x084) #define IOCG_AO_REG_BASE 0xFFF1187C /* GPIO219: PD interrupt. pull up */