diff --git a/arch/arm64/boot/dts/exynos/exynos9820.dts b/arch/arm64/boot/dts/exynos/exynos9820.dts
index 32cb45445827..2d1a5706e7fd 100644
--- a/arch/arm64/boot/dts/exynos/exynos9820.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9820.dts
@@ -5022,6 +5022,7 @@
 		static_info_enc = <0x1 0x180314>;
 		hdr10_plus = <0x1 0x180709>;
 		P010_decoding = <0x1>;
+		enc_ts_delta = <0x1 0x211208>;
 		support_10bit = <0x1>;
 		support_422 = <0x1>;
 		support_rgb = <0x0>;
diff --git a/arch/arm64/boot/dts/exynos/exynos9825.dts b/arch/arm64/boot/dts/exynos/exynos9825.dts
index e40c06cc289a..345e29633ff7 100644
--- a/arch/arm64/boot/dts/exynos/exynos9825.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9825.dts
@@ -5022,6 +5022,7 @@
 		static_info_enc = <0x1 0x180314>;
 		hdr10_plus = <0x1 0x180709>;
 		P010_decoding = <0x1>;
+		enc_ts_delta = <0x1 0x211208>;
 		support_10bit = <0x1>;
 		support_422 = <0x1>;
 		support_rgb = <0x0>;
diff --git a/arch/arm64/configs/exynos9820-beyond0lte_defconfig b/arch/arm64/configs/exynos9820-beyond0lte_defconfig
index 0e300204d25c..78b35a01dfa8 100644
--- a/arch/arm64/configs/exynos9820-beyond0lte_defconfig
+++ b/arch/arm64/configs/exynos9820-beyond0lte_defconfig
@@ -3981,6 +3981,8 @@ CONFIG_HID_PICOLCD=y
 # CONFIG_HID_PICOLCD_LEDS is not set
 # CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=y
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PRIMAX=y
 # CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=y
@@ -5532,9 +5534,6 @@ CONFIG_SENSORS_FINGERPRINT=y
 # CONFIG_SENSORS_FPRINT_SECURE is not set
 # CONFIG_SENSORS_QBT2000 is not set
 CONFIG_SENSORS_ET5XX=y
-# CONFIG_FIVE_TEE_DRIVER is not set
-CONFIG_ICD=y
-CONFIG_ICD_USE_TZDEV=y
 CONFIG_SEC_EXT=y
 CONFIG_SEC_REBOOT=y
 
@@ -5635,9 +5634,6 @@ CONFIG_SEC_HEAVY_TASK_CPU=y
 #
 CONFIG_VBUS_NOTIFIER=y
 # CONFIG_KPERFMON is not set
-CONFIG_TZIC=y
-CONFIG_TZIC_USE_TZDEV=y
-# CONFIG_TZIC_DEFAULT is not set
 CONFIG_SPU_VERIFY=y
 
 #
diff --git a/arch/arm64/configs/exynos9820-beyond1lte_defconfig b/arch/arm64/configs/exynos9820-beyond1lte_defconfig
index 7c1d05f99be2..e956a968d006 100644
--- a/arch/arm64/configs/exynos9820-beyond1lte_defconfig
+++ b/arch/arm64/configs/exynos9820-beyond1lte_defconfig
@@ -3981,6 +3981,8 @@ CONFIG_HID_PICOLCD=y
 # CONFIG_HID_PICOLCD_LEDS is not set
 # CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=y
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PRIMAX=y
 # CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=y
@@ -5532,9 +5534,6 @@ CONFIG_SENSORS_FINGERPRINT=y
 # CONFIG_SENSORS_FPRINT_SECURE is not set
 CONFIG_SENSORS_QBT2000=y
 # CONFIG_SENSORS_ET5XX is not set
-# CONFIG_FIVE_TEE_DRIVER is not set
-CONFIG_ICD=y
-CONFIG_ICD_USE_TZDEV=y
 CONFIG_SEC_EXT=y
 CONFIG_SEC_REBOOT=y
 
