| Message ID | 1394890861-18347-3-git-send-email-carlo@caione.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Mar 15, 2014 at 02:41:00PM +0100, Carlo Caione wrote: > This patch adds DTS entries for NMI controller as child of GIC. > > Signed-off-by: Carlo Caione <carlo@caione.org> > --- > arch/arm/boot/dts/sun6i-a31.dtsi | 9 +++++++++ > arch/arm/boot/dts/sun7i-a20.dtsi | 9 +++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi > index 5256ad9..4a5050c 100644 > --- a/arch/arm/boot/dts/sun6i-a31.dtsi > +++ b/arch/arm/boot/dts/sun6i-a31.dtsi > @@ -190,6 +190,15 @@ > #size-cells = <1>; > ranges; > > + nmi_intc: sc-nmi-intc@01f00c0c { It should be interrupt-controller@01f00c0c, according to the ePAPR. > + compatible = "allwinner,sun6i-a31-sc-nmi"; I'm curious, what is the "sc" for? > + interrupt-controller; > + #interrupt-cells = <2>; > + reg = <0x01f00c0c 0x38>; > + interrupt-parent = <&gic>; This is actually the default. > + interrupts = <0 0 4>; > + }; > + Thanks! Maxime
On Mon, Mar 17, 2014 at 2:30 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Sat, Mar 15, 2014 at 02:41:00PM +0100, Carlo Caione wrote: >> This patch adds DTS entries for NMI controller as child of GIC. >> >> Signed-off-by: Carlo Caione <carlo@caione.org> >> --- >> arch/arm/boot/dts/sun6i-a31.dtsi | 9 +++++++++ >> arch/arm/boot/dts/sun7i-a20.dtsi | 9 +++++++++ >> 2 files changed, 18 insertions(+) >> >> diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi >> index 5256ad9..4a5050c 100644 >> --- a/arch/arm/boot/dts/sun6i-a31.dtsi >> +++ b/arch/arm/boot/dts/sun6i-a31.dtsi >> @@ -190,6 +190,15 @@ >> #size-cells = <1>; >> ranges; >> >> + nmi_intc: sc-nmi-intc@01f00c0c { > > It should be interrupt-controller@01f00c0c, according to the ePAPR. Ok >> + compatible = "allwinner,sun6i-a31-sc-nmi"; > > I'm curious, what is the "sc" for? It stands for System Control (in the datasheet the NMI controller is included in a block named System Controller) >> + interrupt-controller; >> + #interrupt-cells = <2>; >> + reg = <0x01f00c0c 0x38>; >> + interrupt-parent = <&gic>; > > This is actually the default. I'll delete it. >> + interrupts = <0 0 4>; >> + }; >> + > > Thanks! > Maxime Thank you,
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 5256ad9..4a5050c 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -190,6 +190,15 @@ #size-cells = <1>; ranges; + nmi_intc: sc-nmi-intc@01f00c0c { + compatible = "allwinner,sun6i-a31-sc-nmi"; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x01f00c0c 0x38>; + interrupt-parent = <&gic>; + interrupts = <0 0 4>; + }; + pio: pinctrl@01c20800 { compatible = "allwinner,sun6i-a31-pinctrl"; reg = <0x01c20800 0x400>; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 6f25cf5..55464a0 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -339,6 +339,15 @@ #size-cells = <1>; ranges; + nmi_intc: sc-nmi-intc@01c00030 { + compatible = "allwinner,sun7i-a20-sc-nmi"; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x01c00030 0x0c>; + interrupt-parent = <&gic>; + interrupts = <0 0 4>; + }; + emac: ethernet@01c0b000 { compatible = "allwinner,sun4i-a10-emac"; reg = <0x01c0b000 0x1000>;
This patch adds DTS entries for NMI controller as child of GIC. Signed-off-by: Carlo Caione <carlo@caione.org> --- arch/arm/boot/dts/sun6i-a31.dtsi | 9 +++++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 9 +++++++++ 2 files changed, 18 insertions(+)