diff for duplicates of <20140425174535.GF32246@google.com> diff --git a/a/1.txt b/N1/1.txt index 54b2271..fbfdf52 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,8 +33,7 @@ I'm OK with this, but it needs an ack from Simon. > 2 files changed, 84 insertions(+), 2 deletions(-) > > Index: pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt -> =================================================================== -> --- /dev/null +> =================================> --- /dev/null > +++ pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt > @@ -0,0 +1,54 @@ > +Renesas AHB to PCI bridge @@ -92,8 +91,7 @@ I'm OK with this, but it needs an ack from Simon. > + pinctrl-names = "default"; > +}; > Index: pci/drivers/pci/host/pci-rcar-gen2.c -> =================================================================== -> --- pci.orig/drivers/pci/host/pci-rcar-gen2.c +> =================================> --- pci.orig/drivers/pci/host/pci-rcar-gen2.c > +++ pci/drivers/pci/host/pci-rcar-gen2.c > @@ -16,6 +16,7 @@ > #include <linux/kernel.h> diff --git a/a/content_digest b/N1/content_digest index 4aa3f5f..cc41f34 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,8 @@ "ref\0201404080141.21605.sergei.shtylyov@cogentembedded.com\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [PATCH] pci-rcar-gen2: add device tree support\0" - "Date\0Fri, 25 Apr 2014 11:45:35 -0600\0" - "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Cc\0horms@verge.net.au" - devicetree@vger.kernel.org - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - linux-pci@vger.kernel.org - linux-sh@vger.kernel.org - magnus.damm@gmail.com - linux@arm.linux.org.uk - linux-arm-kernel@lists.infradead.org - ben.dooks@codethink.co.uk - linux-doc@vger.kernel.org - rob@landley.net - " grant.likely@linaro.org\0" + "Date\0Fri, 25 Apr 2014 17:45:35 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, Apr 08, 2014 at 01:41:20AM +0400, Sergei Shtylyov wrote:\n" @@ -56,8 +40,7 @@ "> 2 files changed, 84 insertions(+), 2 deletions(-)\n" "> \n" "> Index: pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt\n" - "> ===================================================================\n" - "> --- /dev/null\n" + "> =================================> --- /dev/null\n" "> +++ pci/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt\n" "> @@ -0,0 +1,54 @@\n" "> +Renesas AHB to PCI bridge\n" @@ -115,8 +98,7 @@ "> +\tpinctrl-names = \"default\";\n" "> +};\n" "> Index: pci/drivers/pci/host/pci-rcar-gen2.c\n" - "> ===================================================================\n" - "> --- pci.orig/drivers/pci/host/pci-rcar-gen2.c\n" + "> =================================> --- pci.orig/drivers/pci/host/pci-rcar-gen2.c\n" "> +++ pci/drivers/pci/host/pci-rcar-gen2.c\n" "> @@ -16,6 +16,7 @@\n" "> #include <linux/kernel.h>\n" @@ -191,4 +173,4 @@ "> \t.probe = rcar_pci_probe,\n" > }; -b059aad21c752c0ce6be24e7d15c68ddea8bdfbf72b93538b39b202b64ac427d +d0e1aab821603695581732ae720576ec40de95814dd3a0b0917e26dc5da6f3cc
diff --git a/a/1.txt b/N2/1.txt index 54b2271..6d1ce58 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -57,7 +57,7 @@ I'm OK with this, but it needs an ack from Simon. > + > +Example SoC configuration: > + -> + pci0: pci@ee090000 { +> + pci0: pci at ee090000 { > + compatible = "renesas,pci-r8a7790"; > + clocks = <&mstp7_clks R8A7790_CLK_EHCI>; > + reg = <0x0 0xee090000 0x0 0xc00>, @@ -69,14 +69,14 @@ I'm OK with this, but it needs an ack from Simon. > + #address-cells = <3>; > + #size-cells = <2>; > + -> + pci@0,1 { +> + pci at 0,1 { > + reg = <0x800 0 0 0 0>; > + device_type = "pci"; > + phys = <&usbphy 0 0>; > + phy-names = "usb"; > + }; > + -> + pci@0,2 { +> + pci at 0,2 { > + reg = <0x1000 0 0 0 0>; > + device_type = "pci"; > + phys = <&usbphy 0 0>; diff --git a/a/content_digest b/N2/content_digest index 4aa3f5f..29a2ee5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,8 @@ "ref\0201404080141.21605.sergei.shtylyov@cogentembedded.com\0" - "From\0Bjorn Helgaas <bhelgaas@google.com>\0" - "Subject\0Re: [PATCH] pci-rcar-gen2: add device tree support\0" + "From\0bhelgaas@google.com (Bjorn Helgaas)\0" + "Subject\0[PATCH] pci-rcar-gen2: add device tree support\0" "Date\0Fri, 25 Apr 2014 11:45:35 -0600\0" - "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Cc\0horms@verge.net.au" - devicetree@vger.kernel.org - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - linux-pci@vger.kernel.org - linux-sh@vger.kernel.org - magnus.damm@gmail.com - linux@arm.linux.org.uk - linux-arm-kernel@lists.infradead.org - ben.dooks@codethink.co.uk - linux-doc@vger.kernel.org - rob@landley.net - " grant.likely@linaro.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, Apr 08, 2014 at 01:41:20AM +0400, Sergei Shtylyov wrote:\n" @@ -80,7 +64,7 @@ "> +\n" "> +Example SoC configuration:\n" "> +\n" - "> +\tpci0: pci@ee090000 {\n" + "> +\tpci0: pci at ee090000 {\n" "> +\t\tcompatible = \"renesas,pci-r8a7790\";\n" "> +\t\tclocks = <&mstp7_clks R8A7790_CLK_EHCI>;\n" "> +\t\treg = <0x0 0xee090000 0x0 0xc00>,\n" @@ -92,14 +76,14 @@ "> +\t\t#address-cells = <3>;\n" "> +\t\t#size-cells = <2>;\n" "> +\n" - "> +\t\tpci@0,1 {\n" + "> +\t\tpci at 0,1 {\n" "> +\t\t\treg = <0x800 0 0 0 0>;\n" "> +\t\t\tdevice_type = \"pci\";\n" "> +\t\t\tphys = <&usbphy 0 0>;\n" "> +\t\t\tphy-names = \"usb\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tpci@0,2 {\n" + "> +\t\tpci at 0,2 {\n" "> +\t\t\treg = <0x1000 0 0 0 0>;\n" "> +\t\t\tdevice_type = \"pci\";\n" "> +\t\t\tphys = <&usbphy 0 0>;\n" @@ -191,4 +175,4 @@ "> \t.probe = rcar_pci_probe,\n" > }; -b059aad21c752c0ce6be24e7d15c68ddea8bdfbf72b93538b39b202b64ac427d +2f26886d4f69c26e9b11902684b667236f6762f7b2f898d95a2e73af7f329bd6
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.