| Message ID | 2525770.ZsLzbliFPH@wasted.cogentembedded.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Simon Horman |
| Headers | show |
On Sat, Sep 12, 2015 at 02:06:09AM +0300, Sergei Shtylyov wrote: > Add Renesas R8A7794 SoC support to the Renesas R-Car gen2 PCI driver. > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Sep 12, 2015 at 02:06:09AM +0300, Sergei Shtylyov wrote: > Add Renesas R8A7794 SoC support to the Renesas R-Car gen2 PCI driver. > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Applied with Simon's ack to for-linus for v4.3, thanks! I applied this for v4.3 instead of v4.4 because this is new hardware and I think the chance of breaking anything is minimal. > --- > The patch is against the 'next' branch of Bjorn Helgaas' 'pci.git' repo. > > Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt | 3 ++- > drivers/pci/host/pci-rcar-gen2.c | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > > Index: pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt > =================================================================== > --- pci.orig/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt > +++ pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt > @@ -7,7 +7,8 @@ OHCI and EHCI controllers. > > Required properties: > - compatible: "renesas,pci-r8a7790" for the R8A7790 SoC; > - "renesas,pci-r8a7791" for the R8A7791 SoC. > + "renesas,pci-r8a7791" for the R8A7791 SoC; > + "renesas,pci-r8a7794" for the R8A7794 SoC. > - reg: A list of physical regions to access the device: the first is > the operational registers for the OHCI/EHCI controllers and the > second is for the bridge configuration and control registers. > Index: pci/drivers/pci/host/pci-rcar-gen2.c > =================================================================== > --- pci.orig/drivers/pci/host/pci-rcar-gen2.c > +++ pci/drivers/pci/host/pci-rcar-gen2.c > @@ -362,6 +362,7 @@ static int rcar_pci_probe(struct platfor > static struct of_device_id rcar_pci_of_match[] = { > { .compatible = "renesas,pci-r8a7790", }, > { .compatible = "renesas,pci-r8a7791", }, > + { .compatible = "renesas,pci-r8a7794", }, > { }, > }; > > > -- > 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-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Sep 24, 2015 at 03:07:21PM -0500, Bjorn Helgaas wrote: > On Sat, Sep 12, 2015 at 02:06:09AM +0300, Sergei Shtylyov wrote: > > Add Renesas R8A7794 SoC support to the Renesas R-Car gen2 PCI driver. > > > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > Applied with Simon's ack to for-linus for v4.3, thanks! > > I applied this for v4.3 instead of v4.4 because this is new hardware > and I think the chance of breaking anything is minimal. Thanks! Your logic for queueing this up for v4.3 sounds entirely reasonable to me. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt =================================================================== --- pci.orig/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt +++ pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt @@ -7,7 +7,8 @@ OHCI and EHCI controllers. Required properties: - compatible: "renesas,pci-r8a7790" for the R8A7790 SoC; - "renesas,pci-r8a7791" for the R8A7791 SoC. + "renesas,pci-r8a7791" for the R8A7791 SoC; + "renesas,pci-r8a7794" for the R8A7794 SoC. - reg: A list of physical regions to access the device: the first is the operational registers for the OHCI/EHCI controllers and the second is for the bridge configuration and control registers. Index: pci/drivers/pci/host/pci-rcar-gen2.c =================================================================== --- pci.orig/drivers/pci/host/pci-rcar-gen2.c +++ pci/drivers/pci/host/pci-rcar-gen2.c @@ -362,6 +362,7 @@ static int rcar_pci_probe(struct platfor static struct of_device_id rcar_pci_of_match[] = { { .compatible = "renesas,pci-r8a7790", }, { .compatible = "renesas,pci-r8a7791", }, + { .compatible = "renesas,pci-r8a7794", }, { }, };
Add Renesas R8A7794 SoC support to the Renesas R-Car gen2 PCI driver. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- The patch is against the 'next' branch of Bjorn Helgaas' 'pci.git' repo. Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt | 3 ++- drivers/pci/host/pci-rcar-gen2.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html