diff options
| author | John Crispin <blogic@openwrt.org> | 2015-05-29 12:25:15 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-05-29 12:25:15 +0000 |
| commit | e684038a0477e33e4f8c85b604c61841894e7a61 (patch) | |
| tree | 87a33794411b456185f41c23600956b3b971e503 /target | |
| parent | d4aa39c140b3105e4649195832bff2e4ffd6e29f (diff) | |
| download | master-187ad058-e684038a0477e33e4f8c85b604c61841894e7a61.tar.gz master-187ad058-e684038a0477e33e4f8c85b604c61841894e7a61.tar.bz2 master-187ad058-e684038a0477e33e4f8c85b604c61841894e7a61.zip | |
ipq806x: move arm-gic include into pcie patch
This include is necessary starting at the PCIe patch, which has a lower
number. So in order to keep the patches consistent, we'll move the
arm-gic include in the first patch who needs it.
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45827 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
4 files changed, 4 insertions, 18 deletions
diff --git a/target/linux/ipq806x/patches-3.18/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-3.18/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch index 3c1ae617fe..7bee560e39 100644 --- a/target/linux/ipq806x/patches-3.18/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch +++ b/target/linux/ipq806x/patches-3.18/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch @@ -121,11 +121,12 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> #address-cells = <1>; --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -3,6 +3,7 @@ +@@ -3,6 +3,8 @@ #include "skeleton.dtsi" #include <dt-bindings/clock/qcom,gcc-ipq806x.h> #include <dt-bindings/soc/qcom,gsbi.h> +#include <dt-bindings/reset/qcom,gcc-ipq806x.h> ++#include <dt-bindings/interrupt-controller/arm-gic.h> / { model = "Qualcomm IPQ8064"; diff --git a/target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch b/target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch index f0c511a332..3c81f8834d 100644 --- a/target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch +++ b/target/linux/ipq806x/patches-3.18/700-add-gmac-dts-suport.patch @@ -119,14 +119,6 @@ }; --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -5,6 +5,7 @@ - #include <dt-bindings/mfd/qcom-rpm.h> - #include <dt-bindings/soc/qcom,gsbi.h> - #include <dt-bindings/reset/qcom,gcc-ipq806x.h> -+#include <dt-bindings/interrupt-controller/arm-gic.h> - - / { - model = "Qualcomm IPQ8064"; @@ -637,5 +638,42 @@ dr_mode = "host"; }; diff --git a/target/linux/ipq806x/patches-4.0/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-4.0/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch index 90095758f2..ad0a7401be 100644 --- a/target/linux/ipq806x/patches-4.0/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch +++ b/target/linux/ipq806x/patches-4.0/112-ARM-dts-qcom-add-pcie-nodes-to-ipq806x-platforms.patch @@ -121,11 +121,12 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> #address-cells = <1>; --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -3,6 +3,7 @@ +@@ -3,6 +3,8 @@ #include "skeleton.dtsi" #include <dt-bindings/clock/qcom,gcc-ipq806x.h> #include <dt-bindings/soc/qcom,gsbi.h> +#include <dt-bindings/reset/qcom,gcc-ipq806x.h> ++#include <include/dt-bindings/interrupt-controller/arm-gic.h> / { model = "Qualcomm IPQ8064"; diff --git a/target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch b/target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch index 7b628a7aeb..b5a3f19b23 100644 --- a/target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch +++ b/target/linux/ipq806x/patches-4.0/700-add-gmac-dts-suport.patch @@ -119,14 +119,6 @@ }; --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -5,6 +5,7 @@ - #include <dt-bindings/mfd/qcom-rpm.h> - #include <dt-bindings/soc/qcom,gsbi.h> - #include <dt-bindings/reset/qcom,gcc-ipq806x.h> -+#include <dt-bindings/interrupt-controller/arm-gic.h> - - / { - model = "Qualcomm IPQ8064"; @@ -539,5 +540,42 @@ status = "disabled"; |