diff for duplicates of <50EF5537.6080602@wwwdotorg.org> diff --git a/a/content_digest b/N1/content_digest index dd54e22..43664ee 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,23 @@ "ref\01357764194-12677-1-git-send-email-thierry.reding@avionic-design.de\0" "ref\01357764194-12677-15-git-send-email-thierry.reding@avionic-design.de\0" - "From\0Stephen Warren <swarren@wwwdotorg.org>\0" + "ref\01357764194-12677-15-git-send-email-thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org\0" + "From\0Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>\0" "Subject\0Re: [PATCH 14/14] ARM: tegra: trimslice: Initialize PCIe from DT\0" "Date\0Thu, 10 Jan 2013 16:56:39 -0700\0" - "To\0Thierry Reding <thierry.reding@avionic-design.de>\0" - "Cc\0linux-tegra@vger.kernel.org" - Grant Likely <grant.likely@secretlab.ca> - Rob Herring <rob.herring@calxeda.com> - Russell King <linux@arm.linux.org.uk> - Bjorn Helgaas <bhelgaas@google.com> - Andrew Murray <andrew.murray@arm.com> - Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - Arnd Bergmann <arnd@arndb.de> - Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - devicetree-discuss@lists.ozlabs.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-pci@vger.kernel.org\0" + "To\0Thierry Reding <thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org>\0" + "Cc\0linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> + Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> + Andrew Murray <andrew.murray-5wv7dgnIgG8@public.gmane.org> + Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> + Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> + Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 01/09/2013 01:43 PM, Thierry Reding wrote:\n" @@ -104,4 +105,4 @@ "\n" With plain next-20130109, the device enumeration succeeds. -d8a23e8f66f90bdaea034270ccf61a51af59afce4a7dacd28e85490e6c7aac2d +b3d7ea53e04bfeb834690d6b42fe094b4bb5b9dc6f3cafc94f86679446f92ed5
diff --git a/a/1.txt b/N2/1.txt index 455d556..8a7c661 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -20,12 +20,12 @@ fixup for you to squash in, but also see beyond that for a problem. > + pex-clk-supply = <&pci_clk_reg>; > + vdd-supply = <&pci_vdd_reg>; > -> - pci@0 { +> - pci at 0 { > - status = "okay"; > - }; > - -> - pci@1 { -> + pci@1,0 { +> - pci at 1 { +> + pci at 1,0 { > status = "okay"; > }; > }; @@ -34,7 +34,7 @@ fixup for you to squash in, but also see beyond that for a problem. > regulator-always-on; > }; > + -> + pci_clk_reg: regulator@2 { +> + pci_clk_reg: regulator at 2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "pci_clk"; @@ -43,7 +43,7 @@ fixup for you to squash in, but also see beyond that for a problem. > + regulator-always-on; > + }; > + -> + pci_vdd_reg: regulator@3 { +> + pci_vdd_reg: regulator at 3 { > + compatible = "regulator-fixed"; > + reg = <3>; > + regulator-name = "pci_vdd"; diff --git a/a/content_digest b/N2/content_digest index dd54e22..358d6c3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,9 @@ "ref\01357764194-12677-1-git-send-email-thierry.reding@avionic-design.de\0" "ref\01357764194-12677-15-git-send-email-thierry.reding@avionic-design.de\0" - "From\0Stephen Warren <swarren@wwwdotorg.org>\0" - "Subject\0Re: [PATCH 14/14] ARM: tegra: trimslice: Initialize PCIe from DT\0" + "From\0swarren@wwwdotorg.org (Stephen Warren)\0" + "Subject\0[PATCH 14/14] ARM: tegra: trimslice: Initialize PCIe from DT\0" "Date\0Thu, 10 Jan 2013 16:56:39 -0700\0" - "To\0Thierry Reding <thierry.reding@avionic-design.de>\0" - "Cc\0linux-tegra@vger.kernel.org" - Grant Likely <grant.likely@secretlab.ca> - Rob Herring <rob.herring@calxeda.com> - Russell King <linux@arm.linux.org.uk> - Bjorn Helgaas <bhelgaas@google.com> - Andrew Murray <andrew.murray@arm.com> - Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - Arnd Bergmann <arnd@arndb.de> - Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - devicetree-discuss@lists.ozlabs.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-pci@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 01/09/2013 01:43 PM, Thierry Reding wrote:\n" @@ -41,12 +28,12 @@ "> +\t\tpex-clk-supply = <&pci_clk_reg>;\n" "> +\t\tvdd-supply = <&pci_vdd_reg>;\n" "> \n" - "> -\t\tpci@0 {\n" + "> -\t\tpci at 0 {\n" "> -\t\t\tstatus = \"okay\";\n" "> -\t\t};\n" "> -\n" - "> -\t\tpci@1 {\n" - "> +\t\tpci@1,0 {\n" + "> -\t\tpci at 1 {\n" + "> +\t\tpci at 1,0 {\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" "> \t};\n" @@ -55,7 +42,7 @@ "> \t\t\tregulator-always-on;\n" "> \t\t};\n" "> +\n" - "> +\t\tpci_clk_reg: regulator@2 {\n" + "> +\t\tpci_clk_reg: regulator at 2 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\treg = <2>;\n" "> +\t\t\tregulator-name = \"pci_clk\";\n" @@ -64,7 +51,7 @@ "> +\t\t\tregulator-always-on;\n" "> +\t\t};\n" "> +\n" - "> +\t\tpci_vdd_reg: regulator@3 {\n" + "> +\t\tpci_vdd_reg: regulator at 3 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\treg = <3>;\n" "> +\t\t\tregulator-name = \"pci_vdd\";\n" @@ -104,4 +91,4 @@ "\n" With plain next-20130109, the device enumeration succeeds. -d8a23e8f66f90bdaea034270ccf61a51af59afce4a7dacd28e85490e6c7aac2d +c805a497f5a6c60494a36c23f35638e8919fa590e42bdebcf1ae33b6cd589fcc
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.