| Message ID | 1482829985-24421-6-git-send-email-Minghuan.Lian@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Dec 27, 2016 at 05:13:02PM +0800, Minghuan Lian wrote: > LS1046a includes 3 MSI controllers. > Each controller supports 128 interrupts. > > Signed-off-by: Minghuan Lian <Minghuan.Lian@nxp.com> > --- > .../interrupt-controller/fsl,ls-scfg-msi.txt | 1 + > arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 31 ++++++++++++++++++++++ > 2 files changed, 32 insertions(+) > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt b/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt > index 2755cd1..54597b0 100644 > --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt > +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt > @@ -6,6 +6,7 @@ Required properties: > Layerscape PCIe MSI controller block such as: > "fsl,ls1021a-msi" > "fsl,ls1043a-msi" > + "fsl,ls1046a-msi" Differing whitespace. Otherwise, Acked-by: Rob Herring <robh@kernel.org>
Hi Rob, Thanks for your comment. I will change whitespace. Thanks, Minghuan > -----Original Message----- > From: Rob Herring [mailto:robh@kernel.org] > Sent: Wednesday, January 04, 2017 1:13 AM > To: M.H. Lian <minghuan.lian@nxp.com> > Cc: linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org; > devicetree@vger.kernel.org; Marc Zyngier <marc.zyngier@arm.com>; Jason > Cooper <jason@lakedaemon.net>; Roy Zang <roy.zang@nxp.com>; Mingkai > Hu <mingkai.hu@nxp.com>; Stuart Yoder <stuart.yoder@nxp.com>; Leo Li > <leoyang.li@nxp.com>; Scott Wood <scott.wood@nxp.com> > Subject: Re: [PATCH 6/9] arm64: dts: ls1046a: add MSI dts node > > On Tue, Dec 27, 2016 at 05:13:02PM +0800, Minghuan Lian wrote: > > LS1046a includes 3 MSI controllers. > > Each controller supports 128 interrupts. > > > > Signed-off-by: Minghuan Lian <Minghuan.Lian@nxp.com> > > --- > > .../interrupt-controller/fsl,ls-scfg-msi.txt | 1 + > > arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 31 > ++++++++++++++++++++++ > > 2 files changed, 32 insertions(+) > > > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,ls- > scfg-msi.txt b/Documentation/devicetree/bindings/interrupt- > controller/fsl,ls-scfg-msi.txt > > index 2755cd1..54597b0 100644 > > --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg- > msi.txt > > +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg- > msi.txt > > @@ -6,6 +6,7 @@ Required properties: > > Layerscape PCIe MSI controller block such as: > > "fsl,ls1021a-msi" > > "fsl,ls1043a-msi" > > + "fsl,ls1046a-msi" > > Differing whitespace. > > Otherwise, > > Acked-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt b/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt index 2755cd1..54597b0 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt @@ -6,6 +6,7 @@ Required properties: Layerscape PCIe MSI controller block such as: "fsl,ls1021a-msi" "fsl,ls1043a-msi" + "fsl,ls1046a-msi" - msi-controller: indicates that this is a PCIe MSI controller node - reg: physical base address of the controller and length of memory mapped. - interrupts: an interrupt to the parent interrupt controller. diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi index 38806ca..49dbafc 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi @@ -511,5 +511,36 @@ interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clockgen 4 1>; }; + + msi1: msi-controller@1580000 { + compatible = "fsl,ls1046a-msi"; + msi-controller; + reg = <0x0 0x1580000 0x0 0x10000>; + interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; + }; + + msi2: msi-controller@1590000 { + compatible = "fsl,ls1046a-msi"; + msi-controller; + reg = <0x0 0x1590000 0x0 0x10000>; + interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; + }; + + msi3: msi-controller@15a0000 { + compatible = "fsl,ls1046a-msi"; + msi-controller; + reg = <0x0 0x15a0000 0x0 0x10000>; + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>; + }; + }; };
LS1046a includes 3 MSI controllers. Each controller supports 128 interrupts. Signed-off-by: Minghuan Lian <Minghuan.Lian@nxp.com> --- .../interrupt-controller/fsl,ls-scfg-msi.txt | 1 + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+)