| Message ID | 1448345075-6801-1-git-send-email-Mingkai.Hu@freescale.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Tue, Nov 24, 2015 at 02:04:35PM +0800, Mingkai Hu wrote: > From: Minghuan Lian <Minghuan.Lian@freescale.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@freescale.com> > Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com> > --- > Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 + > arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 12 ++++++++---- > 2 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt > index e376785..4600007 100644 > --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt > +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt > @@ -15,6 +15,7 @@ Required properties: > - compatible: should contain the platform identifier such as: > "fsl,ls1021a-pcie", "snps,dw-pcie" > "fsl,ls2080a-pcie", "snps,dw-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 e81cd48..3821bb1 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi > +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi > @@ -383,7 +383,8 @@ > }; > > pcie@3400000 { > - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; > + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", > + "snps,dw-pcie"; This doesn't match the doc as to what are valid combinations. The order here seems backwards too. ls2085a is older? > reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ > 0x10 0x00000000 0x0 0x00002000>; /* configuration space */ > reg-names = "regs", "config"; > @@ -406,7 +407,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"; > @@ -429,7 +431,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"; > @@ -452,7 +455,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"; > -- > 2.1.0.27.g96db324 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 24, 2015 at 11:01 PM, Hu Vincent <Mingkai.Hu@freescale.com> wrote: > > >> -----Original Message----- >> From: Rob Herring [mailto:robh@kernel.org] >> Sent: Wednesday, November 25, 2015 4:22 AM >> To: Hu Mingkai-B21284 >> Cc: arm@kernel.org; linux-arm-kernel@lists.infradead.org; >> devicetree@vger.kernel.org; Li Yang-Leo-R58472; Lian Minghuan-B31939 >> Subject: Re: [PATCH] dts/ls2080a: Update PCIe compatible >> >> On Tue, Nov 24, 2015 at 02:04:35PM +0800, Mingkai Hu wrote: >> > From: Minghuan Lian <Minghuan.Lian@freescale.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@freescale.com> >> > Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com> >> > --- >> > Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 + >> > arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 12 >> ++++++++---- >> > 2 files changed, 9 insertions(+), 4 deletions(-) >> > >> > diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt >> > b/Documentation/devicetree/bindings/pci/layerscape-pci.txt >> > index e376785..4600007 100644 >> > --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt >> > +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt >> > @@ -15,6 +15,7 @@ Required properties: >> > - compatible: should contain the platform identifier such as: >> > "fsl,ls1021a-pcie", "snps,dw-pcie" >> > "fsl,ls2080a-pcie", "snps,dw-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 e81cd48..3821bb1 100644 >> > --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi >> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi >> > @@ -383,7 +383,8 @@ >> > }; >> > >> > pcie@3400000 { >> > - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; >> > + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", >> > + "snps,dw-pcie"; >> >> This doesn't match the doc as to what are valid combinations. The order >> here seems backwards too. ls2085a is older? >> > > Yes, ls2085a was released earlier. You mean the older one comes first? Like: > > compatible = "fsl,ls2085a-pcie", "fsl,ls2080a-pcie", > "snps,dw-pcie"; No. The original order should be good. We should put newer/more specific compatible first and older/more generic compatible later. I think the issue is that the binding document. We don't need to list the combinations. Just list all the possible compatible strings specific to layerscape. You can add a special note about "snps, dw-pcie" separately. Regards, Leo -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt index e376785..4600007 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -15,6 +15,7 @@ Required properties: - compatible: should contain the platform identifier such as: "fsl,ls1021a-pcie", "snps,dw-pcie" "fsl,ls2080a-pcie", "snps,dw-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 e81cd48..3821bb1 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi @@ -383,7 +383,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"; @@ -406,7 +407,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"; @@ -429,7 +431,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"; @@ -452,7 +455,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";