diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-08-01 10:54:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 10:54:12 +0100 |
| commit | 5e2cbb361e28968d26bbb0c3efd541ff543785cc (patch) | |
| tree | a6073c445907477f4571e86c33f6a124f8b8514d | |
| parent | 235581cfb73dbff5acd0fbf0c13e791f1286217d (diff) | |
| parent | c9e8774cb806dbf989ca84d401d6ecbd199f6b67 (diff) | |
| download | platform_external_arm-trusted-firmware-5e2cbb361e28968d26bbb0c3efd541ff543785cc.tar.gz platform_external_arm-trusted-firmware-5e2cbb361e28968d26bbb0c3efd541ff543785cc.tar.bz2 platform_external_arm-trusted-firmware-5e2cbb361e28968d26bbb0c3efd541ff543785cc.zip | |
Merge pull request #1038 from Leo-Yan/fix_vbus_det_irq
hikey: Disable VBUS_DET interrupt for PMIC
| -rw-r--r-- | plat/hisilicon/hikey/hikey_bl1_setup.c | 5 | ||||
| -rw-r--r-- | plat/hisilicon/hikey/include/hi6553.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/plat/hisilicon/hikey/hikey_bl1_setup.c b/plat/hisilicon/hikey/hikey_bl1_setup.c index b00587463..05e2e35db 100644 --- a/plat/hisilicon/hikey/hikey_bl1_setup.c +++ b/plat/hisilicon/hikey/hikey_bl1_setup.c @@ -288,6 +288,11 @@ static void hikey_hi6553_init(void) /* select 32.764KHz */ mmio_write_8(HI6553_CLK19M2_600_586_EN, 0x01); + + /* Disable vbus_det interrupts */ + data = mmio_read_8(HI6553_IRQ2_MASK); + data = data | 0x3; + mmio_write_8(HI6553_IRQ2_MASK, data); } static void init_mmc0_pll(void) diff --git a/plat/hisilicon/hikey/include/hi6553.h b/plat/hisilicon/hikey/include/hi6553.h index 76cb8ff10..a80d36dfb 100644 --- a/plat/hisilicon/hikey/include/hi6553.h +++ b/plat/hisilicon/hikey/include/hi6553.h @@ -19,6 +19,7 @@ #define DISABLE6_XO_CLK_RF2 (1 << 4) #define HI6553_VERSION_REG (PMUSSI_BASE + (0x000 << 2)) +#define HI6553_IRQ2_MASK (PMUSSI_BASE + (0x008 << 2)) #define HI6553_ENABLE2_LDO1_8 (PMUSSI_BASE + (0x029 << 2)) #define HI6553_DISABLE2_LDO1_8 (PMUSSI_BASE + (0x02a << 2)) #define HI6553_ONOFF_STATUS2_LDO1_8 (PMUSSI_BASE + (0x02b << 2)) |