diff --git a/arch/arm64/boot/dts/17107/sdm845-mtp.dtsi b/arch/arm64/boot/dts/17107/sdm845-mtp.dtsi
index 33d3f0305..e3f8ef6f7 100755
--- a/arch/arm64/boot/dts/17107/sdm845-mtp.dtsi
+++ b/arch/arm64/boot/dts/17107/sdm845-mtp.dtsi
@@ -15,6 +15,7 @@
 #include "sdm845-pinctrl-overlay.dtsi"
 #include "sdm845-camera-sensor-mtp.dtsi"
 #include "smb1355.dtsi"
+#include "sdm845-pinctrl.dtsi"
 
 &vendor {
 	bluetooth: bt_wcn3990 {
diff --git a/arch/arm64/boot/dts/17127/sdm845-mtp.dtsi b/arch/arm64/boot/dts/17127/sdm845-mtp.dtsi
index 78604e272..c54579ae8 100755
--- a/arch/arm64/boot/dts/17127/sdm845-mtp.dtsi
+++ b/arch/arm64/boot/dts/17127/sdm845-mtp.dtsi
@@ -15,6 +15,7 @@
 #include "sdm845-pinctrl-overlay.dtsi"
 #include "sdm845-camera-sensor-mtp.dtsi"
 #include "smb1355.dtsi"
+#include "sdm845-pinctrl.dtsi"
 
 &vendor {
 	bluetooth: bt_wcn3990 {
diff --git a/drivers/input/misc/oppo_face_drivers b/drivers/input/misc/oppo_face_drivers
index 4d594c3df..9283e2cb0 120000
--- a/drivers/input/misc/oppo_face_drivers
+++ b/drivers/input/misc/oppo_face_drivers
@@ -1 +1 @@
-../../../../../vendor/oppo_app/securebsp/Face/drivers
\ No newline at end of file
+../../misc/oppo_face_drivers
\ No newline at end of file
diff --git a/drivers/input/misc/oppo_seccommon_drivers b/drivers/input/misc/oppo_seccommon_drivers
index dd556ddb2..e7a8dc6e4 120000
--- a/drivers/input/misc/oppo_seccommon_drivers
+++ b/drivers/input/misc/oppo_seccommon_drivers
@@ -1 +1 @@
-../../../../../vendor/oppo_app/securebsp/Common/drivers
\ No newline at end of file
+../../misc/oppo_seccommon_drivers
\ No newline at end of file
diff --git a/drivers/power/oppo/charger_ic/oppo_battery_sdm845.h b/drivers/power/oppo/charger_ic/oppo_battery_sdm845.h
index c51241dd0..ba4a6df5a 100755
--- a/drivers/power/oppo/charger_ic/oppo_battery_sdm845.h
+++ b/drivers/power/oppo/charger_ic/oppo_battery_sdm845.h
@@ -20,10 +20,10 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/consumer.h>
 #include <linux/extcon.h>
-#include "../../../../kernel/msm-4.9/drivers/power/supply/qcom/storm-watch.h"
-#include "../../../../kernel/msm-4.9/drivers/power/supply/qcom/smb-reg.h"
-#include "../../../../kernel/msm-4.9/drivers/power/supply/qcom/battery.h"
-#include "../../../../kernel/msm-4.9/drivers/power/supply/qcom/step-chg-jeita.h"
+#include "../../supply/qcom/storm-watch.h"
+#include "../../supply/qcom/smb-reg.h"
+#include "../../supply/qcom/battery.h"
+#include "../../supply/qcom/step-chg-jeita.h"
 
 
 enum print_reason {