diff --git a/plat/hikey/bl1_plat_setup.c b/plat/hikey/bl1_plat_setup.c
index 06c4205..cb3b252 100644
--- a/plat/hikey/bl1_plat_setup.c
+++ b/plat/hikey/bl1_plat_setup.c
@@ -399,6 +399,11 @@
 
 	/* select 32.764KHz */
 	hi6553_write_8(CLK19M2_600_586_EN, 0x01);
+
+	/* Disable PMIC internal interrupt */
+	data = hi6553_read_8(IRQ2_MASK);
+	data = data | 0x3;
+	hi6553_write_8(IRQ2_MASK, data);
 }
 
 static void hikey_gpio_init(void)
@@ -431,6 +436,10 @@
 	gpio_direction_output(34);
 	gpio_direction_output(35);
 
+	/* Clear GPIO5 and GPIO6 interrutps */
+	mmio_write_32(GPIO5_BASE + 0x41C, 0xFF);
+	mmio_write_32(GPIO6_BASE + 0x41C, 0xFF);
+
 	/* Initialize PWR_HOLD GPIO */
 	gpio_set_value(0, 1);
 	gpio_direction_output(0);
diff --git a/plat/hikey/include/hi6553.h b/plat/hikey/include/hi6553.h
index 452b28f..7e642c0 100644
--- a/plat/hikey/include/hi6553.h
+++ b/plat/hikey/include/hi6553.h
@@ -41,6 +41,7 @@
 #define DISABLE6_XO_CLK_RF2			(1 << 4)
 
 #define VERSION_REG				0x000
+#define IRQ2_MASK				0x008
 #define ENABLE2_LDO1_8				0x029
 #define DISABLE2_LDO1_8				0x02a
 #define ONOFF_STATUS2_LDO1_8			0x02b