aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@linaro.org>2018-01-10 21:00:07 +0800
committerGitHub <noreply@github.com>2018-01-10 21:00:07 +0800
commit42f4d897b6bff97c1f19d55b8ca45ecdfa081589 (patch)
tree0875bf46c0a880d19efd627912ed3ff5e6ebf50e
parentef1908e5d2e66109cb662f9ba09e754ada470ef0 (diff)
parent395b3b741748467f5132d6cac990abb3f1cdad85 (diff)
downloadarm-trusted-firmware-42f4d897b6bff97c1f19d55b8ca45ecdfa081589.tar.gz
Merge pull request #20 from hzhuang1/fix_pcie_2upstream-hikey-tempupstream-hikey
Hikey960: Fix hikey960 pcie mount fail
-rw-r--r--plat/hisilicon/hikey960/hikey960_bl1_setup.c2
-rw-r--r--plat/hisilicon/hikey960/include/hi3660.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c
index 6dfada75..d6b5a3de 100644
--- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c
+++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c
@@ -642,6 +642,8 @@ static void hikey960_pinmux_init(void)
}
/* 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 83d1b363..ab7b8aa4 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 */