diff for duplicates of <20151124234319.GG17377@localhost> diff --git a/a/1.txt b/N1/1.txt index 4a8c7f6..ee4c9e3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,7 +29,7 @@ Bjorn > gpio,syscon-dev = <&devctrl 0x240>; > }; > -> + pcie1_phy: pciephy@2326000 { +> + pcie1_phy: pciephy at 2326000 { > + #phy-cells = <0>; > + compatible = "ti,keystone-serdes-pcie"; > + reg = <0x02326000 0x4000>; @@ -39,7 +39,7 @@ Bjorn > + status = "disabled"; > + }; > + -> pcie1: pcie@21020000 { +> pcie1: pcie at 21020000 { > compatible = "ti,keystone-pcie","snps,dw-pcie"; > clocks = <&clkpcie1>; > @@ -130,6 +140,17 @@ @@ -51,7 +51,7 @@ Bjorn > + serdeses { > + #address-cells = <1>; > + #size-cells = <0>; -> + serdes@0 { +> + serdes at 0 { > + reg = <0>; > + phys = <&pcie1_phy>; > + }; @@ -59,7 +59,7 @@ Bjorn > + > }; > -> mdio: mdio@24200f00 { +> mdio: mdio at 24200f00 { > diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi > index 72816d6..6566cc4 100644 > --- a/arch/arm/boot/dts/keystone.dtsi @@ -68,7 +68,7 @@ Bjorn > ti,syscon-dev = <&devctrl 0x2a0>; > }; > -> + pcie0_phy: pciephy@2320000 { +> + pcie0_phy: pciephy at 2320000 { > + #phy-cells = <0>; > + compatible = "ti,keystone-serdes-pcie"; > + reg = <0x02320000 0x4000>; @@ -78,7 +78,7 @@ Bjorn > + status = "disabled"; > + }; > + -> pcie0: pcie@21800000 { +> pcie0: pcie at 21800000 { > compatible = "ti,keystone-pcie", "snps,dw-pcie"; > clocks = <&clkpcie>; > @@ -319,6 +329,17 @@ @@ -90,7 +90,7 @@ Bjorn > + serdeses { > + #address-cells = <1>; > + #size-cells = <0>; -> + serdes@0 { +> + serdes at 0 { > + reg = <0>; > + phys = <&pcie0_phy>; > + }; @@ -104,5 +104,5 @@ Bjorn > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index b09f7a5..59c96b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,8 @@ "ref\01444919230-30932-1-git-send-email-w-kwok2@ti.com\0" - "From\0Bjorn Helgaas <helgaas@kernel.org>\0" - "Subject\0Re: [PATCH] ARM: keystone: dts: add PCI serdes driver bindings\0" + "From\0helgaas@kernel.org (Bjorn Helgaas)\0" + "Subject\0[PATCH] ARM: keystone: dts: add PCI serdes driver bindings\0" "Date\0Tue, 24 Nov 2015 17:43:19 -0600\0" - "To\0WingMan Kwok <w-kwok2@ti.com>\0" - "Cc\0robh+dt@kernel.org" - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - kishon@ti.com - rogerq@ti.com - m-karicheri2@ti.com - bhelgaas@google.com - ssantosh@kernel.org - linux@arm.linux.org.uk - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-pci@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi WingMan, \n" @@ -51,7 +36,7 @@ "> \t\t\tgpio,syscon-dev = <&devctrl 0x240>;\n" "> \t\t};\n" "> \n" - "> +\t\tpcie1_phy: pciephy@2326000 {\n" + "> +\t\tpcie1_phy: pciephy at 2326000 {\n" "> +\t\t\t#phy-cells = <0>;\n" "> +\t\t\tcompatible = \"ti,keystone-serdes-pcie\";\n" "> +\t\t\treg = <0x02326000 0x4000>;\n" @@ -61,7 +46,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tpcie1: pcie@21020000 {\n" + "> \t\tpcie1: pcie at 21020000 {\n" "> \t\t\tcompatible = \"ti,keystone-pcie\",\"snps,dw-pcie\";\n" "> \t\t\tclocks = <&clkpcie1>;\n" "> @@ -130,6 +140,17 @@\n" @@ -73,7 +58,7 @@ "> +\t\t\tserdeses {\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tserdes@0 {\n" + "> +\t\t\t\tserdes at 0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tphys = <&pcie1_phy>;\n" "> +\t\t\t\t};\n" @@ -81,7 +66,7 @@ "> +\n" "> \t\t};\n" "> \n" - "> \t\tmdio: mdio@24200f00 {\n" + "> \t\tmdio: mdio at 24200f00 {\n" "> diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi\n" "> index 72816d6..6566cc4 100644\n" "> --- a/arch/arm/boot/dts/keystone.dtsi\n" @@ -90,7 +75,7 @@ "> \t\t\tti,syscon-dev = <&devctrl 0x2a0>;\n" "> \t\t};\n" "> \n" - "> +\t\tpcie0_phy: pciephy@2320000 {\n" + "> +\t\tpcie0_phy: pciephy at 2320000 {\n" "> +\t\t\t#phy-cells = <0>;\n" "> +\t\t\tcompatible = \"ti,keystone-serdes-pcie\";\n" "> +\t\t\treg = <0x02320000 0x4000>;\n" @@ -100,7 +85,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tpcie0: pcie@21800000 {\n" + "> \t\tpcie0: pcie at 21800000 {\n" "> \t\t\tcompatible = \"ti,keystone-pcie\", \"snps,dw-pcie\";\n" "> \t\t\tclocks = <&clkpcie>;\n" "> @@ -319,6 +329,17 @@\n" @@ -112,7 +97,7 @@ "> +\t\t\tserdeses {\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" - "> +\t\t\t\tserdes@0 {\n" + "> +\t\t\t\tserdes at 0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tphys = <&pcie0_phy>;\n" "> +\t\t\t\t};\n" @@ -126,7 +111,7 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-pci\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -99164f210dfb0fc64c93c5310040bb378b291ad69fcac976833d9e387482a8a9 +906924b26a59f1b22273cb27f4d5ecc09fba73422f65af852db83d599da04a4c
diff --git a/a/1.txt b/N2/1.txt index 4a8c7f6..186bad7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,7 +8,7 @@ On Thu, Oct 15, 2015 at 10:27:10AM -0400, WingMan Kwok wrote: > This patch depends on the updates to the Keystone PCIe host driver > and common serdes driver patch series that is submitted separately. > -> Signed-off-by: WingMan Kwok <w-kwok2@ti.com> +> Signed-off-by: WingMan Kwok <w-kwok2-l0cyMroinI0@public.gmane.org> Is there a reason to separate the binding update from the PCIe host driver update? It would make sense to me to have them in the same @@ -104,5 +104,9 @@ Bjorn > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index b09f7a5..6e4bf92 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,23 +1,24 @@ "ref\01444919230-30932-1-git-send-email-w-kwok2@ti.com\0" - "From\0Bjorn Helgaas <helgaas@kernel.org>\0" + "ref\01444919230-30932-1-git-send-email-w-kwok2-l0cyMroinI0@public.gmane.org\0" + "From\0Bjorn Helgaas <helgaas-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH] ARM: keystone: dts: add PCI serdes driver bindings\0" "Date\0Tue, 24 Nov 2015 17:43:19 -0600\0" - "To\0WingMan Kwok <w-kwok2@ti.com>\0" - "Cc\0robh+dt@kernel.org" - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - kishon@ti.com - rogerq@ti.com - m-karicheri2@ti.com - bhelgaas@google.com - ssantosh@kernel.org - linux@arm.linux.org.uk - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-pci@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0WingMan Kwok <w-kwok2-l0cyMroinI0@public.gmane.org>\0" + "Cc\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + pawel.moll-5wv7dgnIgG8@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + kishon-l0cyMroinI0@public.gmane.org + rogerq-l0cyMroinI0@public.gmane.org + m-karicheri2-l0cyMroinI0@public.gmane.org + bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org + ssantosh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "Hi WingMan, \n" @@ -30,7 +31,7 @@ "> This patch depends on the updates to the Keystone PCIe host driver\n" "> and common serdes driver patch series that is submitted separately.\n" "> \n" - "> Signed-off-by: WingMan Kwok <w-kwok2@ti.com>\n" + "> Signed-off-by: WingMan Kwok <w-kwok2-l0cyMroinI0@public.gmane.org>\n" "\n" "Is there a reason to separate the binding update from the PCIe host\n" "driver update? It would make sense to me to have them in the same\n" @@ -126,7 +127,11 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-pci\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" - > More majordomo info at http://vger.kernel.org/majordomo-info.html + "> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -99164f210dfb0fc64c93c5310040bb378b291ad69fcac976833d9e387482a8a9 +a4cff9a0ace1d94e0d4bb458ab090a11bb4bb1e321324b0f58718eede8b8b169
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.