| Message ID | 1407433181-21960-1-git-send-email-l.stach@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Aug 7, 2014 at 2:39 PM, Lucas Stach <l.stach@pengutronix.de> wrote: > Fixes "imx6q-pcie 1ffc000.pcie: missing *config* reg space" > error exposed by new versions of the designware pcie driver. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > v2: also fix documentation example > --- > Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +++- > arch/arm/boot/dts/imx6qdl.dtsi | 4 +++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > index 9455fd0ec830..6fbba53a309b 100644 > --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > @@ -17,7 +17,9 @@ Example: > > pcie@0x01000000 { > compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; > - reg = <0x01ffc000 0x4000>; > + reg = <0x01ffc000 0x04000>, > + <0x01f00000 0x80000>; > + reg-names = "dbi", "config"; It would be nice to update the 'reg' description and add the 'reg-names' entry in the 'Required properties' section. Currently we have the following description: "reg: base addresse (---> typo here) and length of the pcie controller" ,which does not match the provided example after your patch.
Am Donnerstag, den 07.08.2014, 15:12 -0300 schrieb Fabio Estevam: > On Thu, Aug 7, 2014 at 2:39 PM, Lucas Stach <l.stach@pengutronix.de> wrote: > > Fixes "imx6q-pcie 1ffc000.pcie: missing *config* reg space" > > error exposed by new versions of the designware pcie driver. > > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > > --- > > v2: also fix documentation example > > --- > > Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +++- > > arch/arm/boot/dts/imx6qdl.dtsi | 4 +++- > > 2 files changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > > index 9455fd0ec830..6fbba53a309b 100644 > > --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > > +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > > @@ -17,7 +17,9 @@ Example: > > > > pcie@0x01000000 { > > compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; > > - reg = <0x01ffc000 0x4000>; > > + reg = <0x01ffc000 0x04000>, > > + <0x01f00000 0x80000>; > > + reg-names = "dbi", "config"; > > It would be nice to update the 'reg' description and add the > 'reg-names' entry in the 'Required properties' section. > > Currently we have the following description: > > "reg: base addresse (---> typo here) and length of the pcie > controller" ,which does not match the provided example after your > patch. > I'm a bit on the fence here. Yes, it's a bit inconsistent with the example, but it's actually the same approach chosen for other properties like clocks. Base properties are inherited from designware-pcie.txt and only additional things are documented in fsl,imx6q-pcie.txt. I'm leaning toward not breaking the existing practice. Regards, Lucas
On Fri, Aug 08, 2014 at 10:36:04AM +0200, Lucas Stach wrote: > Am Donnerstag, den 07.08.2014, 15:12 -0300 schrieb Fabio Estevam: > > On Thu, Aug 7, 2014 at 2:39 PM, Lucas Stach <l.stach@pengutronix.de> wrote: > > > Fixes "imx6q-pcie 1ffc000.pcie: missing *config* reg space" > > > error exposed by new versions of the designware pcie driver. > > > > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > > > --- > > > v2: also fix documentation example > > > --- > > > Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +++- > > > arch/arm/boot/dts/imx6qdl.dtsi | 4 +++- > > > 2 files changed, 6 insertions(+), 2 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > > > index 9455fd0ec830..6fbba53a309b 100644 > > > --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > > > +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > > > @@ -17,7 +17,9 @@ Example: > > > > > > pcie@0x01000000 { > > > compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; > > > - reg = <0x01ffc000 0x4000>; > > > + reg = <0x01ffc000 0x04000>, > > > + <0x01f00000 0x80000>; > > > + reg-names = "dbi", "config"; > > > > It would be nice to update the 'reg' description and add the > > 'reg-names' entry in the 'Required properties' section. > > > > Currently we have the following description: > > > > "reg: base addresse (---> typo here) and length of the pcie > > controller" ,which does not match the provided example after your > > patch. > > > I'm a bit on the fence here. Yes, it's a bit inconsistent with the > example, but it's actually the same approach chosen for other properties > like clocks. Base properties are inherited from designware-pcie.txt and > only additional things are documented in fsl,imx6q-pcie.txt. > > I'm leaning toward not breaking the existing practice. +1 Will apply it as a fix once v3.17-rc1 is out. Remind me if I forget. Shawn
On Thu, Aug 07, 2014 at 07:39:41PM +0200, Lucas Stach wrote: > Fixes "imx6q-pcie 1ffc000.pcie: missing *config* reg space" > error exposed by new versions of the designware pcie driver. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Applied, thanks.
diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt index 9455fd0ec830..6fbba53a309b 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt @@ -17,7 +17,9 @@ Example: pcie@0x01000000 { compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; - reg = <0x01ffc000 0x4000>; + reg = <0x01ffc000 0x04000>, + <0x01f00000 0x80000>; + reg-names = "dbi", "config"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index ce0599134a69..6b5da2a98aaf 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -133,7 +133,9 @@ pcie: pcie@0x01000000 { compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; - reg = <0x01ffc000 0x4000>; /* DBI */ + reg = <0x01ffc000 0x04000>, + <0x01f00000 0x80000>; + reg-names = "dbi", "config"; #address-cells = <3>; #size-cells = <2>; device_type = "pci";
Fixes "imx6q-pcie 1ffc000.pcie: missing *config* reg space" error exposed by new versions of the designware pcie driver. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- v2: also fix documentation example --- Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +++- arch/arm/boot/dts/imx6qdl.dtsi | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)