diff --git a/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch b/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch
index 3464d0cc52..f7bfe45706 100644
--- a/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch
+++ b/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch
@@ -93,4 +93,4 @@ index 782117dc0b28..128302696ca1 100644
 +#define CLK_NUMBER_H6	(CLK_W1 + 1)
 +#define CLK_NUMBER_H616	(CLK_IR + 1)
  
- #endif /* _CCU_SUN50I_H6_R_H */
\ No newline at end of file
+ #endif /* _CCU_SUN50I_H6_R_H */
diff --git a/patch/kernel/sunxi-dev/h616_005_Add-support-for-the-Allwinner-H616-CCU.patch b/patch/kernel/sunxi-dev/h616_005_Add-support-for-the-Allwinner-H616-CCU.patch
index 8dc9502988..488d3cee3e 100644
--- a/patch/kernel/sunxi-dev/h616_005_Add-support-for-the-Allwinner-H616-CCU.patch
+++ b/patch/kernel/sunxi-dev/h616_005_Add-support-for-the-Allwinner-H616-CCU.patch
@@ -1421,4 +1421,4 @@ index 000000000000..1c992cfbbbab
 +#define RST_BUS_HDCP		55
 +#define RST_BUS_KEYADC		56
 +
-+#endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */
\ No newline at end of file
++#endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */
diff --git a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch
index 2210c3ffb7..d64103470c 100644
--- a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch
+++ b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch
@@ -56,11 +56,19 @@ index fc62773602ec..1518b64112b7 100644
  static const struct of_device_id sunxi_mmc_of_match[] = {
  	{ .compatible = "allwinner,sun4i-a10-mmc", .data = &sun4i_a10_cfg },
  	{ .compatible = "allwinner,sun5i-a13-mmc", .data = &sun5i_a13_cfg },
-@@ -1186,6 +1206,8 @@  static const struct of_device_id sunxi_mmc_of_match[] = {
+@@ -1186,6 +1207,8 @@  static const struct of_device_id sunxi_mmc_of_match[] = {
  	{ .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg },
  	{ .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg },
  	{ .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg },
+ 	{ .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
 +	{ .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg },
 +	{ .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg },
  	{ /* sentinel */ }
- };
\ No newline at end of file
+ };
+--
+
+# Note
+# This patch has been modified to allow proper applying.
+# The line 
+#  	{ .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
+# as been added to compensate for another patch applied before this one.
\ No newline at end of file
diff --git a/patch/kernel/sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch b/patch/kernel/sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch
index 19a7d2d8f3..32bf647160 100644
--- a/patch/kernel/sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch
+++ b/patch/kernel/sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch
@@ -707,4 +707,4 @@ index 000000000000..dcffbfdcd26b
 +			#size-cells = <0>;
 +		};
 +	};
-+};
\ No newline at end of file
++};
diff --git a/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch b/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch
index c9289c3406..4d258492bd 100644
--- a/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch
+++ b/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch
@@ -20,19 +20,5 @@ index d3eab3b57..e71c04a80 100644
 +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
 
  subdir-y       := $(dts-dirs) overlay
-diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
-index a8dbc3e3e..efab65ae9 100644
---- a/drivers/mmc/host/sunxi-mmc.c
-+++ b/drivers/mmc/host/sunxi-mmc.c
-@@ -1220,6 +1220,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = {
-        { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg },
-        { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg },
-        { .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
-+        { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg },
-+        { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg },
-        { /* sentinel */ }
- };
- MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);
 --
 Created with Armbian build tools https://github.com/armbian/build
-