[OpenWrt-Devel] [PATCH 2/9] ramips: mt7621: use symbolic names of gic interrupt settings
John Crispin
blogic at openwrt.org
Fri Dec 11 01:45:20 EST 2015
On 11/12/2015 05:01, Nikolay Martynov wrote:
> This also adds dts nodes for cpc and mc for documentation purposes
>
> Signed-off-by: Nikolay Martynov <mar.kolya at gmail.com>
> ---
> 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 cae93c4..51cb8e6 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"
interesting, i actually spent half and hour trying to figure out how to
do this and failed. did not realize the include directive needs to be
different
John
>
> / {
> 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 b72066a..b3f66a1 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 96f3416..341d8f2 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 7702d9c..d3225f4 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 b65ade4..e950700 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 e2798fb..a3ac8fd 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 7228dc5..9cd1aea 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 2dc59cc..18d4d33 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 5eb813f..f5b6575 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 6170454..47c9a59 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 cc6b873..1f2f5b5 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 at 1fbf0000 {
> + compatible = "mtk,mt7621-cpc";
> + reg = <0x1fbf0000 0x8000>;
> + };
> +
> + mc at 1fbf8000 {
> + compatible = "mtk,mt7621-mc";
> + reg = <0x1fbf8000 0x8000>;
> + };
> +
> uartlite at 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 at 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 at 1fbc0000 {
> @@ -253,7 +265,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>;
> @@ -270,7 +282,7 @@
> compatible = "ralink,mt7620a-gsw";
> reg = <0x1e110000 8000>;
> interrupt-parent = <&gic>;
> - interrupts = <0 23 4>;
> + interrupts = <GIC_SHARED 23 IRQ_TYPE_LEVEL_HIGH>;
> };
>
> pcie at 1e140000 {
> @@ -293,9 +305,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";
>
>
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list