From ffc40d2eae90e8cf526d0f7f28992066da5d7477 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 24 Jul 2018 16:04:44 +0200 Subject: [PATCH] ipq40xx: move essedma patches into same range Signed-off-by: John Crispin --- ...019-needs-rfs-vlan_tag-callbacks-in.patch} | 0 ...ts-ipq4019-add-ethernet-essedma-node.patch | 20 ++++++++++--------- ...h => 713-essedma-alloc-skb-ip-align.patch} | 0 3 files changed, 11 insertions(+), 9 deletions(-) rename target/linux/ipq40xx/patches-4.14/{605-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch => 703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch} (100%) rename target/linux/ipq40xx/patches-4.14/{902-essedma-alloc-skb-ip-align.patch => 713-essedma-alloc-skb-ip-align.patch} (100%) 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 2c923625b4..6e4137073a 100644 --- 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 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 + }; + 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