diff --git a/patch/kernel/sunxi-dev/unresolved/00-20-add-i2s-DT-pins.patch b/patch/kernel/sunxi-dev/general-add-i2s-DT-pins.patch
similarity index 85%
rename from patch/kernel/sunxi-dev/unresolved/00-20-add-i2s-DT-pins.patch
rename to patch/kernel/sunxi-dev/general-add-i2s-DT-pins.patch
index 5c642467c..da3ba0516 100644
--- a/patch/kernel/sunxi-dev/unresolved/00-20-add-i2s-DT-pins.patch
+++ b/patch/kernel/sunxi-dev/general-add-i2s-DT-pins.patch
@@ -1,8 +1,8 @@
 diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-index 11240a83..6049895c 100644
+index 1be1a02..dc9775d 100644
 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
 +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-@@ -310,6 +310,16 @@
+@@ -416,6 +416,16 @@
  				function = "i2c2";
  			};
  
@@ -16,6 +16,6 @@ index 11240a83..6049895c 100644
 +				function = "i2s1";
 +			};
 +
- 			mmc0_pins_a: mmc0@0 {
+ 			mmc0_pins: mmc0 {
  				pins = "PF0", "PF1", "PF2", "PF3",
  				       "PF4", "PF5";
diff --git a/patch/kernel/sunxi-dev/unresolved/00-19-add-H3-i2s-DT-nodes.patch b/patch/kernel/sunxi-dev/unresolved/00-19-add-H3-i2s-DT-nodes.patch
deleted file mode 100644
index 398f3bd09..000000000
--- a/patch/kernel/sunxi-dev/unresolved/00-19-add-H3-i2s-DT-nodes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Add the new DAI blocks to the device tree. I2S0 and I2S1 are for
-connecting to an external codec.
-
-Signed-off-by: Marcus Cooper <codek...@gmail.com>
----
-v2 changes compared to v1 are:
-- removed i2s2 which is used for HDMI audio
----
- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-index 11240a8313c2..ef87d29036d9 100644
---- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-@@ -450,6 +450,32 @@
- 			status = "disabled";
- 		};
- 
-+		i2s0: i2s@01c22000 {
-+			#sound-dai-cells = <0>;
-+			compatible = "allwinner,sun8i-h3-i2s";
-+			reg = <0x01c22000 0x400>;
-+			interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&ccu CLK_BUS_I2S0>, <&ccu CLK_I2S0>;
-+			clock-names = "apb", "mod";
-+			dmas = <&dma 3>, <&dma 3>;
-+			resets = <&ccu RST_BUS_I2S0>;
-+			dma-names = "rx", "tx";
-+			status = "disabled";
-+		};
-+
-+		i2s1: i2s@01c22400 {
-+			#sound-dai-cells = <0>;
-+			compatible = "allwinner,sun8i-h3-i2s";
-+			reg = <0x01c22400 0x400>;
-+			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>;
-+			clock-names = "apb", "mod";
-+			dmas = <&dma 4>, <&dma 4>;
-+			resets = <&ccu RST_BUS_I2S1>;
-+			dma-names = "rx", "tx";
-+			status = "disabled";
-+		};
-+
- 		codec: codec@01c22c00 {
- 			#sound-dai-cells = <0>;
- 			compatible = "allwinner,sun8i-h3-codec";
--- 
-2.14.1