diff for duplicates of <20150825002257.GA19120@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 170e2ea..d93d3b3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,7 @@ Good catch! > > chosen { > @@ -93,5 +103,24 @@ -> sata at 29000000 { +> sata@29000000 { > status = "ok"; > }; > + @@ -33,12 +33,12 @@ This node should be at the root level, not inside the soc node. > + pinctrl-0 = <&mdio0_pins>; > + pinctrl-names = "default"; > + -> + phy0: ethernet-phy at 0 { +> + phy0: ethernet-phy@0 { > + device_type = "ethernet-phy"; > + reg = <0>; > + }; > + -> + phy4: ethernet-phy at 4 { +> + phy4: ethernet-phy@4 { > + device_type = "ethernet-phy"; > + reg = <4>; > + }; @@ -49,3 +49,7 @@ This node should be at the root level, not inside the soc node. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project +-- +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/N1/content_digest index 73da023..2694d9a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,19 @@ "ref\01440006802-2415-1-git-send-email-mathieu@codeaurora.org\0" - "From\0sboyd@codeaurora.org (Stephen Boyd)\0" - "Subject\0[PATCH 1/2] ARM: qcom: add mdio bus on IPQ806x/AP148\0" + "ref\01440006802-2415-1-git-send-email-mathieu-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org\0" + "From\0Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" + "Subject\0Re: [PATCH 1/2] ARM: qcom: add mdio bus on IPQ806x/AP148\0" "Date\0Mon, 24 Aug 2015 17:22:57 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Mathieu Olivari <mathieu-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" + "Cc\0agross-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org" + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + robh+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 + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 08/19, Mathieu Olivari wrote:\n" @@ -25,7 +36,7 @@ "> \n" "> \tchosen {\n" "> @@ -93,5 +103,24 @@\n" - "> \t\tsata at 29000000 {\n" + "> \t\tsata@29000000 {\n" "> \t\t\tstatus = \"ok\";\n" "> \t\t};\n" "> +\n" @@ -40,12 +51,12 @@ "> +\t\t\tpinctrl-0 = <&mdio0_pins>;\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\n" - "> +\t\t\tphy0: ethernet-phy at 0 {\n" + "> +\t\t\tphy0: ethernet-phy@0 {\n" "> +\t\t\t\tdevice_type = \"ethernet-phy\";\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tphy4: ethernet-phy at 4 {\n" + "> +\t\t\tphy4: ethernet-phy@4 {\n" "> +\t\t\t\tdevice_type = \"ethernet-phy\";\n" "> +\t\t\t\treg = <4>;\n" "> +\t\t\t};\n" @@ -55,6 +66,10 @@ "\n" "-- \n" "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" - a Linux Foundation Collaborative Project + "a Linux Foundation Collaborative Project\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 -dff60c385e9770dc24d100257e9203cbafffe71c10df1db40545c984149c6c8d +f0be070a1766613d9a697f0dab0e21c3de365f0648f59a929015efa6d55b9c63
diff --git a/a/1.txt b/N2/1.txt index 170e2ea..210cdfa 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -18,7 +18,7 @@ Good catch! > > chosen { > @@ -93,5 +103,24 @@ -> sata at 29000000 { +> sata@29000000 { > status = "ok"; > }; > + @@ -33,12 +33,12 @@ This node should be at the root level, not inside the soc node. > + pinctrl-0 = <&mdio0_pins>; > + pinctrl-names = "default"; > + -> + phy0: ethernet-phy at 0 { +> + phy0: ethernet-phy@0 { > + device_type = "ethernet-phy"; > + reg = <0>; > + }; > + -> + phy4: ethernet-phy at 4 { +> + phy4: ethernet-phy@4 { > + device_type = "ethernet-phy"; > + reg = <4>; > + }; diff --git a/a/content_digest b/N2/content_digest index 73da023..a68fb18 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\01440006802-2415-1-git-send-email-mathieu@codeaurora.org\0" - "From\0sboyd@codeaurora.org (Stephen Boyd)\0" - "Subject\0[PATCH 1/2] ARM: qcom: add mdio bus on IPQ806x/AP148\0" + "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "Subject\0Re: [PATCH 1/2] ARM: qcom: add mdio bus on IPQ806x/AP148\0" "Date\0Mon, 24 Aug 2015 17:22:57 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Mathieu Olivari <mathieu@codeaurora.org>\0" + "Cc\0agross@codeaurora.org" + galak@codeaurora.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + linux@arm.linux.org.uk + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 08/19, Mathieu Olivari wrote:\n" @@ -25,7 +35,7 @@ "> \n" "> \tchosen {\n" "> @@ -93,5 +103,24 @@\n" - "> \t\tsata at 29000000 {\n" + "> \t\tsata@29000000 {\n" "> \t\t\tstatus = \"ok\";\n" "> \t\t};\n" "> +\n" @@ -40,12 +50,12 @@ "> +\t\t\tpinctrl-0 = <&mdio0_pins>;\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\n" - "> +\t\t\tphy0: ethernet-phy at 0 {\n" + "> +\t\t\tphy0: ethernet-phy@0 {\n" "> +\t\t\t\tdevice_type = \"ethernet-phy\";\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tphy4: ethernet-phy at 4 {\n" + "> +\t\t\tphy4: ethernet-phy@4 {\n" "> +\t\t\t\tdevice_type = \"ethernet-phy\";\n" "> +\t\t\t\treg = <4>;\n" "> +\t\t\t};\n" @@ -57,4 +67,4 @@ "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" a Linux Foundation Collaborative Project -dff60c385e9770dc24d100257e9203cbafffe71c10df1db40545c984149c6c8d +d8cf3df60870081eb286dc1079ab8e32ddb7b141c8062592cb8584219e43111a
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.