| Message ID | 1455674663-9273-1-git-send-email-Mingkai.Hu@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 17, 2016 at 10:04:23AM +0800, Mingkai Hu wrote: > From: Minghuan Lian <minghuan.lian@nxp.com> > > The patch adds LS2085a to PCIe compatible to fix the compatibility > issue when using firmware with LS2085a compatible property. > > Signed-off-by: Minghuan Lian <minghuan.lian@nxp.com> > Signed-off-by: Mingkai Hu <mingkai.hu@nxp.com> > --- > v3: > - Make the compatible consistent between layerscape-pci.txt > and dts file. > > v2: > - Rebased to latest kernel base > > Documentation/devicetree/bindings/pci/layerscape-pci.txt | 2 +- > arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 12 ++++++++---- > 2 files changed, 9 insertions(+), 5 deletions(-) > Acked-by: Rob Herring <robh@kernel.org>
On Thu, Feb 18, 2016 at 08:36:39AM -0600, Rob Herring wrote: > On Wed, Feb 17, 2016 at 10:04:23AM +0800, Mingkai Hu wrote: > > From: Minghuan Lian <minghuan.lian@nxp.com> > > > > The patch adds LS2085a to PCIe compatible to fix the compatibility > > issue when using firmware with LS2085a compatible property. > > > > Signed-off-by: Minghuan Lian <minghuan.lian@nxp.com> > > Signed-off-by: Mingkai Hu <mingkai.hu@nxp.com> > > --- > > v3: > > - Make the compatible consistent between layerscape-pci.txt > > and dts file. > > > > v2: > > - Rebased to latest kernel base > > > > Documentation/devicetree/bindings/pci/layerscape-pci.txt | 2 +- > > arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 12 ++++++++---- > > 2 files changed, 9 insertions(+), 5 deletions(-) > > > > Acked-by: Rob Herring <robh@kernel.org> Applied, thanks. -Olof
diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt index e376785..ef683b2 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -14,7 +14,7 @@ information. Required properties: - compatible: should contain the platform identifier such as: "fsl,ls1021a-pcie", "snps,dw-pcie" - "fsl,ls2080a-pcie", "snps,dw-pcie" + "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" - reg: base addresses and lengths of the PCIe controller - interrupts: A list of interrupt outputs of the controller. Must contain an entry for each entry in the interrupt-names property. diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi index 2b23d03..1b18d7a 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi @@ -456,7 +456,8 @@ }; pcie@3400000 { - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", + "snps,dw-pcie"; reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ 0x10 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -479,7 +480,8 @@ }; pcie@3500000 { - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", + "snps,dw-pcie"; reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ 0x12 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -502,7 +504,8 @@ }; pcie@3600000 { - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", + "snps,dw-pcie"; reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ 0x14 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -525,7 +528,8 @@ }; pcie@3700000 { - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", + "snps,dw-pcie"; reg = <0x00 0x03700000 0x0 0x00100000 /* controller registers */ 0x16 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config";