device_linaro_bootloader_arm-trusted-firmware, branch pie-b4s4-dev Unnamed repository; edit this file 'description' to name the repository. Merge remote-tracking branch 'aosp/upstream-hikey' into atf am: 8608ac5262 am: 2afd8f04b3 2018-01-17T20:20:10+00:00 Dmitry Shmidt dimitrysh@google.com 2018-01-17T20:20:10+00:00 b23f5fb1ac2033077c7204f604b2c74649b0e9a3 am: 090aac9db6 Change-Id: I61511d9c7825ae39e206d7410e5ca9f0f0259472 
am: 090aac9db6

Change-Id: I61511d9c7825ae39e206d7410e5ca9f0f0259472
Merge remote-tracking branch 'aosp/upstream-hikey' into atf am: 8608ac5262 2018-01-17T20:17:29+00:00 Dmitry Shmidt dimitrysh@google.com 2018-01-17T20:17:29+00:00 090aac9db6f769910ecbc2885ca426a7364ffe57 am: 2afd8f04b3 Change-Id: I6476ff0764e976ce4b3a684c1ea0ff3d702fb09c 
am: 2afd8f04b3

Change-Id: I6476ff0764e976ce4b3a684c1ea0ff3d702fb09c
Merge remote-tracking branch 'aosp/upstream-hikey' into atf 2018-01-17T20:15:02+00:00 Dmitry Shmidt dimitrysh@google.com 2018-01-17T20:15:02+00:00 2afd8f04b38aca9a7b9b1148da1756272c32fa4e am: 8608ac5262 Change-Id: I874c82fd658d72570256f5d00766689d741bd95c 
am: 8608ac5262

Change-Id: I874c82fd658d72570256f5d00766689d741bd95c
Merge remote-tracking branch 'aosp/upstream-hikey' into atf 2018-01-17T18:12:34+00:00 Dmitry Shmidt dimitrysh@google.com 2018-01-17T18:12:34+00:00 8608ac5262e8b04e72cef118477baf445f5435aa Change-Id: I37e6b218f2745a4432645bbff43899d954c19e41 
Change-Id: I37e6b218f2745a4432645bbff43899d954c19e41
Merge pull request #20 from hzhuang1/fix_pcie_2 2018-01-10T13:00:07+00:00 Haojian Zhuang haojian.zhuang@linaro.org 2018-01-10T13:00:07+00:00 42f4d897b6bff97c1f19d55b8ca45ecdfa081589 Hikey960: Fix hikey960 pcie mount fail 
Hikey960: Fix hikey960 pcie mount fail
 Hikey960: Fix hikey960 pcie mount fail 2018-01-10T09:00:45+00:00 Kaihua Zhong zhongkaihua@huawei.com 2018-01-09T08:51:38+00:00 395b3b741748467f5132d6cac990abb3f1cdad85 Set IOC_AO_IOMG_033 function from GPIO213 to PCIE_CLKREQ_N bit[0-2]: 000: GPIO_213; 001: PCIE_CLKREQ_N; 010: GPIO_018_SH; 100: GPIO_014_SE; 110: FAC_TEST24; 111: FAC_TEST24; bit[3-31]: reserved Signed-off-by: Guangtao Zhang <zhangguangtao@hisilicon.com> Tested-by: Yao Chen <chenyao11@huawei.com> Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org> 
Set IOC_AO_IOMG_033 function from GPIO213 to PCIE_CLKREQ_N

bit[0-2]:  000: GPIO_213;
           001: PCIE_CLKREQ_N;
           010: GPIO_018_SH;
           100: GPIO_014_SE;
           110: FAC_TEST24;
           111: FAC_TEST24;
bit[3-31]: reserved

Signed-off-by: Guangtao Zhang <zhangguangtao@hisilicon.com>
Tested-by: Yao Chen <chenyao11@huawei.com>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2017-11-15T01:52:08+00:00 Xin Li delphij@google.com 2017-11-15T01:52:08+00:00 ccf328ed59547bb032796dbc8bb875def8bea0c8 am: 07f5202bf4 Change-Id: I4c571d47fce5087cc0bf958bf278342c9df85d53 
am: 07f5202bf4

Change-Id: I4c571d47fce5087cc0bf958bf278342c9df85d53
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2017-11-15T00:38:08+00:00 Xin Li delphij@google.com 2017-11-15T00:38:08+00:00 07f5202bf49953143a809608736fae6402b21b27 Change-Id: I34e501c7c9839020e53047fec7470c8aec9c7e44 
Change-Id: I34e501c7c9839020e53047fec7470c8aec9c7e44
Merge commit 'c3a21abd5624f1d9bce9f3b009c0af408a0c22ec' into HEAD 2017-11-13T22:35:19+00:00 Xin Li delphij@google.com 2017-11-13T22:35:19+00:00 b6e0ee9c69e0e3d760cfaa3dca75bdeb9a3fea63 Change-Id: Ieed88b8053ca3e7249dee5fa8afe4549d39635f1 
Change-Id: Ieed88b8053ca3e7249dee5fa8afe4549d39635f1
Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: d7f137ecb7 am: 72a61be33b 2017-11-09T21:59:15+00:00 Dmitry Shmidt dimitrysh@google.com 2017-11-09T21:59:15+00:00 377cb66540e9f5f26b97c779a411a302eeaf45a9 am: f80b69635a Change-Id: I121dedc746e6db36c8e25fa019aa5f10c3ee22f6 
am: f80b69635a

Change-Id: I121dedc746e6db36c8e25fa019aa5f10c3ee22f6