diff --git a/arch/arm/boot/dts/amlogic/mesontm2.dtsi b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
index 7de85f09f590..36fcea21267d 100644
--- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
@@ -1172,9 +1172,8 @@
 			   <&clkc CLKID_SD_EMMC_C_P0_COMP>,
 			   <&clkc CLKID_FCLK_DIV2>,
 			   <&clkc CLKID_FCLK_DIV2P5>,
-			   <&clkc CLKID_GP0_PLL>,
 			   <&xtal>;
-		clock-names = "core","clkin0","clkin1","clkin2","clkin3","xtal";
+		clock-names = "core","clkin0","clkin1","clkin2","xtal";
 
 		bus-width = <8>;
 		cap-sd-highspeed;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
index ec8f5fb941c0..e9a2f5831d50 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -1220,7 +1220,7 @@
 
 	sd_emmc_b: sdio@ffe05000 {
 		status = "okay";
-		compatible = "amlogic, meson-mmc-tl1";
+		compatible = "amlogic, meson-mmc-tm2";
 		reg = <0xffe05000 0x800>;
 		interrupts = <0 190 4>;
 
@@ -1266,7 +1266,7 @@
 
 /*	sd_emmc_b: sd@ffe05000 {
  *		status = "okay";
- *		compatible = "amlogic, meson-mmc-tl1";
+ *		compatible = "amlogic, meson-mmc-tm2";
  *		reg = <0xffe05000 0x800>;
  *		interrupts = <0 190 1>;
  *
@@ -1731,11 +1731,11 @@
 			 "MMC_CAP_1_8V_DDR",
 			 "MMC_CAP_HW_RESET",
 			 "MMC_CAP_ERASE",
-			 "MMC_CAP_CMD23",
-			 "MMC_CAP_DRIVER_TYPE_D";
-		//caps2 = "MMC_CAP2_HS200", "MMC_CAP2_HS400";
+			 "MMC_CAP_CMD23";
+		caps2 = "MMC_CAP2_HS200";
+		/* "MMC_CAP2_HS400";*/
 		f_min = <400000>;
-		f_max = <50000000>;
+		f_max = <200000000>;
 	};
 };
 
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
index 8dc663deca00..27b324dbf205 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
@@ -1161,7 +1161,7 @@
 
 	sd_emmc_b: sd@ffe05000 {
 		status = "okay";
-		compatible = "amlogic, meson-mmc-tl1";
+		compatible = "amlogic, meson-mmc-tm2";
 		reg = <0xffe05000 0x800>;
 		interrupts = <0 190 1>;
 
@@ -1614,14 +1614,14 @@
 			 "MMC_CAP_MMC_HIGHSPEED",
 			 "MMC_CAP_SD_HIGHSPEED",
 			 "MMC_CAP_NONREMOVABLE",
-			 /*"MMC_CAP_1_8V_DDR",*/
+			 "MMC_CAP_1_8V_DDR",
 			 "MMC_CAP_HW_RESET",
 			 "MMC_CAP_ERASE",
 			 "MMC_CAP_CMD23";
-		//caps2 = "MMC_CAP2_HS200";
+		caps2 = "MMC_CAP2_HS200";
 		/* "MMC_CAP2_HS400";*/
 		f_min = <400000>;
-		f_max = <50000000>;
+		f_max = <200000000>;
 	};
 };
 
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
index b764d9ed82a1..da62b76d605b 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -1161,7 +1161,7 @@
 
 	sd_emmc_b: sd@ffe05000 {
 		status = "okay";
-		compatible = "amlogic, meson-mmc-tl1";
+		compatible = "amlogic, meson-mmc-tm2";
 		reg = <0xffe05000 0x800>;
 		interrupts = <0 190 1>;
 
diff --git a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
index 8a5300d5a10d..1c9da7a019b4 100644
--- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
@@ -1152,9 +1152,8 @@
 			   <&clkc CLKID_SD_EMMC_C_P0_COMP>,
 			   <&clkc CLKID_FCLK_DIV2>,
 			   <&clkc CLKID_FCLK_DIV2P5>,
-			   <&clkc CLKID_GP0_PLL>,
 			   <&xtal>;
-		clock-names = "core","clkin0","clkin1","clkin2","clkin3","xtal";
+		clock-names = "core","clkin0","clkin1","clkin2","xtal";
 
 		bus-width = <8>;
 		cap-sd-highspeed;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
index f5384358b542..67d9771f9e53 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -1215,7 +1215,7 @@
 
 	sd_emmc_b: sdio@ffe05000 {
 		status = "okay";
-		compatible = "amlogic, meson-mmc-tl1";
+		compatible = "amlogic, meson-mmc-tm2";
 		reg = <0x0 0xffe05000 0x0 0x800>;
 		interrupts = <0 190 4>;
 
@@ -1260,7 +1260,7 @@
 	};
 /*	sd_emmc_b: sd@ffe05000 {
  *		status = "okay";
- *		compatible = "amlogic, meson-mmc-tl1";
+ *		compatible = "amlogic, meson-mmc-tm2";
  *		reg = <0xffe05000 0x800>;
  *		interrupts = <0 190 1>;
  *
@@ -1690,11 +1690,11 @@
 			 "MMC_CAP_1_8V_DDR",
 			 "MMC_CAP_HW_RESET",
 			 "MMC_CAP_ERASE",
-			 "MMC_CAP_CMD23",
-			 "MMC_CAP_DRIVER_TYPE_D";
-		//caps2 = "MMC_CAP2_HS200"; /* "MMC_CAP2_HS400";*/
+			 "MMC_CAP_CMD23";
+		caps2 = "MMC_CAP2_HS200";
+		 /* "MMC_CAP2_HS400";*/
 		f_min = <400000>;
-		f_max = <50000000>;
+		f_max = <200000000>;
 	};
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
index 4f37ef684215..531694c601ff 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesontm2.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_normal_P_32.dtsi"
 
 / {
 	model = "Amlogic TM2 T962E2 AB319";
@@ -1613,13 +1613,14 @@
 			 "MMC_CAP_MMC_HIGHSPEED",
 			 "MMC_CAP_SD_HIGHSPEED",
 			 "MMC_CAP_NONREMOVABLE",
-			 /*"MMC_CAP_1_8V_DDR",*/
+			 "MMC_CAP_1_8V_DDR",
 			 "MMC_CAP_HW_RESET",
 			 "MMC_CAP_ERASE",
 			 "MMC_CAP_CMD23";
-		/*caps2 = "MMC_CAP2_HS200", "MMC_CAP2_HS400";*/
+		caps2 = "MMC_CAP2_HS200";
+		/* "MMC_CAP2_HS400";*/
 		f_min = <400000>;
-		f_max = <50000000>;
+		f_max = <200000000>;
 	};
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
index 50e84332e91e..7746bfa6a7de 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -1160,7 +1160,7 @@
 
 	sd_emmc_b: sd@ffe05000 {
 		status = "okay";
-		compatible = "amlogic, meson-mmc-tl1";
+		compatible = "amlogic, meson-mmc-tm2";
 		reg = <0x0 0xffe05000 0x0 0x800>;
 		interrupts = <0 190 1>;
 
diff --git a/drivers/amlogic/clk/tl1/tl1_clk_sdemmc.c b/drivers/amlogic/clk/tl1/tl1_clk_sdemmc.c
index b5479b615f49..8ee3df8cc4f2 100644
--- a/drivers/amlogic/clk/tl1/tl1_clk_sdemmc.c
+++ b/drivers/amlogic/clk/tl1/tl1_clk_sdemmc.c
@@ -27,7 +27,7 @@
 #include "tl1.h"
 
 PNAME(sd_emmc_parent_names) = { "xtal", "fclk_div2",
-	"fclk_div3", "fclk_div5", "fclk_div7", "mpll2", "mpll3", "gp0_pll" };
+	"fclk_div3", "fclk_div5", "fclk_div2p5", "mpll2", "mpll3", "gp0_pll" };
 /*sd_emmc B*/
 static MUX(sd_emmc_p0_mux_B, HHI_SD_EMMC_CLK_CNTL, 0x7, 25,
 sd_emmc_parent_names, CLK_GET_RATE_NOCACHE | CLK_IGNORE_UNUSED);
diff --git a/drivers/amlogic/mmc/aml_sd_emmc_v3.c b/drivers/amlogic/mmc/aml_sd_emmc_v3.c
index 51ab50530082..4f28b8cb7bcd 100644
--- a/drivers/amlogic/mmc/aml_sd_emmc_v3.c
+++ b/drivers/amlogic/mmc/aml_sd_emmc_v3.c
@@ -241,7 +241,7 @@ static int meson_mmc_clk_set_rate_v3(struct mmc_host *mmc,
 					host->mux_parent[0]);
 			if (ret)
 				pr_warn("set comp0 as mux_clk parent error\n");
-		} else if (((host->data->chip_type == MMC_CHIP_TL1)
+		} else if (((host->data->chip_type >= MMC_CHIP_TL1)
 				|| (host->data->chip_type == MMC_CHIP_G12B))
 				&& (clk_ios >= 166000000)) {
 			src0_clk = devm_clk_get(host->dev, "clkin2");