| Message ID | 1449096700-23304-4-git-send-email-horms+renesas@verge.net.au |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Dec 03, 2015 at 07:51:39AM +0900, Simon Horman wrote: > Add fallback compatibility string for R-Car Gen 2 family. > This is in keeping with the fallback scheme being adopted wherever > appropriate for drivers for Renesas SoCs. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Rob Herring <robh@kernel.org> > > --- > v2 > * Include "rcar-" in new compatibility string > --- > Documentation/devicetree/bindings/pci/rcar-pci.txt | 13 ++++++++++--- > drivers/pci/host/pcie-rcar.c | 1 + > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/rcar-pci.txt b/Documentation/devicetree/bindings/pci/rcar-pci.txt > index 29d3b989d3b0..6b4d2f798386 100644 > --- a/Documentation/devicetree/bindings/pci/rcar-pci.txt > +++ b/Documentation/devicetree/bindings/pci/rcar-pci.txt > @@ -1,8 +1,15 @@ > * Renesas RCar PCIe interface > > Required properties: > -- compatible: should contain one of the following > - "renesas,pcie-r8a7779", "renesas,pcie-r8a7790", "renesas,pcie-r8a7791" > +compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; > + "renesas,pcie-r8a7790" for the R8A7790 SoC; > + "renesas,pcie-r8a7791" for the R8A7791 SoC; > + "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device. > + > + When compatible with the generic version, nodes must list the > + SoC-specific version corresponding to the platform first > + followed by the generic version. > + > - reg: base address and length of the pcie controller registers. > - #address-cells: set to <3> > - #size-cells: set to <2> > @@ -25,7 +32,7 @@ Example: > SoC specific DT Entry: > > pcie: pcie@fe000000 { > - compatible = "renesas,pcie-r8a7791"; > + compatible = "renesas,pcie-r8a7791", "renesas,pcie-rcar-gen2"; > reg = <0 0xfe000000 0 0x80000>; > #address-cells = <3>; > #size-cells = <2>; > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index f4fa6c537448..047279bdc3fe 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -917,6 +917,7 @@ static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie, > > static const struct of_device_id rcar_pcie_of_match[] = { > { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 }, > + { .compatible = "renesas,pcie-rcar-gen2", .data = rcar_pcie_hw_init }, > { .compatible = "renesas,pcie-r8a7790", .data = rcar_pcie_hw_init }, > { .compatible = "renesas,pcie-r8a7791", .data = rcar_pcie_hw_init }, > {}, > -- > 2.1.4 > > -- > 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 linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Dec 03, 2015 at 07:51:39AM +0900, Simon Horman wrote: > Add fallback compatibility string for R-Car Gen 2 family. > This is in keeping with the fallback scheme being adopted wherever > appropriate for drivers for Renesas SoCs. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > v2 > * Include "rcar-" in new compatibility string > --- > Documentation/devicetree/bindings/pci/rcar-pci.txt | 13 ++++++++++--- > drivers/pci/host/pcie-rcar.c | 1 + > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/pci/rcar-pci.txt b/Documentation/devicetree/bindings/pci/rcar-pci.txt > index 29d3b989d3b0..6b4d2f798386 100644 > --- a/Documentation/devicetree/bindings/pci/rcar-pci.txt > +++ b/Documentation/devicetree/bindings/pci/rcar-pci.txt > @@ -1,8 +1,15 @@ > * Renesas RCar PCIe interface > > Required properties: > -- compatible: should contain one of the following > - "renesas,pcie-r8a7779", "renesas,pcie-r8a7790", "renesas,pcie-r8a7791" > +compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; > + "renesas,pcie-r8a7790" for the R8A7790 SoC; > + "renesas,pcie-r8a7791" for the R8A7791 SoC; > + "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device. > + > + When compatible with the generic version, nodes must list the > + SoC-specific version corresponding to the platform first > + followed by the generic version. > + > - reg: base address and length of the pcie controller registers. > - #address-cells: set to <3> > - #size-cells: set to <2> > @@ -25,7 +32,7 @@ Example: > SoC specific DT Entry: > > pcie: pcie@fe000000 { > - compatible = "renesas,pcie-r8a7791"; > + compatible = "renesas,pcie-r8a7791", "renesas,pcie-rcar-gen2"; > reg = <0 0xfe000000 0 0x80000>; > #address-cells = <3>; > #size-cells = <2>; > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index f4fa6c537448..047279bdc3fe 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -917,6 +917,7 @@ static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie, > > static const struct of_device_id rcar_pcie_of_match[] = { > { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 }, > + { .compatible = "renesas,pcie-rcar-gen2", .data = rcar_pcie_hw_init }, > { .compatible = "renesas,pcie-r8a7790", .data = rcar_pcie_hw_init }, > { .compatible = "renesas,pcie-r8a7791", .data = rcar_pcie_hw_init }, > {}, > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" 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 linux-pci" 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/rcar-pci.txt b/Documentation/devicetree/bindings/pci/rcar-pci.txt index 29d3b989d3b0..6b4d2f798386 100644 --- a/Documentation/devicetree/bindings/pci/rcar-pci.txt +++ b/Documentation/devicetree/bindings/pci/rcar-pci.txt @@ -1,8 +1,15 @@ * Renesas RCar PCIe interface Required properties: -- compatible: should contain one of the following - "renesas,pcie-r8a7779", "renesas,pcie-r8a7790", "renesas,pcie-r8a7791" +compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; + "renesas,pcie-r8a7790" for the R8A7790 SoC; + "renesas,pcie-r8a7791" for the R8A7791 SoC; + "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device. + + When compatible with the generic version, nodes must list the + SoC-specific version corresponding to the platform first + followed by the generic version. + - reg: base address and length of the pcie controller registers. - #address-cells: set to <3> - #size-cells: set to <2> @@ -25,7 +32,7 @@ Example: SoC specific DT Entry: pcie: pcie@fe000000 { - compatible = "renesas,pcie-r8a7791"; + compatible = "renesas,pcie-r8a7791", "renesas,pcie-rcar-gen2"; reg = <0 0xfe000000 0 0x80000>; #address-cells = <3>; #size-cells = <2>; diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index f4fa6c537448..047279bdc3fe 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -917,6 +917,7 @@ static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie, static const struct of_device_id rcar_pcie_of_match[] = { { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 }, + { .compatible = "renesas,pcie-rcar-gen2", .data = rcar_pcie_hw_init }, { .compatible = "renesas,pcie-r8a7790", .data = rcar_pcie_hw_init }, { .compatible = "renesas,pcie-r8a7791", .data = rcar_pcie_hw_init }, {},
Add fallback compatibility string for R-Car Gen 2 family. This is in keeping with the fallback scheme being adopted wherever appropriate for drivers for Renesas SoCs. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- v2 * Include "rcar-" in new compatibility string --- Documentation/devicetree/bindings/pci/rcar-pci.txt | 13 ++++++++++--- drivers/pci/host/pcie-rcar.c | 1 + 2 files changed, 11 insertions(+), 3 deletions(-)