@@ -5635,9 +5634,6 @@ CONFIG_SEC_HEAVY_TASK_CPU=y
 #
 CONFIG_VBUS_NOTIFIER=y
 # CONFIG_KPERFMON is not set
-CONFIG_TZIC=y
-CONFIG_TZIC_USE_TZDEV=y
-# CONFIG_TZIC_DEFAULT is not set
 CONFIG_SPU_VERIFY=y
 
 #
diff --git a/arch/arm64/configs/exynos9820-beyond2lte_defconfig b/arch/arm64/configs/exynos9820-beyond2lte_defconfig
index 45b379c7c071..e6a7be5177cb 100644
--- a/arch/arm64/configs/exynos9820-beyond2lte_defconfig
+++ b/arch/arm64/configs/exynos9820-beyond2lte_defconfig
@@ -3979,6 +3979,8 @@ CONFIG_HID_PICOLCD=y
 # CONFIG_HID_PICOLCD_LEDS is not set
 # CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=y
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PRIMAX=y
 # CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=y
@@ -5630,9 +5632,6 @@ CONFIG_SEC_HEAVY_TASK_CPU=y
 #
 CONFIG_VBUS_NOTIFIER=y
 # CONFIG_KPERFMON is not set
-CONFIG_TZIC=y
-CONFIG_TZIC_USE_TZDEV=y
-# CONFIG_TZIC_DEFAULT is not set
 CONFIG_SPU_VERIFY=y
 
 #
diff --git a/arch/arm64/configs/exynos9820-beyondx_defconfig b/arch/arm64/configs/exynos9820-beyondx_defconfig
index a525c37a35f9..e21fb6b98f12 100644
--- a/arch/arm64/configs/exynos9820-beyondx_defconfig
+++ b/arch/arm64/configs/exynos9820-beyondx_defconfig
@@ -3962,6 +3962,8 @@ CONFIG_HID_PICOLCD=y
 # CONFIG_HID_PICOLCD_LEDS is not set
 # CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=y
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PRIMAX=y
 # CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=y
@@ -5514,9 +5516,6 @@ CONFIG_SENSORS_FINGERPRINT=y
 # CONFIG_SENSORS_FPRINT_SECURE is not set
 CONFIG_SENSORS_QBT2000=y
 # CONFIG_SENSORS_ET5XX is not set
-# CONFIG_FIVE_TEE_DRIVER is not set
-CONFIG_ICD=y
-CONFIG_ICD_USE_TZDEV=y
 CONFIG_SEC_EXT=y
 CONFIG_SEC_REBOOT=y
 
@@ -5617,9 +5616,6 @@ CONFIG_SEC_HEAVY_TASK_CPU=y
 #
 CONFIG_VBUS_NOTIFIER=y
 # CONFIG_KPERFMON is not set
-CONFIG_TZIC=y
-CONFIG_TZIC_USE_TZDEV=y
-# CONFIG_TZIC_DEFAULT is not set
 CONFIG_SPU_VERIFY=y
 
 #
diff --git a/arch/arm64/configs/exynos9820-d1_defconfig b/arch/arm64/configs/exynos9820-d1_defconfig
index 56fb4172d972..e9ffbfb2cb97 100644
--- a/arch/arm64/configs/exynos9820-d1_defconfig
+++ b/arch/arm64/configs/exynos9820-d1_defconfig
@@ -3981,6 +3981,8 @@ CONFIG_HID_PICOLCD=y
 # CONFIG_HID_PICOLCD_LEDS is not set
 # CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=y
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PRIMAX=y
 # CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=y
@@ -5532,9 +5534,6 @@ CONFIG_SENSORS_FINGERPRINT=y
 # CONFIG_SENSORS_FPRINT_SECURE is not set
 CONFIG_SENSORS_QBT2000=y
 # CONFIG_SENSORS_ET5XX is not set
-# CONFIG_FIVE_TEE_DRIVER is not set
-CONFIG_ICD=y
-CONFIG_ICD_USE_TZDEV=y
 CONFIG_SEC_EXT=y
 CONFIG_SEC_REBOOT=y
 
@@ -5635,9 +5634,6 @@ CONFIG_SEC_HEAVY_TASK_CPU=y
 #
 CONFIG_VBUS_NOTIFIER=y
 # CONFIG_KPERFMON is not set
-CONFIG_TZIC=y
-CONFIG_TZIC_USE_TZDEV=y
-# CONFIG_TZIC_DEFAULT is not set
 CONFIG_SPU_VERIFY=y
 
 #
diff --git a/arch/arm64/configs/exynos9820-d1xks_defconfig b/arch/arm64/configs/exynos9820-d1xks_defconfig
index 2e2385529501..80e7dd0843d0 100644
--- a/arch/arm64/configs/exynos9820-d1xks_defconfig
+++ b/arch/arm64/configs/exynos9820-d1xks_defconfig
@@ -3983,6 +3983,8 @@ CONFIG_HID_PICOLCD=y
 # CONFIG_HID_PICOLCD_LEDS is not set
 # CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=y
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PRIMAX=y
 # CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=y
@@ -5534,9 +5536,6 @@ CONFIG_SENSORS_FINGERPRINT=y
 # CONFIG_SENSORS_FPRINT_SECURE is not set
 CONFIG_SENSORS_QBT2000=y
 # CONFIG_SENSORS_ET5XX is not set
-# CONFIG_FIVE_TEE_DRIVER is not set
-CONFIG_ICD=y
-CONFIG_ICD_USE_TZDEV=y
 CONFIG_SEC_EXT=y
 CONFIG_SEC_REBOOT=y
 
@@ -5637,9 +5636,6 @@ CONFIG_SEC_HEAVY_TASK_CPU=y
 #
 CONFIG_VBUS_NOTIFIER=y
 # CONFIG_KPERFMON is not set
-CONFIG_TZIC=y
-CONFIG_TZIC_USE_TZDEV=y
-# CONFIG_TZIC_DEFAULT is not set
 CONFIG_SPU_VERIFY=y
 
 #
diff --git a/arch/arm64/configs/exynos9820-d2s_defconfig b/arch/arm64/configs/exynos9820-d2s_defconfig
index 3fdef4593dc6..64fc95e83544 100644
--- a/arch/arm64/configs/exynos9820-d2s_defconfig
+++ b/arch/arm64/configs/exynos9820-d2s_defconfig
@@ -3979,6 +3979,8 @@ CONFIG_HID_PICOLCD=y
 # CONFIG_HID_PICOLCD_LEDS is not set
 # CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=y
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PRIMAX=y
 # CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=y
@@ -5630,9 +5632,6 @@ CONFIG_SEC_HEAVY_TASK_CPU=y
 #
 CONFIG_VBUS_NOTIFIER=y
 # CONFIG_KPERFMON is not set
-CONFIG_TZIC=y
-CONFIG_TZIC_USE_TZDEV=y
-# CONFIG_TZIC_DEFAULT is not set
 CONFIG_SPU_VERIFY=y
 
 #
diff --git a/arch/arm64/configs/exynos9820-d2x_defconfig b/arch/arm64/configs/exynos9820-d2x_defconfig
index e2e77e1c8166..e6fd3bb10985 100644
--- a/arch/arm64/configs/exynos9820-d2x_defconfig
+++ b/arch/arm64/configs/exynos9820-d2x_defconfig
@@ -3981,6 +3981,8 @@ CONFIG_HID_PICOLCD=y
 # CONFIG_HID_PICOLCD_LEDS is not set
 # CONFIG_HID_PICOLCD_CIR is not set
 CONFIG_HID_PLANTRONICS=y
+CONFIG_HID_PLAYSTATION=y
+CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PRIMAX=y
 # CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=y
@@ -5632,9 +5634,6 @@ CONFIG_SEC_HEAVY_TASK_CPU=y
 #
 CONFIG_VBUS_NOTIFIER=y
 # CONFIG_KPERFMON is not set
-CONFIG_TZIC=y
-CONFIG_TZIC_USE_TZDEV=y
-# CONFIG_TZIC_DEFAULT is not set
 CONFIG_SPU_VERIFY=y
 
 #