diff for duplicates of <1440006802-2415-2-git-send-email-mathieu@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index efd1d87..370d7c8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ This change adds GMAC nodes to IPQ806x platforms, both to the dtsi and to the AP148 dts. This will provide ethernet connectivity to the device. -Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> +Signed-off-by: Mathieu Olivari <mathieu-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> --- arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 33 ++++++++++++ arch/arm/boot/dts/qcom-ipq8064.dtsi | 86 ++++++++++++++++++++++++++++++++ @@ -29,13 +29,13 @@ index d73df24..0958fa3 100644 + }; }; - sata-phy at 1b400000 { + sata-phy@1b400000 { @@ -122,5 +134,26 @@ reg = <4>; }; }; + -+ gmac1: ethernet at 37200000 { ++ gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + phy-handle = <&phy4>; @@ -45,7 +45,7 @@ index d73df24..0958fa3 100644 + pinctrl-names = "default"; + }; + -+ gmac2: ethernet at 37400000 { ++ gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; @@ -66,17 +66,17 @@ index 2f270d7..6706a56 100644 reg = <0x01200600 0x100>; }; + -+ nss_common: syscon at 03000000 { ++ nss_common: syscon@03000000 { + compatible = "syscon"; + reg = <0x03000000 0x0000FFFF>; + }; + -+ qsgmii_csr: syscon at 1bb00000 { ++ qsgmii_csr: syscon@1bb00000 { + compatible = "syscon"; + reg = <0x1bb00000 0x000001FF>; + }; + -+ gmac0: ethernet at 37000000 { ++ gmac0: ethernet@37000000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37000000 0x200000>; @@ -95,7 +95,7 @@ index 2f270d7..6706a56 100644 + status = "disabled"; + }; + -+ gmac1: ethernet at 37200000 { ++ gmac1: ethernet@37200000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37200000 0x200000>; @@ -114,7 +114,7 @@ index 2f270d7..6706a56 100644 + status = "disabled"; + }; + -+ gmac2: ethernet at 37400000 { ++ gmac2: ethernet@37400000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37400000 0x200000>; @@ -133,7 +133,7 @@ index 2f270d7..6706a56 100644 + status = "disabled"; + }; + -+ gmac3: ethernet at 37600000 { ++ gmac3: ethernet@37600000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37600000 0x200000>; @@ -156,3 +156,8 @@ index 2f270d7..6706a56 100644 sfpb_mutex: sfpb-mutex { -- 2.1.4 + +-- +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 a06c5a7..b0b8034 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,26 @@ "ref\01440006802-2415-1-git-send-email-mathieu@codeaurora.org\0" - "From\0mathieu@codeaurora.org (Mathieu Olivari)\0" + "ref\01440006802-2415-1-git-send-email-mathieu-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org\0" + "From\0Mathieu Olivari <mathieu-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" "Subject\0[PATCH 2/2] ARM: qcom: add GMAC nodes to IPQ806x platforms\0" "Date\0Wed, 19 Aug 2015 10:53:22 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0agross-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org" + sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + " galak-sgV2jX0FEOL9JmXXK+q4OQ@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 + 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 + " Mathieu Olivari <mathieu-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" "\00:1\0" "b\0" "This change adds GMAC nodes to IPQ806x platforms, both to the dtsi and\n" "to the AP148 dts. This will provide ethernet connectivity to the device.\n" "\n" - "Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>\n" + "Signed-off-by: Mathieu Olivari <mathieu-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 33 ++++++++++++\n" " arch/arm/boot/dts/qcom-ipq8064.dtsi | 86 ++++++++++++++++++++++++++++++++\n" @@ -36,13 +48,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\tsata-phy at 1b400000 {\n" + " \t\tsata-phy@1b400000 {\n" "@@ -122,5 +134,26 @@\n" " \t\t\t\treg = <4>;\n" " \t\t\t};\n" " \t\t};\n" "+\n" - "+\t\tgmac1: ethernet at 37200000 {\n" + "+\t\tgmac1: ethernet@37200000 {\n" "+\t\t\tstatus = \"ok\";\n" "+\t\t\tphy-mode = \"rgmii\";\n" "+\t\t\tphy-handle = <&phy4>;\n" @@ -52,7 +64,7 @@ "+\t\t\tpinctrl-names = \"default\";\n" "+\t\t};\n" "+\n" - "+\t\tgmac2: ethernet at 37400000 {\n" + "+\t\tgmac2: ethernet@37400000 {\n" "+\t\t\tstatus = \"ok\";\n" "+\t\t\tphy-mode = \"sgmii\";\n" "+\t\t\tqcom,id = <2>;\n" @@ -73,17 +85,17 @@ " \t\t\treg = <0x01200600 0x100>;\n" " \t\t};\n" "+\n" - "+\t\tnss_common: syscon at 03000000 {\n" + "+\t\tnss_common: syscon@03000000 {\n" "+\t\t\tcompatible = \"syscon\";\n" "+\t\t\treg = <0x03000000 0x0000FFFF>;\n" "+\t\t};\n" "+\n" - "+\t\tqsgmii_csr: syscon at 1bb00000 {\n" + "+\t\tqsgmii_csr: syscon@1bb00000 {\n" "+\t\t\tcompatible = \"syscon\";\n" "+\t\t\treg = <0x1bb00000 0x000001FF>;\n" "+\t\t};\n" "+\n" - "+\t\tgmac0: ethernet at 37000000 {\n" + "+\t\tgmac0: ethernet@37000000 {\n" "+\t\t\tdevice_type = \"network\";\n" "+\t\t\tcompatible = \"qcom,ipq806x-gmac\";\n" "+\t\t\treg = <0x37000000 0x200000>;\n" @@ -102,7 +114,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tgmac1: ethernet at 37200000 {\n" + "+\t\tgmac1: ethernet@37200000 {\n" "+\t\t\tdevice_type = \"network\";\n" "+\t\t\tcompatible = \"qcom,ipq806x-gmac\";\n" "+\t\t\treg = <0x37200000 0x200000>;\n" @@ -121,7 +133,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tgmac2: ethernet at 37400000 {\n" + "+\t\tgmac2: ethernet@37400000 {\n" "+\t\t\tdevice_type = \"network\";\n" "+\t\t\tcompatible = \"qcom,ipq806x-gmac\";\n" "+\t\t\treg = <0x37400000 0x200000>;\n" @@ -140,7 +152,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tgmac3: ethernet at 37600000 {\n" + "+\t\tgmac3: ethernet@37600000 {\n" "+\t\t\tdevice_type = \"network\";\n" "+\t\t\tcompatible = \"qcom,ipq806x-gmac\";\n" "+\t\t\treg = <0x37600000 0x200000>;\n" @@ -162,6 +174,11 @@ " \n" " \tsfpb_mutex: sfpb-mutex {\n" "-- \n" - 2.1.4 + "2.1.4\n" + "\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 -df0c90427524455fa2aa0951a91a083f99d77ac595482e49727a94b999df9994 +19de52aecfa4aba32c44d335750b2d6d46ba27bcf5d8094166a849cf08f15955
diff --git a/a/1.txt b/N2/1.txt index efd1d87..ca6dd98 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -29,13 +29,13 @@ index d73df24..0958fa3 100644 + }; }; - sata-phy at 1b400000 { + sata-phy@1b400000 { @@ -122,5 +134,26 @@ reg = <4>; }; }; + -+ gmac1: ethernet at 37200000 { ++ gmac1: ethernet@37200000 { + status = "ok"; + phy-mode = "rgmii"; + phy-handle = <&phy4>; @@ -45,7 +45,7 @@ index d73df24..0958fa3 100644 + pinctrl-names = "default"; + }; + -+ gmac2: ethernet at 37400000 { ++ gmac2: ethernet@37400000 { + status = "ok"; + phy-mode = "sgmii"; + qcom,id = <2>; @@ -66,17 +66,17 @@ index 2f270d7..6706a56 100644 reg = <0x01200600 0x100>; }; + -+ nss_common: syscon at 03000000 { ++ nss_common: syscon@03000000 { + compatible = "syscon"; + reg = <0x03000000 0x0000FFFF>; + }; + -+ qsgmii_csr: syscon at 1bb00000 { ++ qsgmii_csr: syscon@1bb00000 { + compatible = "syscon"; + reg = <0x1bb00000 0x000001FF>; + }; + -+ gmac0: ethernet at 37000000 { ++ gmac0: ethernet@37000000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37000000 0x200000>; @@ -95,7 +95,7 @@ index 2f270d7..6706a56 100644 + status = "disabled"; + }; + -+ gmac1: ethernet at 37200000 { ++ gmac1: ethernet@37200000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37200000 0x200000>; @@ -114,7 +114,7 @@ index 2f270d7..6706a56 100644 + status = "disabled"; + }; + -+ gmac2: ethernet at 37400000 { ++ gmac2: ethernet@37400000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37400000 0x200000>; @@ -133,7 +133,7 @@ index 2f270d7..6706a56 100644 + status = "disabled"; + }; + -+ gmac3: ethernet at 37600000 { ++ gmac3: ethernet@37600000 { + device_type = "network"; + compatible = "qcom,ipq806x-gmac"; + reg = <0x37600000 0x200000>; diff --git a/a/content_digest b/N2/content_digest index a06c5a7..b8298cb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,19 @@ "ref\01440006802-2415-1-git-send-email-mathieu@codeaurora.org\0" - "From\0mathieu@codeaurora.org (Mathieu Olivari)\0" + "From\0Mathieu Olivari <mathieu@codeaurora.org>\0" "Subject\0[PATCH 2/2] ARM: qcom: add GMAC nodes to IPQ806x platforms\0" "Date\0Wed, 19 Aug 2015 10:53:22 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0agross@codeaurora.org" + sboyd@codeaurora.org + " galak@codeaurora.org\0" + "Cc\0robh+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 + " Mathieu Olivari <mathieu@codeaurora.org>\0" "\00:1\0" "b\0" "This change adds GMAC nodes to IPQ806x platforms, both to the dtsi and\n" @@ -36,13 +47,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\tsata-phy at 1b400000 {\n" + " \t\tsata-phy@1b400000 {\n" "@@ -122,5 +134,26 @@\n" " \t\t\t\treg = <4>;\n" " \t\t\t};\n" " \t\t};\n" "+\n" - "+\t\tgmac1: ethernet at 37200000 {\n" + "+\t\tgmac1: ethernet@37200000 {\n" "+\t\t\tstatus = \"ok\";\n" "+\t\t\tphy-mode = \"rgmii\";\n" "+\t\t\tphy-handle = <&phy4>;\n" @@ -52,7 +63,7 @@ "+\t\t\tpinctrl-names = \"default\";\n" "+\t\t};\n" "+\n" - "+\t\tgmac2: ethernet at 37400000 {\n" + "+\t\tgmac2: ethernet@37400000 {\n" "+\t\t\tstatus = \"ok\";\n" "+\t\t\tphy-mode = \"sgmii\";\n" "+\t\t\tqcom,id = <2>;\n" @@ -73,17 +84,17 @@ " \t\t\treg = <0x01200600 0x100>;\n" " \t\t};\n" "+\n" - "+\t\tnss_common: syscon at 03000000 {\n" + "+\t\tnss_common: syscon@03000000 {\n" "+\t\t\tcompatible = \"syscon\";\n" "+\t\t\treg = <0x03000000 0x0000FFFF>;\n" "+\t\t};\n" "+\n" - "+\t\tqsgmii_csr: syscon at 1bb00000 {\n" + "+\t\tqsgmii_csr: syscon@1bb00000 {\n" "+\t\t\tcompatible = \"syscon\";\n" "+\t\t\treg = <0x1bb00000 0x000001FF>;\n" "+\t\t};\n" "+\n" - "+\t\tgmac0: ethernet at 37000000 {\n" + "+\t\tgmac0: ethernet@37000000 {\n" "+\t\t\tdevice_type = \"network\";\n" "+\t\t\tcompatible = \"qcom,ipq806x-gmac\";\n" "+\t\t\treg = <0x37000000 0x200000>;\n" @@ -102,7 +113,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tgmac1: ethernet at 37200000 {\n" + "+\t\tgmac1: ethernet@37200000 {\n" "+\t\t\tdevice_type = \"network\";\n" "+\t\t\tcompatible = \"qcom,ipq806x-gmac\";\n" "+\t\t\treg = <0x37200000 0x200000>;\n" @@ -121,7 +132,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tgmac2: ethernet at 37400000 {\n" + "+\t\tgmac2: ethernet@37400000 {\n" "+\t\t\tdevice_type = \"network\";\n" "+\t\t\tcompatible = \"qcom,ipq806x-gmac\";\n" "+\t\t\treg = <0x37400000 0x200000>;\n" @@ -140,7 +151,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tgmac3: ethernet at 37600000 {\n" + "+\t\tgmac3: ethernet@37600000 {\n" "+\t\t\tdevice_type = \"network\";\n" "+\t\t\tcompatible = \"qcom,ipq806x-gmac\";\n" "+\t\t\treg = <0x37600000 0x200000>;\n" @@ -164,4 +175,4 @@ "-- \n" 2.1.4 -df0c90427524455fa2aa0951a91a083f99d77ac595482e49727a94b999df9994 +3cfa79b3779207ce8ec6805b2ec8c043318a0934c91225d51c658e914e82d059
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.