ipq40xx: move essedma patches into same range

Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/target/linux/ipq40xx/patches-4.14/605-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch b/target/linux/ipq40xx/patches-4.14/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-4.14/605-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch
rename to target/linux/ipq40xx/patches-4.14/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch

diff --git a/target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch
index 2c923625b472d2c6b839d4f760e480e603c1a51c..6e4137073a8c39fdaf430127bd1b786a968ccab7 100644 (file)
--- a/target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch
+++ b/target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch
@@ -14,18 +14,20 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  arch/arm/boot/dts/qcom-ipq4019.dtsi | 60 +++++++++++++++++++++++++++++++++++++
  1 file changed, 60 insertions(+)
 
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -28,6 +28,8 @@
-               spi1 = &spi_1;
-               i2c0 = &i2c_0;
-               i2c1 = &i2c_1;
+Index: linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019.dtsi
+===================================================================
+--- linux-4.14.54.orig/arch/arm/boot/dts/qcom-ipq4019.dtsi
++++ linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019.dtsi
+@@ -44,6 +44,8 @@
+               spi1 = &blsp1_spi2;
+               i2c0 = &blsp1_i2c3;
+               i2c1 = &blsp1_i2c4;
 +              ethernet0 = &gmac0;
 +              ethernet1 = &gmac1;
        };
  
        cpus {
-@@ -591,6 +593,64 @@
+@@ -606,6 +608,64 @@
                        status = "disabled";
                };
  
@@ -88,5 +90,5 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
 +              };
 +
                usb3_ss_phy: ssphy@9a000 {
-                       compatible = "qca,uni-ssphy";
-                       reg = <0x9a000 0x800>;
+                       compatible = "qcom,usb-ss-ipq4019-phy";
+                       #phy-cells = <0>;

diff --git a/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch b/target/linux/ipq40xx/patches-4.14/713-essedma-alloc-skb-ip-align.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch
rename to target/linux/ipq40xx/patches-4.14/713-essedma-alloc-skb-ip-align.patch