| Message ID | 1449224417-20753-1-git-send-email-Mingkai.Hu@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 04, 2015 at 06:20:17PM +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> > --- > v2 change: > - Rebased to latest kernel base How about implementing my comments on v1, too? > > 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"; > 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 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> -----Original Message----- > From: Rob Herring [mailto:robh@kernel.org] > Sent: Saturday, December 05, 2015 12:23 AM > To: Hu Mingkai-B21284 > Cc: arm@kernel.org; devicetree@vger.kernel.org; Li Yang-Leo-R58472; > linux-arm-kernel@lists.infradead.org; Lian Minghuan-B31939 > Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible > > On Fri, Dec 04, 2015 at 06:20:17PM +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> > > --- > > v2 change: > > - Rebased to latest kernel base > > How about implementing my comments on v1, too? > Hi Rob, Do you mean to change the combinations in layerscape-pci.txt as follows? > --- 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,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" And the ls2085a was released first, but the dts file is for ls2080a (fsl-ls2080a.dtsi), So I prefer to put the ls2080a as the first compatible string. How about your suggestion? Thanks, Mingkai
> -----Original Message----- > From: Hu Mingkai-B21284 > Sent: Monday, December 07, 2015 4:44 PM > To: 'Rob Herring' > Cc: arm@kernel.org; devicetree@vger.kernel.org; Li Yang-Leo-R58472; > linux-arm-kernel@lists.infradead.org; Lian Minghuan-B31939 > Subject: RE: [PATCH v2] dts/ls2080a: Update PCIe compatible > > > > > -----Original Message----- > > From: Rob Herring [mailto:robh@kernel.org] > > Sent: Saturday, December 05, 2015 12:23 AM > > To: Hu Mingkai-B21284 > > Cc: arm@kernel.org; devicetree@vger.kernel.org; Li Yang-Leo-R58472; > > linux-arm-kernel@lists.infradead.org; Lian Minghuan-B31939 > > Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible > > > > On Fri, Dec 04, 2015 at 06:20:17PM +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> > > > --- > > > v2 change: > > > - Rebased to latest kernel base > > > > How about implementing my comments on v1, too? > > > > Hi Rob, > > Do you mean to change the combinations in layerscape-pci.txt as follows? > > > --- 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,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" > > > And the ls2085a was released first, but the dts file is for ls2080a (fsl- > ls2080a.dtsi), So I prefer to put the ls2080a as the first compatible > string. How about your suggestion? > Hi Rob, I will keep the "fsl,ls2085a-pcie" as the first compatible string as discussed. And change the layerscape-pci.txt as follows: > > - "fsl,ls2080a-pcie", "snps,dw-pcie" > > + "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" What's your suggestion? Thanks, Mingkai
On Mon, 2015-12-14 at 20:01 -0600, Hu Mingkai-B21284 wrote: > > > -----Original Message----- > > From: Hu Mingkai-B21284 > > Sent: Monday, December 07, 2015 4:44 PM > > To: 'Rob Herring' > > Cc: arm@kernel.org; devicetree@vger.kernel.org; Li Yang-Leo-R58472; > > linux-arm-kernel@lists.infradead.org; Lian Minghuan-B31939 > > Subject: RE: [PATCH v2] dts/ls2080a: Update PCIe compatible > > > > > > > > > -----Original Message----- > > > From: Rob Herring [mailto:robh@kernel.org] > > > Sent: Saturday, December 05, 2015 12:23 AM > > > To: Hu Mingkai-B21284 > > > Cc: arm@kernel.org; devicetree@vger.kernel.org; Li Yang-Leo-R58472; > > > linux-arm-kernel@lists.infradead.org; Lian Minghuan-B31939 > > > Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible > > > > > > On Fri, Dec 04, 2015 at 06:20:17PM +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> > > > > --- > > > > v2 change: > > > > - Rebased to latest kernel base > > > > > > How about implementing my comments on v1, too? > > > > > > > Hi Rob, > > > > Do you mean to change the combinations in layerscape-pci.txt as follows? > > > > > --- 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,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" > > > > > > And the ls2085a was released first, but the dts file is for ls2080a (fsl- > > ls2080a.dtsi), So I prefer to put the ls2080a as the first compatible > > string. How about your suggestion? > > > > Hi Rob, > > I will keep the "fsl,ls2085a-pcie" as the first compatible string as > discussed. Do you mean "fsl,ls2080a-pcie"? -Scott > And change the layerscape-pci.txt as follows: > > > > - "fsl,ls2080a-pcie", "snps,dw-pcie" > > > + "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" > > What's your suggestion?
> -----Original Message----- > From: Wood Scott-B07421 > Sent: Tuesday, December 15, 2015 10:03 AM > To: Hu Mingkai-B21284; Rob Herring > Cc: arm@kernel.org; devicetree@vger.kernel.org; Li Yang-Leo-R58472; > linux-arm-kernel@lists.infradead.org; Lian Minghuan-B31939 > Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible > > On Mon, 2015-12-14 at 20:01 -0600, Hu Mingkai-B21284 wrote: > > > > > -----Original Message----- > > > From: Hu Mingkai-B21284 > > > Sent: Monday, December 07, 2015 4:44 PM > > > To: 'Rob Herring' > > > Cc: arm@kernel.org; devicetree@vger.kernel.org; Li Yang-Leo-R58472; > > > linux-arm-kernel@lists.infradead.org; Lian Minghuan-B31939 > > > Subject: RE: [PATCH v2] dts/ls2080a: Update PCIe compatible > > > > > > > > > > > > > -----Original Message----- > > > > From: Rob Herring [mailto:robh@kernel.org] > > > > Sent: Saturday, December 05, 2015 12:23 AM > > > > To: Hu Mingkai-B21284 > > > > Cc: arm@kernel.org; devicetree@vger.kernel.org; Li > > > > Yang-Leo-R58472; linux-arm-kernel@lists.infradead.org; Lian > > > > Minghuan-B31939 > > > > Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible > > > > > > > > On Fri, Dec 04, 2015 at 06:20:17PM +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> > > > > > --- > > > > > v2 change: > > > > > - Rebased to latest kernel base > > > > > > > > How about implementing my comments on v1, too? > > > > > > > > > > Hi Rob, > > > > > > Do you mean to change the combinations in layerscape-pci.txt as > follows? > > > > > > > --- 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,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" > > > > > > > > > And the ls2085a was released first, but the dts file is for ls2080a > > > (fsl- ls2080a.dtsi), So I prefer to put the ls2080a as the first > > > compatible string. How about your suggestion? > > > > > > > Hi Rob, > > > > I will keep the "fsl,ls2085a-pcie" as the first compatible string as > > discussed. > > Do you mean "fsl,ls2080a-pcie"? > Oops. Yes, it's "fsl,ls2080a-pcie ". Thanks, Mingkai
On Mon, Dec 7, 2015 at 4:44 PM, Hu Vincent <Mingkai.Hu@freescale.com> wrote: > > >> -----Original Message----- >> From: Rob Herring [mailto:robh@kernel.org] >> Sent: Saturday, December 05, 2015 12:23 AM >> To: Hu Mingkai-B21284 >> Cc: arm@kernel.org; devicetree@vger.kernel.org; Li Yang-Leo-R58472; >> linux-arm-kernel@lists.infradead.org; Lian Minghuan-B31939 >> Subject: Re: [PATCH v2] dts/ls2080a: Update PCIe compatible >> >> On Fri, Dec 04, 2015 at 06:20:17PM +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> >> > --- >> > v2 change: >> > - Rebased to latest kernel base >> >> How about implementing my comments on v1, too? >> > > Hi Rob, > > Do you mean to change the combinations in layerscape-pci.txt as follows? > >> --- 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,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" > > > And the ls2085a was released first, but the dts file is for ls2080a (fsl-ls2080a.dtsi), > So I prefer to put the ls2080a as the first compatible string. How about your suggestion? I think this is what Rob suggested in v1 to make the combination in document align with real dts. And it would be good to also have an entry for ls2085: "fsl,ls2085a-pcie", "snps,dw-pcie". Can you send an updated version? Regards, Leo
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";