Skip to content

Instantly share code, notes, and snippets.

@Albinoman887
Created December 28, 2016 02:22
Show Gist options
  • Save Albinoman887/416382bb3e30e632734f8c5fa2a3a70d to your computer and use it in GitHub Desktop.
Save Albinoman887/416382bb3e30e632734f8c5fa2a3a70d to your computer and use it in GitHub Desktop.
diff --git a/arch/arm64/boot/dts/lge/dsi-panel-lgd-lg4946-dualmipi-qhd-cmd.dtsi b/arch/arm64/boot/dts/lge/dsi-panel-lgd-lg4946-dualmipi-qhd-cmd.dtsi
index 05530b9..e8b939f 100644
--- a/arch/arm64/boot/dts/lge/dsi-panel-lgd-lg4946-dualmipi-qhd-cmd.dtsi
+++ b/arch/arm64/boot/dts/lge/dsi-panel-lgd-lg4946-dualmipi-qhd-cmd.dtsi
@@ -240,32 +240,32 @@
>;
lge,blmap-hl = <
0
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009 4009 4009 4009 4009 4009
- 4009 4009 4009 4009 4009
+ 2285 2285 2285 2285 2285 2285 2285 2285 2285 2285
+ 2291 2298 2304 2311 2318 2324 2331 2337 2344 2351
+ 2357 2364 2371 2378 2385 2392 2399 2406 2414 2421
+ 2428 2435 2442 2449 2457 2463 2469 2475 2481 2487
+ 2493 2500 2506 2512 2518 2524 2530 2536 2543 2551
+ 2560 2568 2577 2586 2594 2603 2611 2620 2629 2635
+ 2641 2647 2653 2659 2665 2672 2678 2684 2690 2696
+ 2702 2708 2715 2722 2729 2736 2743 2750 2758 2765
+ 2772 2779 2786 2793 2801 2807 2814 2820 2827 2834
+ 2840 2847 2853 2860 2867 2873 2880 2887 2894 2902
+ 2910 2918 2926 2933 2941 2949 2957 2965 2973 2979
+ 2986 2992 2999 3006 3012 3019 3025 3032 3039 3045
+ 3052 3059 3066 3073 3080 3087 3094 3102 3109 3116
+ 3123 3130 3137 3145 3152 3160 3168 3176 3184 3191
+ 3199 3207 3215 3223 3231 3237 3244 3250 3257 3264
+ 3270 3277 3283 3290 3297 3303 3310 3317 3324 3331
+ 3338 3345 3352 3360 3367 3374 3381 3388 3395 3403
+ 3409 3416 3422 3429 3436 3442 3449 3455 3462 3469
+ 3475 3482 3489 3496 3503 3510 3517 3524 3532 3539
+ 3546 3553 3560 3567 3575 3581 3588 3594 3601 3608
+ 3614 3621 3627 3634 3641 3647 3654 3661 3668 3676
+ 3684 3692 3700 3707 3715 3723 3731 3739 3747 3753
+ 3760 3766 3773 3780 3786 3793 3799 3806 3813 3819
+ 3826 3833 3840 3847 3854 3861 3868 3876 3883 3890
+ 3897 3904 3911 3919 3927 3935 3943 3951 3959 3968
+ 3976 3984 3992 4000 4009
>;
qcom,mdss-pan-physical-width-dimension = <66>;
qcom,mdss-pan-physical-height-dimension = <117>;
diff --git a/arch/arm64/boot/dts/lge/dsi-panel-sw49407-dsc-qhd-cmd.dtsi b/arch/arm64/boot/dts/lge/dsi-panel-sw49407-dsc-qhd-cmd.dtsi
index 7494593..2bb7c9e 100644
--- a/arch/arm64/boot/dts/lge/dsi-panel-sw49407-dsc-qhd-cmd.dtsi
+++ b/arch/arm64/boot/dts/lge/dsi-panel-sw49407-dsc-qhd-cmd.dtsi
@@ -40,7 +40,7 @@
qcom,mdss-dsi-bllp-eof-power-mode;
qcom,mdss-dsi-bllp-power-mode;
qcom,partial-update-enabled;
- qcom,panel-roi-alignment = <1440 160 1440 160 1440 160>;
+ qcom,panel-roi-alignment = <1440 16 1440 16 1440 16>;
qcom,mdss-dsi-lane-0-state;
qcom,mdss-dsi-lane-1-state;
qcom,mdss-dsi-lane-2-state;
@@ -92,7 +92,7 @@
/* Partial Area Set */
39 01 00 00 00 00 05 30 00 00 00 A3
/* TE line */
- 39 01 00 00 00 00 03 44 0A 8F
+ 39 01 00 00 00 00 03 44 00 00
/* Tearing Effect Line on */
15 01 00 00 00 00 02 35 00
/* Write Display Brightness */
@@ -112,7 +112,7 @@
/* Panel Setting */
39 01 00 00 00 00 05 B7 61 75 EA A9
/* Touch Timing Control */
- 39 01 00 00 00 00 1F B8 70 02 90 40 BF F0 8B 00 00 18 33 04 01 40 01 45 F8 C1 21 00 00 10 01 15 01 0A A0 0A 0A 00
+ 39 01 00 00 00 00 1F B8 70 01 04 40 BF F0 8B 00 00 18 33 04 01 40 01 45 F8 C1 21 00 00 10 01 15 01 0A A0 0A 0A 00
/* Touch Source Setting */
39 01 00 00 00 00 06 B9 64 64 2A 3F EE
/* Backlight Control */
@@ -150,7 +150,7 @@
/* Negative Gamma Curve for Blue */
39 01 00 00 00 00 0E D5 00 12 1E 2C 39 40 4F 45 38 28 15 00 03
/* Test1 */
- 39 01 00 00 00 00 05 ED 61 6A 00 82
+ 39 01 00 00 00 00 05 ED 61 6A 00 87
/* CABC Test */
39 01 00 00 00 00 18 F9 20 40 60 80 A0 C0 E0 0B 1C 20 20 1F 10 18 00 B4 C0 CD DA E8 F0 F7 FF
/* CABC Test */
@@ -197,6 +197,8 @@
lge,mode-change-cmds-u2-to-u3 = [
/* Power Sequence Option Configuration */
39 01 00 00 00 00 06 C9 05 5D 03 04 01
+ /* Sending pps 1st parameter*/
+ 15 01 00 00 00 00 02 BD 11
/* Normmal DisplayMode On + min 40ms */
05 01 00 00 28 00 01 13
];
@@ -299,6 +301,12 @@
qcom,mdss-dsi-reader-mode-command-state = "dsi_hs_mode";
+ qcom,mdss-dsi-screen-command = [
+ 39 01 00 00 00 00 0E C7 00 00 00 00 00 00 00 00 00 00 00 00 00
+ ];
+
+ qcom,mdss-dsi-screen-command-state = "dsi_hs_mode";
+
lge,blmap = <
0
29 29 29 29 29 29 29 29 29 29
@@ -502,7 +510,7 @@
dsi_sw49407_dsc_cmd_config1: config1 {
qcom,lm-split = <720 720>;
qcom,mdss-dsc-encoders = <1>; /* 3D Mux */
- qcom,mdss-dsc-slice-height = <160>;
+ qcom,mdss-dsc-slice-height = <16>;
qcom,mdss-dsc-slice-width = <1440>;
qcom,mdss-dsc-slice-per-pkt = <1>;
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_0_v3-pmi8996.dts
index e4421b0..f2ccb167 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_1_v3-pmi8996.dts
index dc62256..dfa0862 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_2_v3-pmi8996.dts
index 49cd7e6..922fbe1 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.0_v3-pmi8996_.dts
index 8411d6b..59e0c7d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.1_v3-pmi8996.dts
index 0eaefe1..8e3057f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.2_v3-pmi8996.dts
index 3cccc8f..81ee990 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.3_v3-pmi8996.dts
index 13630b8..29de07c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-a_v3-pmi8996.dts
index 336cd88..7754399 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-b_v3-pmi8996.dts
index 3b9aa51..e4ac94c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-c_v3-pmi8996.dts
index e1c22c6..9c327af 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-d_v3-pmi8996.dts
index 0a7644c..5dd0d26 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996-elsa_att_us_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_0-pmi8996.dts
index cb756cd..e864373 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_1-pmi8996.dts
index 06d02f5..eb4c049 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_2-pmi8996.dts
index cbb2fac..349b538 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.0-pmi8996_.dts
index 919dc9f..65f5405 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.1-pmi8996.dts
index b129c34..a7633a1 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.2-pmi8996.dts
index 579db9e..abe4c86 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.3-pmi8996.dts
index c6cc12d..94c285a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-a-pmi8996.dts
index 874c6f9..31996e5 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-b-pmi8996.dts
index 20d3f48..e4f211fb 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-c-pmi8996.dts
index 7913348..1230eed 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-d-pmi8996.dts
index 600a349..80cd479 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_att_us/msm8996pro-elsa_att_us_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_att_us.dtsi"
#include "msm8996-elsa_att_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_0_v3-pmi8996.dts
index 47e2ee9..f8c297d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_1_v3-pmi8996.dts
index dcaf970..bd2031e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_2_v3-pmi8996.dts
index d401ec3..50d5a19 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.0_v3-pmi8996_.dts
index 3c05856..2f152f1 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.1_v3-pmi8996.dts
index 93ae61d..abb00b5 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.2_v3-pmi8996.dts
index 97ae951..d309474 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.3_v3-pmi8996.dts
index 987b9cc..e0054f4 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-a_v3-pmi8996.dts
index d393479..e86e95a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-b_v3-pmi8996.dts
index 613ba9d..016db1e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-c_v3-pmi8996.dts
index f0520f0..4e62114 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-d_v3-pmi8996.dts
index 764b42c..57acb1f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996-elsa_clr_pr_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_0-pmi8996.dts
index fc7e580..0d742fb 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_1-pmi8996.dts
index acc5a9a..f88fd71 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_2-pmi8996.dts
index 684c001..0215d66 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.0-pmi8996_.dts
index 2a85aa0..af9633d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.1-pmi8996.dts
index 7b85593..3ec6737 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.2-pmi8996.dts
index c381728..fdba2bd 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.3-pmi8996.dts
index 865d93c..410f57a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-a-pmi8996.dts
index c81f596..57f9996 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-b-pmi8996.dts
index ad9e4a6..3d469a3 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-c-pmi8996.dts
index fb1090a..9c0ab12 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-d-pmi8996.dts
index 4c2bfda..68cc33e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_clr_pr/msm8996pro-elsa_clr_pr_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_clr_pr.dtsi"
#include "msm8996-elsa_clr_pr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_0_v3-pmi8996.dts
index 3c8da5d..a560687 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_1_v3-pmi8996.dts
index 18a9c06..5f61ea6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_2_v3-pmi8996.dts
index 880e879..a7bb498 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.0_v3-pmi8996_.dts
index 4267084..705bcee 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.1_v3-pmi8996.dts
index 54b4012..52a77da 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.2_v3-pmi8996.dts
index 3b4fdca..73471c1 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.3_v3-pmi8996.dts
index e6d7e63..56b32de 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-a_v3-pmi8996.dts
index 5d99793..fb2bd0b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-b_v3-pmi8996.dts
index 8456308..4523e15 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-c_v3-pmi8996.dts
index 40f9304..6bc60c6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-d_v3-pmi8996.dts
index 263e9e5..d9c0a1b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996-elsa_cno_cn_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_0-pmi8996.dts
index 5af99ec..e98092a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_1-pmi8996.dts
index 8f35e4f..6b0a6bc 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_2-pmi8996.dts
index 02ac77c..92be589 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.0-pmi8996_.dts
index 447f420..0ffdc01 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.1-pmi8996.dt b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.1-pmi8996.dt
index 58fceeb..d5f033e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.1-pmi8996.dt
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.1-pmi8996.dt
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.2-pmi8996.dt b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.2-pmi8996.dt
index e9cc669..7664cd7 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.2-pmi8996.dt
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.2-pmi8996.dt
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.3-pmi8996.dt b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.3-pmi8996.dt
index 0b08bb3..57a0131 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.3-pmi8996.dt
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-1.3-pmi8996.dt
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-a-pmi8996.dts
index 2fcb60e..795c6dd 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-b-pmi8996.dts
index f4f6ebb..334c8db 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-c-pmi8996.dts
index 8fd08d7..2d1a49e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-d-pmi8996.dts
index 6f3ab2b..cc86d48 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_cno_cn/msm8996pro-elsa_cno_cn_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_cno_cn.dtsi"
#include "msm8996-elsa_cno_cn-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996-elsa_dcm_jp_rev-0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996-elsa_dcm_jp_rev-0_v3-pmi8996.dts
index a30cc92..a75f285 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996-elsa_dcm_jp_rev-0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996-elsa_dcm_jp_rev-0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_dcm_jp.dtsi"
#include "msm8996-elsa_dcm_jp-touch.dtsi"
#include "msm8996-elsa_dcm_jp-camera_rev-0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_dcm_jp-sound_rev-0.dtsi"
#include "msm8996-elsa_dcm_jp-nfc-rev-0.dtsi"
#include "msm8996-elsa_dcm_jp_rev-0-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996-elsa_dcm_jp_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996-elsa_dcm_jp_rev-a_v3-pmi8996.dts
index 3eb6217..3f74861 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996-elsa_dcm_jp_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996-elsa_dcm_jp_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_dcm_jp.dtsi"
#include "msm8996-elsa_dcm_jp-touch.dtsi"
#include "msm8996-elsa_dcm_jp-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_dcm_jp-sound_rev-a.dtsi"
#include "msm8996-elsa_dcm_jp-nfc-rev-a.dtsi"
#include "msm8996-elsa_dcm_jp_rev-a-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996pro-elsa_dcm_jp_rev-0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996pro-elsa_dcm_jp_rev-0-pmi8996.dts
index 7d34353..2a0f18b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996pro-elsa_dcm_jp_rev-0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996pro-elsa_dcm_jp_rev-0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_dcm_jp.dtsi"
#include "msm8996-elsa_dcm_jp-touch.dtsi"
#include "msm8996-elsa_dcm_jp-camera_rev-0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_dcm_jp-sound_rev-0.dtsi"
#include "msm8996-elsa_dcm_jp-nfc-rev-0.dtsi"
#include "msm8996-elsa_dcm_jp_rev-0-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996pro-elsa_dcm_jp_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996pro-elsa_dcm_jp_rev-a-pmi8996.dts
index 2642806..f1d8a408 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996pro-elsa_dcm_jp_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_dcm/msm8996pro-elsa_dcm_jp_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_dcm_jp.dtsi"
#include "msm8996-elsa_dcm_jp-touch.dtsi"
#include "msm8996-elsa_dcm_jp-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_dcm_jp-sound_rev-a.dtsi"
#include "msm8996-elsa_dcm_jp-nfc-rev-a.dtsi"
#include "msm8996-elsa_dcm_jp_rev-a-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_1_v3-pmi8996.dts
index 3e965f7..61b2765 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_2_v3-pmi8996.dts
index 28a8f7c7..f062689 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_v3-pmi8996.dts
index 729ecd5..74fd353 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.0_v3-pmi8996_.dts
index d1ec9b1..d942b3f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.1_v3-pmi8996.dts
index d610c74..198b656 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.2_v3-pmi8996.dts
index 19ed30f..e48a72f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.3_v3-pmi8996.dts
index 39365e74..137ee39 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-a_v3-pmi8996.dts
index 7bdc840..c97ec7c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-b_v3-pmi8996.dts
index e2ea69c..a5ac49f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-c_v3-pmi8996.dts
index b0cce84..807140e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-d_v3-pmi8996.dts
index a9980fa..f100b36 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996-elsa_global_ca_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0-pmi8996.dts
index 4e26e53..72535d3 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0_1-pmi8996.dts
index 72946a4..91f00ef 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0_2-pmi8996.dts
index 00808f9..ec0e0dd 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.0-pmi8996_.dts
index c12821e..822a11d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.1-pmi8996.dts
index 7bc5eef..50c5a64 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.2-pmi8996.dts
index be9fd5b..e452eee 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.3-pmi8996.dts
index 4042abc..9ee7522 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-a-pmi8996.dts
index 20c79e2..a108ab7 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-b-pmi8996.dts
index e201526..453c77f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-c-pmi8996.dts
index cfefc5a..50e91d9 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-d-pmi8996.dts
index 1e5ba1f..c243527 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_ca/msm8996pro-elsa_global_ca_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_ca.dtsi"
#include "msm8996-elsa_global_ca-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_0_v3-pmi8996.dts
index beffc01..5fdd632 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_1_v3-pmi8996.dts
index 4d0dd86..8666a1ea 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_2_v3-pmi8996.dts
index bfbd628..07f240a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.0_v3-pmi8996_.dts
index 3b03695..9095620 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.1_v3-pmi8996.dts
index 2b84951..715c92b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.2_v3-pmi8996.dts
index 7e657fb..ea10c51 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.3_v3-pmi8996.dts
index 77a0f19..6c8eaa6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-a_v3-pmi8996.dts
index 4d9a3d8..8b043c2 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-b_v3-pmi8996.dts
index eb1cdf2..2984dbb 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-c_v3-pmi8996.dts
index 69b3ba0..616941d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-d_v3-pmi8996.dts
index 7b16a0a..af1ae7a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996-elsa_global_com_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_0-pmi8996.dts
index 67829d9..b3972fa 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_1-pmi8996.dts
index d08e7c5..5d3e4ed 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_2-pmi8996.dts
index e634577..ff3fc23 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.0-pmi8996_.dts
index fdc6874..4e9a9ca 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.1-pmi8996.dts
index e356ad0..b084e32 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.2-pmi8996.dts
index 53ad0fc..967d535 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.3-pmi8996.dts
index b7cf031..92d687f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-a-pmi8996.dts
index 1e8631a..b25f467 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-b-pmi8996.dts
index fe5cff95..2ff1561 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-c-pmi8996.dts
index 5fd540a..fccd36a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-d-pmi8996.dts
index 34410da..4bffb98 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_com/msm8996pro-elsa_global_com_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_com.dtsi"
#include "msm8996-elsa_global_com-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_0_v3-pmi8996.dts
index 5260242..6ca95ec 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_1_v3-pmi8996.dts
index e08fb81..4948434 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_2_v3-pmi8996.dts
index d3a09d2..5af7b3e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.1_v3-pmi8996.dts
index c677259..8aff162 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.2_v3-pmi8996.dts
index 40d653d..ae2b2756 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.3_v3-pmi8996.dts
index 0854fa8..927a79b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-a_v3-pmi8996.dts
index dac733c..5f8ea54 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-b_v3-pmi8996.dts
index bb99604..3317634 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-c_v3-pmi8996.dts
index 7836494..bebe9e0 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-d_v3-pmi8996.dts
index 01e682e..1c5a124 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsa_global_livedummy_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsal_global_livedummy_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsal_global_livedummy_rev-1.0_v3-pmi8996_.dts
index b87de85..95bbc02 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsal_global_livedummy_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996-elsal_global_livedummy_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_0-pmi8996.dts
index c50eac9..8e13428 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_1-pmi8996.dts
index 4ab6b3d..733766d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_2-pmi8996.dts
index 8193653..5edbf36 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.0-pmi8996_.dts
index aeee814..6e1fe49 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.1-pmi8996.dts
index cf623dd..c3115a8 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.2-pmi8996.dts
index 16ea03f..e6d0e91 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.3-pmi8996.dts
index 77ad13c..cbdad75 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-a-pmi8996.dts
index 1796637..c71b89e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-b-pmi8996.dts
index c0babad..03a3aad 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-c-pmi8996.dts
index 490460a..f95ef80 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-d-pmi8996.dts
index 0895fdd..48dff6e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_global_livedummy/msm8996pro-elsa_global_livedummy_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_global_livedummy.dtsi"
#include "msm8996-elsa_global_livedummy-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-0_v3-pmi8996.dts
index 8fa1919..e0cbb5f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kddi_jp.dtsi"
#include "msm8996-elsa_kddi_jp-touch.dtsi"
#include "msm8996-elsa_kddi_jp-camera_rev-0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_kddi_jp-sound_rev-0.dtsi"
#include "msm8996-elsa_kddi_jp-nfc-rev-0.dtsi"
#include "msm8996-elsa_kddi_jp_rev-0-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-a_v3-pmi8996.dts
index 53cfeb4..97ce4e6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kddi_jp.dtsi"
#include "msm8996-elsa_kddi_jp-touch.dtsi"
#include "msm8996-elsa_kddi_jp-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_kddi_jp-sound_rev-a.dtsi"
#include "msm8996-elsa_kddi_jp-nfc-rev-a.dtsi"
#include "msm8996-elsa_kddi_jp_rev-a-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-b_v3-pmi8996.dts
index 4a389c0..9e621bd 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996-elsa_kddi_jp_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kddi_jp.dtsi"
#include "msm8996-elsa_kddi_jp-touch.dtsi"
#include "msm8996-elsa_kddi_jp-camera_rev-b.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_kddi_jp-sound_rev-a.dtsi"
#include "msm8996-elsa_kddi_jp-nfc-rev-a.dtsi"
#include "msm8996-elsa_kddi_jp_rev-a-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-0-pmi8996.dts
index 4adecca..fdead98 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kddi_jp.dtsi"
#include "msm8996-elsa_kddi_jp-touch.dtsi"
#include "msm8996-elsa_kddi_jp-camera_rev-0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_kddi_jp-sound_rev-0.dtsi"
#include "msm8996-elsa_kddi_jp-nfc-rev-0.dtsi"
#include "msm8996-elsa_kddi_jp_rev-0-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-a-pmi8996.dts
index 23b7a07..a5c042e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kddi_jp.dtsi"
#include "msm8996-elsa_kddi_jp-touch.dtsi"
#include "msm8996-elsa_kddi_jp-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_kddi_jp-sound_rev-a.dtsi"
#include "msm8996-elsa_kddi_jp-nfc-rev-a.dtsi"
#include "msm8996-elsa_kddi_jp_rev-a-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-b-pmi8996.dts
index 8a920cc..445e9f2 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kddi/msm8996pro-elsa_kddi_jp_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kddi_jp.dtsi"
#include "msm8996-elsa_kddi_jp-touch.dtsi"
#include "msm8996-elsa_kddi_jp-camera_rev-b.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "msm8996-elsa_kddi_jp-sound_rev-a.dtsi"
#include "msm8996-elsa_kddi_jp-nfc-rev-a.dtsi"
#include "msm8996-elsa_kddi_jp_rev-a-isdbt_japan_i2c.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_0_v3-pmi8996.dts
index 8e31f8b..b0898cc 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_1_v3-pmi8996.dts
index 35fadaa..0528b3e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_2_v3-pmi8996.dts
index 3c31d14..2f720d1 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.0_v3-pmi8996_.dts
index b99bfed..db0723e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.1_v3-pmi8996.dts
index ef4aa37..738b52a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.2_v3-pmi8996.dts
index f7b8161..11f1936 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.3_v3-pmi8996.dts
index 1a2eb57..25f3ef19 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-a_v3-pmi8996.dts
index 770bdd6e3..c8017e0 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-b_v3-pmi8996.dts
index 3056435..f41dd13 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-c_v3-pmi8996.dts
index 898cefe..8467856 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-d_v3-pmi8996.dts
index 881d79a..198991a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996-elsa_kr_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_0-pmi8996.dts
index 11d3fcf..06233bc 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_1-pmi8996.dts
index 07977fd..0200cea 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_2-pmi8996.dts
index 7648b3f..7366909 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.0-pmi8996_.dts
index dc2981b..7b030ea 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.1-pmi8996.dts
index 854d436..8ae988c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.2-pmi8996.dts
index a1de18b..bc52ad6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.3-pmi8996.dts
index 9cf72cc..2c8e586 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-a-pmi8996.dts
index 9ff62e1..0347ba8 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-b-pmi8996.dts
index 88ff785..987c03a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-c-pmi8996.dts
index dc81dc9..f61d0ad 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-d-pmi8996.dts
index 455aa62..ddadcd5 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_kr/msm8996pro-elsa_kr_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_kr.dtsi"
#include "msm8996-elsa_kr-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_0_v3-pmi8996.dts
index 2e8a009..0a35ceb 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_1_v3-pmi8996.dts
index d270c49..594aab7 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_2_v3-pmi8996.dts
index e38dfb9..00df663 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.0_v3-pmi8996_.dts
index 67193ca..a337842 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.1_v3-pmi8996.dts
index 79cc54a..f732f02 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.2_v3-pmi8996.dts
index 3f5812a..6627351 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.3_v3-pmi8996.dts
index 3a274d1..979e9ad 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-a_v3-pmi8996.dts
index 873c6f3..750a9c7 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-b_v3-pmi8996.dts
index 86bd5b6..f35f5b3 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-c_v3-pmi8996.dts
index b3a0504..dcfd633 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-d_v3-pmi8996.dts
index 03cbf5f..9de7aab 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996-elsa_nao_us_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_0-pmi8996.dts
index 5f5b364..37e7e20 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_1-pmi8996.dts
index d583f50..f10a88b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_2-pmi8996.dts
index 0b76483..3a1582e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.0-pmi8996_.dts
index 07fc9c6..e0aeeb2 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.1-pmi8996.dts
index 1494bae..727842c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.2-pmi8996.dts
index 35855e4..db7c766 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.3-pmi8996.dts
index d94cfe4..f7851e3 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-a-pmi8996.dts
index cc5fc57..6b42a35 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-b-pmi8996.dts
index 1b7a51f..2fa34cb 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-c-pmi8996.dts
index 26b3b2a..49d7653 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-d-pmi8996.dts
index d640b04..2bbb478 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_nao_us/msm8996pro-elsa_nao_us_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_nao_us.dtsi"
#include "msm8996-elsa_nao_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_0_v3-pmi8996.dts
index 0479f5b..014a237 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_1_v3-pmi8996.dts
index 20379de..2db715c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_2_v3-pmi8996.dts
index 3ab6908..5f70b56 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.0_v3-pmi8996_.dts
index fa8c010..6d775bf 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.1_v3-pmi8996.dts
index bb01707..68222f5 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.2_v3-pmi8996.dts
index 07ec973..e9c2bcc 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.3_v3-pmi8996.dts
index 7bacdeb..ac8bc36 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-a_v3-pmi8996.dts
index 8710c1f..d26a9df 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-b_v3-pmi8996.dts
index 6e56b8a..6e34660 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-c_v3-pmi8996.dts
index 2f99713..27eece3 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-d_v3-pmi8996.dts
index 9aae78c..c45d2ebb 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996-elsa_spr_us_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_0-pmi8996.dts
index e6cbe61..2cf3a91 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_1-pmi8996.dts
index 8733285..c73d075 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_2-pmi8996.dts
index 7600d6f..086e9d0 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.0-pmi8996_.dts
index 634e485..693100d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.1-pmi8996.dts
index 18b3db3..4d556dd 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.2-pmi8996.dts
index e698d58..1ff9ac3 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.3-pmi8996.dts
index 2f72e6f..1b54542 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-a-pmi8996.dts
index 4dd5690..9b46edb 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-b-pmi8996.dts
index d44b886..3a55616 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-c-pmi8996.dts
index 450d93e..3630556 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-d-pmi8996.dts
index 591d760..67e9444 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_spr_us/msm8996pro-elsa_spr_us_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_spr_us.dtsi"
#include "msm8996-elsa_spr_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/current_storage_type.dtsi b/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/current_storage_type.dtsi
deleted file mode 100644
index 955a2dc..0000000
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/current_storage_type.dtsi
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-/* Current storage type is UFS */
-
-&ufs_ice {
- status = "ok";
-};
-
-&sdcc1_ice {
- status = "ok";
-};
-
-&ufsphy1 {
- status = "ok";
-};
-
-&ufs1 {
- status = "ok";
-};
-
-&sdhc_1 {
- qcom,ice-clk-rates = <300000000>;
-};
-
-&soc {
- tlmm: pinctrl@01010000 {
-
- ufs_reset_on: ufs_reset_on {
- mux {
- pins = "gpio74";
- function = "gpio";
- };
-
- config {
- pins = "gpio74";
- drive-strength = <2>;
- bias-pull-down;
- output-high;
- };
- };
-
- ufs_reset_off: ufs_reset_off {
- mux {
- pins = "gpio74";
- function = "gpio";
- };
-
- config {
- pins = "gpio74";
- drive-strength = <2>;
- bias-disable;
- output-low;
- };
- };
- };
-};
-
-&ufs1 {
- pinctrl-names = "ufs_res_in_on", "ufs_res_in_off";
- pinctrl-0 = <&ufs_reset_on>;
- pinctrl-1 = <&ufs_reset_off>;
- /* H+ hw - invert signal by FET - UFS_RESET_N is low active */
- ufsreset-gpios = <&tlmm 74 0x0>;
-};
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/emmc/msm8996-elsa_emmc.dtsi b/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/emmc/msm8996-elsa_emmc.dtsi
deleted file mode 100644
index 4674ebe..0000000
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/emmc/msm8996-elsa_emmc.dtsi
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-/* Current storage type is EMMC */
-
-&ufs_ice {
- status = "disabled";
-};
-
-&sdcc1_ice {
- status = "ok";
-};
-
-&ufsphy1 {
- status = "disabled";
-};
-
-&ufs1 {
- status = "disabled";
-};
-
-&sdhc_1 {
- qcom,ice-clk-rates = <300000000 150000000>;
-};
-
-
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/ufs/msm8996-elsa_ufs.dtsi b/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/ufs/msm8996-elsa_ufs.dtsi
deleted file mode 100644
index 955a2dc..0000000
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_storage_type/ufs/msm8996-elsa_ufs.dtsi
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-/* Current storage type is UFS */
-
-&ufs_ice {
- status = "ok";
-};
-
-&sdcc1_ice {
- status = "ok";
-};
-
-&ufsphy1 {
- status = "ok";
-};
-
-&ufs1 {
- status = "ok";
-};
-
-&sdhc_1 {
- qcom,ice-clk-rates = <300000000>;
-};
-
-&soc {
- tlmm: pinctrl@01010000 {
-
- ufs_reset_on: ufs_reset_on {
- mux {
- pins = "gpio74";
- function = "gpio";
- };
-
- config {
- pins = "gpio74";
- drive-strength = <2>;
- bias-pull-down;
- output-high;
- };
- };
-
- ufs_reset_off: ufs_reset_off {
- mux {
- pins = "gpio74";
- function = "gpio";
- };
-
- config {
- pins = "gpio74";
- drive-strength = <2>;
- bias-disable;
- output-low;
- };
- };
- };
-};
-
-&ufs1 {
- pinctrl-names = "ufs_res_in_on", "ufs_res_in_off";
- pinctrl-0 = <&ufs_reset_on>;
- pinctrl-1 = <&ufs_reset_off>;
- /* H+ hw - invert signal by FET - UFS_RESET_N is low active */
- ufsreset-gpios = <&tlmm 74 0x0>;
-};
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us-connectivity.dtsi b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us-connectivity.dtsi
index 9fe0355..e3ef8fd 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us-connectivity.dtsi
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us-connectivity.dtsi
@@ -44,18 +44,5 @@
wlan-en-gpio = <&pm8994_gpios 8 0>;
wlan-hostwake-gpio = <&tlmm 73 0>;
};
-
- bt_sleep{
- compatible = "bcm,bluesleep";
- bt_host_wake = <&tlmm 24 0>;
- bt_ext_wake = <&tlmm 92 0>;
- status = "ok";
- };
-
- bt_bcm4358{
- compatible = "bcm,bcm4358";
- bcm,bt-reset-gpio = <&pm8994_gpios 19 0>;
- bcm,bt-vdd-io-supply = <&pm8994_s4>;
- bcm,bt-vdd-io-voltage-level = <1800000 1800000>;
- };
};
+
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_0_v3-pmi8996.dts
index 70ae925..780c675 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_1_v3-pmi8996.dts
index 26bb04c..7b9b73b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_2_v3-pmi8996.dts
index aeaf51a..77d5383 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.0_v3-pmi8996_.dts
index 5eb124d..e35ab23 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.1_v3-pmi8996.dts
index 4870ce0..864b764 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.2_v3-pmi8996.dts
index 98a1069..4d0805e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.3_v3-pmi8996.dts
index 8f169b6..3d53db6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-a_v3-pmi8996.dts
index a6fd2f8..5599e9a 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-b_v3-pmi8996.dts
index a65d650..d84779e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-c_v3-pmi8996.dts
index f396a9d..b34f1e8 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-d_v3-pmi8996.dts
index c8e9695..4e8cb12 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996-elsa_tmo_us_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_0-pmi8996.dts
index 0fa193a..521d12e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_1-pmi8996.dts
index 4d41aa0..16ab2c6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_2-pmi8996.dts
index 48c07a4..23defc0 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.0-pmi8996_.dts
index 814a106..eb63c93 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.1-pmi8996.dts
index aeab18e..b41f30d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.2-pmi8996.dts
index 909c8aa..7cee4a6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.3-pmi8996.dts
index a387acb..acc99f4 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-a-pmi8996.dts
index d3979d4..40d169b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-b-pmi8996.dts
index 8867023..62ba221 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-c-pmi8996.dts
index 4b97f14..159e9a3 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-d-pmi8996.dts
index 829d0bd..3480c43 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_tmo_us/msm8996pro-elsa_tmo_us_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_tmo_us.dtsi"
#include "msm8996-elsa_tmo_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_0_v3-pmi8996.dts
index 06a23ff..2cf7121 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_1_v3-pmi8996.dts
index a19167c..5b2f705 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_2_v3-pmi8996.dts
index f266db6..fd5cd50 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.0_v3-pmi8996_.dts
index f348476..5ecb905 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.1_v3-pmi8996.dts
index 5bed750..da40eb0 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.2_v3-pmi8996.dts
index cf33751..c5db69d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.3_v3-pmi8996.dts
index ba25b66..aa32b34 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-a_v3-pmi8996.dts
index 80774e2..263d6ed 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-b_v3-pmi8996.dts
index 174274a..e25861d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-c_v3-pmi8996.dts
index 1941821..54891b4 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-d_v3-pmi8996.dts
index c411e65..c7b2a96 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996-elsa_usc_us_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_0-pmi8996.dts
index e2f8373..888b43c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_1-pmi8996.dts
index 1a8d043..36e596f 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_2-pmi8996.dts
index e9a19d8..653b307 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.0-pmi8996_.dts
index 11984f8..6ff335b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.1-pmi8996.dts
index 5019a32..1bc4db4 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.2-pmi8996.dts
index 31261c8..ca280d9 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.3-pmi8996.dts
index af2f8b4..e8f3bc6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-a-pmi8996.dts
index 2638eac..0a3fbb1 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-b-pmi8996.dts
index c947a84..12b1d51 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-c-pmi8996.dts
index 2ad0874..c53006c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-d-pmi8996.dts
index e6f7bf8..8a77119 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_usc_us/msm8996pro-elsa_usc_us_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_usc_us.dtsi"
#include "msm8996-elsa_usc_us-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_0_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_0_v3-pmi8996.dts
index 92c8ca8..8069c1c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_0_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_0_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_1_v3-pmi8996.dts
index 47605af..b66a37d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_1.dtsi"
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_2_v3-pmi8996.dts
index 31e3c5b..3b2b38c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-0_2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.0_v3-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.0_v3-pmi8996_.dts
index 4288274..5a0476d 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.0_v3-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.0_v3-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.1_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.1_v3-pmi8996.dts
index b226cba..04c8cba 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.1_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.1_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.2_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.2_v3-pmi8996.dts
index 9bf7e22..945b879 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.2_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.2_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.3_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.3_v3-pmi8996.dts
index 9b31184..bb252d6 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.3_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-1.3_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-a_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-a_v3-pmi8996.dts
index ff4d551..7179bcb 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-a_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-a_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-b_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-b_v3-pmi8996.dts
index a1f6c72..4edb643 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-b_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-b_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-c_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-c_v3-pmi8996.dts
index 4a13372..2bea0cf 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-c_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-c_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-d_v3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-d_v3-pmi8996.dts
index fbe92f3..693c110 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-d_v3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996-elsa_vzw_rev-d_v3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_0-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_0-pmi8996.dts
index 23aa2aa..9eede0e 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_0-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_0-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_1-pmi8996.dts
index 877fd0e..2081492 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_1.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8996pro + PMI8996 MTP";
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_2-pmi8996.dts
index f24c7e8..7cb4443 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-0_2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-0_2.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-0_2.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.0-pmi8996_.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.0-pmi8996_.dts
index c4b1efb..9b20157 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.0-pmi8996_.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.0-pmi8996_.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.1-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.1-pmi8996.dts
index fcc5ba0..08d2732 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.1-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.1-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.2-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.2-pmi8996.dts
index ae9b4cc..53092f7 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.2-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.2-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.3-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.3-pmi8996.dts
index 5ad4c88..7f4622c 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.3-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-1.3-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-a-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-a-pmi8996.dts
index 9111d8e..ce35eea 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-a-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-a-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-a.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-b-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-b-pmi8996.dts
index 4e81b7c..bb9019b 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-b-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-b-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-a.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-c-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-c-pmi8996.dts
index 889ae3d7..2de9275 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-c-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-c-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-c.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-b.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-d-pmi8996.dts b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-d-pmi8996.dts
index 27a1ec5..cbd6085 100644
--- a/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-d-pmi8996.dts
+++ b/arch/arm64/boot/dts/lge/msm8996-elsa_vzw/msm8996pro-elsa_vzw_rev-d-pmi8996.dts
@@ -18,7 +18,7 @@
#include "msm8996-elsa_vzw.dtsi"
#include "msm8996-elsa_vzw-touch.dtsi"
#include "../msm8996-camera/msm8996-elsa-camera_rev-1.0.dtsi"
-#include "../msm8996-elsa_storage_type/current_storage_type.dtsi"
+#include "../msm8996-elsa-ufs.dtsi"
#include "../msm8996-sound/msm8996-elsa-sound_rev-1_0.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/lge/msm8996-h1_global/msm8996-h1_global-connectivity.dtsi b/arch/arm64/boot/dts/lge/msm8996-h1_global/msm8996-h1_global-connectivity.dtsi
index e298748..4842b98 100644
--- a/arch/arm64/boot/dts/lge/msm8996-h1_global/msm8996-h1_global-connectivity.dtsi
+++ b/arch/arm64/boot/dts/lge/msm8996-h1_global/msm8996-h1_global-connectivity.dtsi
@@ -44,18 +44,5 @@
wlan-en-gpio = <&pm8994_gpios 8 0>;
wlan-hostwake-gpio = <&tlmm 78 0>;
};
-
- bt_sleep{
- compatible = "bcm,bluesleep";
- bt_host_wake = <&tlmm 24 0>;
- bt_ext_wake = <&tlmm 92 0>;
- status = "ok";
- };
-
- bt_bcm43455{
- compatible = "bcm,bcm43455";
- bcm,bt-reset-gpio = <&tlmm 81 0>;
- bcm,bt-vdd-io-supply = <&pm8994_s4>;
- bcm,bt-vdd-io-voltage-level = <1800000 1800000>;
- };
};
+
diff --git a/arch/arm64/boot/dts/lge/msm8996-h1_us/msm8996-h1_us-connectivity.dtsi b/arch/arm64/boot/dts/lge/msm8996-h1_us/msm8996-h1_us-connectivity.dtsi
index f66c481..4842b98 100644
--- a/arch/arm64/boot/dts/lge/msm8996-h1_us/msm8996-h1_us-connectivity.dtsi
+++ b/arch/arm64/boot/dts/lge/msm8996-h1_us/msm8996-h1_us-connectivity.dtsi
@@ -44,18 +44,5 @@
wlan-en-gpio = <&pm8994_gpios 8 0>;
wlan-hostwake-gpio = <&tlmm 78 0>;
};
-
- bt_sleep{
- compatible = "bcm,bluesleep";
- bt_host_wake = <&tlmm 24 0>;
- bt_ext_wake = <&tlmm 92 0>;
- status = "ok";
- };
-
- bt_bcm4358{
- compatible = "bcm,bcm4358";
- bcm,bt-reset-gpio = <&tlmm 81 0>;
- bcm,bt-vdd-io-supply = <&pm8994_s4>;
- bcm,bt-vdd-io-voltage-level = <1800000 1800000>;
- };
};
+
diff --git a/arch/arm64/boot/dts/lge/msm8996-touch-sic-lg494x.dtsi b/arch/arm64/boot/dts/lge/msm8996-touch-sic-lg494x.dtsi
old mode 100644
new mode 100755
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment