diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
index af9961cf320c..0c2cad0b456f 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -642,7 +642,7 @@
 		compatible = "amlogic, unifykey";
 		status = "okay";
 
-		unifykey-num = <24>;
+		unifykey-num = <21>;
 		unifykey-index-0 = <&keysn_0>;
 		unifykey-index-1 = <&keysn_1>;
 		unifykey-index-2 = <&keysn_2>;
@@ -664,9 +664,6 @@
 		unifykey-index-18 = <&keysn_18>;
 		unifykey-index-19 = <&keysn_19>;
 		unifykey-index-20 = <&keysn_20>;
-		unifykey-index-21 = <&keysn_21>;
-		unifykey-index-22 = <&keysn_22>;
-		unifykey-index-23 = <&keysn_23>;
 
 		keysn_0: key_0{
 			key-name = "usid";
@@ -778,21 +775,6 @@
 			key-device = "secure";
 			key-permit = "read","write","del";
 		};
-		keysn_21:key_21{
-			key-name = "hdcp22_rprx_fw";
-			key-device = "normal";
-			key-permit = "read","write","del";
-		};
-		keysn_22:key_22{
-			key-name = "hdcp22_rprp_fw";
-			key-device = "normal";
-			key-permit = "read","write","del";
-		};
-		keysn_23:key_23{
-			key-name = "hdcp22_rp_private";
-			key-device = "secure";
-			key-permit = "read","write","del";
-		};
 	}; /* End unifykey */
 
 	hdmirx {
@@ -853,13 +835,6 @@
 			0xff610000 0xa000>;
 	};
 
-	amhdmitx: amhdmitx {
-		compatible = "amlogic, amhdmitx";
-		dev_name = "amhdmitx";
-		status = "okay";
-		repeater_tx = <0x0>;
-	};
-
 	aocec: aocec {
 		compatible = "amlogic, aocec-tl1";
 		/*device_name = "aocec";*/
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
index c5a1e3970c93..b2efddccfd74 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -641,7 +641,7 @@
 		compatible = "amlogic, unifykey";
 		status = "okay";
 
-		unifykey-num = <24>;
+		unifykey-num = <21>;
 		unifykey-index-0 = <&keysn_0>;
 		unifykey-index-1 = <&keysn_1>;
 		unifykey-index-2 = <&keysn_2>;
@@ -663,9 +663,6 @@
 		unifykey-index-18 = <&keysn_18>;
 		unifykey-index-19 = <&keysn_19>;
 		unifykey-index-20 = <&keysn_20>;
-		unifykey-index-21 = <&keysn_21>;
-		unifykey-index-22 = <&keysn_22>;
-		unifykey-index-23 = <&keysn_23>;
 
 		keysn_0: key_0{
 			key-name = "usid";
@@ -777,21 +774,6 @@
 			key-device = "secure";
 			key-permit = "read","write","del";
 		};
-		keysn_21:key_21{
-			key-name = "hdcp22_rprx_fw";
-			key-device = "normal";
-			key-permit = "read","write","del";
-		};
-		keysn_22:key_22{
-			key-name = "hdcp22_rprp_fw";
-			key-device = "normal";
-			key-permit = "read","write","del";
-		};
-		keysn_23:key_23{
-			key-name = "hdcp22_rp_private";
-			key-device = "secure";
-			key-permit = "read","write","del";
-		};
 	}; /* End unifykey */
 
 	hdmirx {
@@ -852,13 +834,6 @@
 			0x0 0xff610000 0x0 0xa000>;
 	};
 
-	amhdmitx: amhdmitx {
-		compatible = "amlogic, amhdmitx";
-		dev_name = "amhdmitx";
-		status = "okay";
-		repeater_tx = <0x0>;
-	};
-
 	aocec: aocec {
 		compatible = "amlogic, aocec-tl1";
 		/*device_name = "aocec";*/