diff --git a/arch/arm64/boot/dts/hisilicon/hisi_6421v600_pmic_spmi.dtsi b/arch/arm64/boot/dts/hisilicon/hisi_6421v600_pmic_spmi.dtsi
old mode 100755
new mode 100644
diff --git a/arch/arm64/boot/dts/hisilicon/kirin970-hikey970.dts b/arch/arm64/boot/dts/hisilicon/kirin970-hikey970.dts
old mode 100755
new mode 100644
diff --git a/arch/arm64/boot/dts/hisilicon/kirin970.dtsi b/arch/arm64/boot/dts/hisilicon/kirin970.dtsi
old mode 100755
new mode 100644
diff --git a/arch/arm64/boot/dts/hisilicon/kirin970_spmi.dtsi b/arch/arm64/boot/dts/hisilicon/kirin970_spmi.dtsi
old mode 100755
new mode 100644
diff --git a/arch/arm64/configs/hikey970_defconfig b/arch/arm64/configs/hikey970_defconfig
old mode 100755
new mode 100644
index 1b09a47d80fd..65922503cf8b
--- a/arch/arm64/configs/hikey970_defconfig
+++ b/arch/arm64/configs/hikey970_defconfig
@@ -383,7 +383,6 @@ CONFIG_SPI_QUP=y
 CONFIG_SPI_S3C64XX=y
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPMI=y
-CONFIG_HISI_SPMI=y
 CONFIG_HISI_PMIC_PMU_SPMI=y
 CONFIG_HISI_REGULATOR_SPMI=y
 CONFIG_PINCTRL_SINGLE=y
diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig
index afc21c0a7877..78f94326cab1 100644
--- a/drivers/clk/hisilicon/Kconfig
+++ b/drivers/clk/hisilicon/Kconfig
@@ -13,6 +13,13 @@ config COMMON_CLK_HI3660
 	help
 	  Build the clock driver for hi3660.
 
+config COMMON_CLK_KIRIN970
+	bool "Kirin970 Clock Driver"
+	depends on ARCH_HISI || COMPILE_TEST
+	default ARCH_HISI
+	help
+	  Build the clock driver for kirin970.
+
 config COMMON_CLK_HI6220
 	bool "Hi6220 Clock Driver"
 	depends on ARCH_HISI || COMPILE_TEST
diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile
index 5cd15f257f5f..01e5be088028 100644
--- a/drivers/clk/hisilicon/Makefile
+++ b/drivers/clk/hisilicon/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_ARCH_HIP04)	+= clk-hip04.o
 obj-$(CONFIG_ARCH_HIX5HD2)	+= clk-hix5hd2.o
 obj-$(CONFIG_COMMON_CLK_HI3519)	+= clk-hi3519.o
 obj-$(CONFIG_COMMON_CLK_HI3660) += clk-hi3660.o
+obj-$(CONFIG_COMMON_CLK_KIRIN970) += clk-kirin970.o
 obj-$(CONFIG_COMMON_CLK_HI6220)	+= clk-hi6220.o
 obj-$(CONFIG_RESET_HISI)	+= reset.o
 obj-$(CONFIG_STUB_CLK_HI6220)	+= clk-hi6220-stub.o
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
old mode 100755
new mode 100644
index 0f991e737463..2c0f89c24b8b
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -361,7 +361,6 @@ config MFD_HI655X_PMIC
 config HISI_PMIC_PMU_SPMI
 	tristate "HiSilicon PMU/Codec IC and use spmi passageway"
 	depends on OF
-	depends on HISI_SPMI
 	help
 	  This driver supports HiSilicon Hisi power management and codec IC,
 	  including regulators, codec, ADCs, Coulomb counter, etc. Memory
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
old mode 100755
new mode 100644
diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile
index fc75104a5aab..afd48e8db0be 100644
--- a/drivers/spmi/Makefile
+++ b/drivers/spmi/Makefile
@@ -4,3 +4,5 @@
 obj-$(CONFIG_SPMI)	+= spmi.o
 
 obj-$(CONFIG_SPMI_MSM_PMIC_ARB)	+= spmi-pmic-arb.o
+
+obj-$(CONFIG_SPMI)	+= hisi-spmi-controller.o
\ No newline at end of file
diff --git a/drivers/spmi/hisi-spmi-controller.c b/drivers/spmi/hisi-spmi-controller.c
old mode 100755
new mode 100644
index 66b92cc4ecf2..14b36dcc9432
--- a/drivers/spmi/hisi-spmi-controller.c
+++ b/drivers/spmi/hisi-spmi-controller.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/seq_file.h>
 #include <linux/spmi.h>
-#include <linux/spmi.h>
 
 #define SPMI_CONTROLLER_NAME		"spmi_controller"