commit | 8608ac5262e8b04e72cef118477baf445f5435aa | [log] [tgz] |
---|---|---|
author | Dmitry Shmidt <dimitrysh@google.com> | Wed Jan 17 10:12:34 2018 -0800 |
committer | Dmitry Shmidt <dimitrysh@google.com> | Wed Jan 17 10:12:34 2018 -0800 |
tree | 0875bf46c0a880d19efd627912ed3ff5e6ebf50e | |
parent | b6e0ee9c69e0e3d760cfaa3dca75bdeb9a3fea63 [diff] | |
parent | 42f4d897b6bff97c1f19d55b8ca45ecdfa081589 [diff] |
Merge remote-tracking branch 'aosp/upstream-hikey' into atf Change-Id: I37e6b218f2745a4432645bbff43899d954c19e41
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 */