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> SVN-Revision: 45827
This commit is contained in:
parent
590be1fd87
commit
30bbe0b388
4 changed files with 4 additions and 18 deletions
|
@ -121,11 +121,12 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
+++ b/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 "skeleton.dtsi"
|
||||||
#include <dt-bindings/clock/qcom,gcc-ipq806x.h>
|
#include <dt-bindings/clock/qcom,gcc-ipq806x.h>
|
||||||
#include <dt-bindings/soc/qcom,gsbi.h>
|
#include <dt-bindings/soc/qcom,gsbi.h>
|
||||||
+#include <dt-bindings/reset/qcom,gcc-ipq806x.h>
|
+#include <dt-bindings/reset/qcom,gcc-ipq806x.h>
|
||||||
|
+#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "Qualcomm IPQ8064";
|
model = "Qualcomm IPQ8064";
|
||||||
|
|
|
@ -119,14 +119,6 @@
|
||||||
};
|
};
|
||||||
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
+++ b/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 @@
|
@@ -637,5 +638,42 @@
|
||||||
dr_mode = "host";
|
dr_mode = "host";
|
||||||
};
|
};
|
||||||
|
|
|
@ -121,11 +121,12 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
+++ b/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 "skeleton.dtsi"
|
||||||
#include <dt-bindings/clock/qcom,gcc-ipq806x.h>
|
#include <dt-bindings/clock/qcom,gcc-ipq806x.h>
|
||||||
#include <dt-bindings/soc/qcom,gsbi.h>
|
#include <dt-bindings/soc/qcom,gsbi.h>
|
||||||
+#include <dt-bindings/reset/qcom,gcc-ipq806x.h>
|
+#include <dt-bindings/reset/qcom,gcc-ipq806x.h>
|
||||||
|
+#include <include/dt-bindings/interrupt-controller/arm-gic.h>
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "Qualcomm IPQ8064";
|
model = "Qualcomm IPQ8064";
|
||||||
|
|
|
@ -119,14 +119,6 @@
|
||||||
};
|
};
|
||||||
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
||||||
+++ b/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 @@
|
@@ -539,5 +540,42 @@
|
||||||
|
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
|
|
Loading…
Reference in a new issue