From 81c999bbda65c5c2e929e6406998ac25dab97f41 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Fri, 11 Dec 2015 15:02:13 +0000
Subject: [PATCH] ramips: mt7621: use symbolic names of gic interrupt settings
This also adds dts nodes for cpc and mc for documentation purposes
Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
SVN-Revision: 47836
---
target/linux/ramips/dts/DIR-860L-B1.dts | 2 +-
target/linux/ramips/dts/FIREWRT.dts | 2 +-
target/linux/ramips/dts/MT7621.dts | 2 +-
target/linux/ramips/dts/PBR-M1.dts | 2 +-
target/linux/ramips/dts/RE6500.dts | 2 +-
target/linux/ramips/dts/SAP-G3200U3.dts | 2 +-
target/linux/ramips/dts/WF-2881.dts | 2 +-
target/linux/ramips/dts/WSR-1166.dts | 2 +-
target/linux/ramips/dts/WSR-600.dts | 2 +-
target/linux/ramips/dts/ZBT-WG2626.dts | 2 +-
target/linux/ramips/dts/mt7621.dtsi | 28 ++++++++++++++++++-------
11 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts
index cae93c406c6..51cb8e6fb5b 100644
--- a/target/linux/ramips/dts/DIR-860L-B1.dts
+++ b/target/linux/ramips/dts/DIR-860L-B1.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
diff --git a/target/linux/ramips/dts/FIREWRT.dts b/target/linux/ramips/dts/FIREWRT.dts
index b72066afe3c..b3f66a181bf 100644
--- a/target/linux/ramips/dts/FIREWRT.dts
+++ b/target/linux/ramips/dts/FIREWRT.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/MT7621.dts b/target/linux/ramips/dts/MT7621.dts
index c90fc9511c5..fefdb98b86a 100644
--- a/target/linux/ramips/dts/MT7621.dts
+++ b/target/linux/ramips/dts/MT7621.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts
index 7702d9cab4f..d3225f4a268 100644
--- a/target/linux/ramips/dts/PBR-M1.dts
+++ b/target/linux/ramips/dts/PBR-M1.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/RE6500.dts b/target/linux/ramips/dts/RE6500.dts
index b65ade400e8..e9507000146 100644
--- a/target/linux/ramips/dts/RE6500.dts
+++ b/target/linux/ramips/dts/RE6500.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index e2798fb3466..a3ac8fd434c 100644
--- a/target/linux/ramips/dts/SAP-G3200U3.dts
+++ b/target/linux/ramips/dts/SAP-G3200U3.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index 7228dc527fe..9cd1aead357 100644
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/WSR-1166.dts b/target/linux/ramips/dts/WSR-1166.dts
index 2dc59cc281d..18d4d338afb 100644
--- a/target/linux/ramips/dts/WSR-1166.dts
+++ b/target/linux/ramips/dts/WSR-1166.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
diff --git a/target/linux/ramips/dts/WSR-600.dts b/target/linux/ramips/dts/WSR-600.dts
index 5eb813f0026..f5b6575bdcc 100644
--- a/target/linux/ramips/dts/WSR-600.dts
+++ b/target/linux/ramips/dts/WSR-600.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
diff --git a/target/linux/ramips/dts/ZBT-WG2626.dts b/target/linux/ramips/dts/ZBT-WG2626.dts
index 6170454bc6a..47c9a59f620 100644
--- a/target/linux/ramips/dts/ZBT-WG2626.dts
+++ b/target/linux/ramips/dts/ZBT-WG2626.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
/ {
compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 801b075e27f..c54334eb8d8 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/interrupt-controller/mips-gic.h>
+
/ {
#address-cells = <1>;
#size-cells = <1>;
@@ -72,12 +74,22 @@
reg = <0x300 0x100>;
};
+ cpc@1fbf0000 {
+ compatible = "mtk,mt7621-cpc";
+ reg = <0x1fbf0000 0x8000>;
+ };
+
+ mc@1fbf8000 {
+ compatible = "mtk,mt7621-mc";
+ reg = <0x1fbf8000 0x8000>;
+ };
+
uartlite@c00 {
compatible = "ns16550a";
reg = <0xc00 0x100>;
interrupt-parent = <&gic>;
- interrupts = <0 26 4>;
+ interrupts = <GIC_SHARED 26 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>;
reg-io-width = <4>;
@@ -210,7 +222,7 @@
reg = <0x1E130000 4000>;
interrupt-parent = <&gic>;
- interrupts = <0 20 4>;
+ interrupts = <GIC_SHARED 20 IRQ_TYPE_LEVEL_HIGH>;
};
xhci@1E1C0000 {
@@ -220,7 +232,7 @@
reg = <0x1E1C0000 4000>;
interrupt-parent = <&gic>;
- interrupts = <0 22 4>;
+ interrupts = <GIC_SHARED 22 IRQ_TYPE_LEVEL_HIGH>;
};
gic: interrupt-controller@1fbc0000 {
@@ -273,7 +285,7 @@
reset-names = "fe", "eth";
interrupt-parent = <&gic>;
- interrupts = <0 3 4>;
+ interrupts = <GIC_SHARED 3 IRQ_TYPE_LEVEL_HIGH>;
mdio-bus {
#address-cells = <1>;
@@ -290,7 +302,7 @@
compatible = "ralink,mt7620a-gsw";
reg = <0x1e110000 8000>;
interrupt-parent = <&gic>;
- interrupts = <0 23 4>;
+ interrupts = <GIC_SHARED 23 IRQ_TYPE_LEVEL_HIGH>;
};
pcie@1e140000 {
@@ -313,9 +325,9 @@
>;
interrupt-parent = <&gic>;
- interrupts = <0 4 4
- 0 24 4
- 0 25 4>;
+ interrupts = <GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH
+ GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH
+ GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
status = "okay";
--
GitLab