diff for duplicates of <1389888598-29690-5-git-send-email-lho@apm.com> diff --git a/a/1.txt b/N1/1.txt index aa659e3..4300469 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ index 359d7b6..b1e9cc9 100644 clock-output-names = "eth8clk"; }; + -+ sataphy1clk: sataphy1clk@1f21c000 { ++ sataphy1clk: sataphy1clk at 1f21c000 { + compatible = "apm,xgene-device-clock"; + #clock-cells = <1>; + clocks = <&socplldiv2 0>; @@ -32,7 +32,7 @@ index 359d7b6..b1e9cc9 100644 + enable-mask = <0x06>; + }; + -+ sataphy2clk: sataphy1clk@1f22c000 { ++ sataphy2clk: sataphy1clk at 1f22c000 { + compatible = "apm,xgene-device-clock"; + #clock-cells = <1>; + clocks = <&socplldiv2 0>; @@ -47,7 +47,7 @@ index 359d7b6..b1e9cc9 100644 + enable-mask = <0x06>; + }; + -+ sataphy3clk: sataphy1clk@1f23c000 { ++ sataphy3clk: sataphy1clk at 1f23c000 { + compatible = "apm,xgene-device-clock"; + #clock-cells = <1>; + clocks = <&socplldiv2 0>; @@ -63,13 +63,13 @@ index 359d7b6..b1e9cc9 100644 + }; }; - serial0: serial@1c020000 { + serial0: serial at 1c020000 { @@ -193,5 +238,35 @@ reg = <0x0 0x17000014 0x0 0x100>; mask = <0x1>; }; + -+ phy1: phy@1f21a000 { ++ phy1: phy at 1f21a000 { + compatible = "apm,xgene-phy"; + reg = <0x0 0x1f21a000 0x0 0x100>; + #phy-cells = <1>; @@ -79,7 +79,7 @@ index 359d7b6..b1e9cc9 100644 + apm,tx-eye-tuning = <2 10 10 2 10 10>; + }; + -+ phy2: phy@1f22a000 { ++ phy2: phy at 1f22a000 { + compatible = "apm,xgene-phy"; + reg = <0x0 0x1f22a000 0x0 0x100>; + #phy-cells = <1>; @@ -89,7 +89,7 @@ index 359d7b6..b1e9cc9 100644 + apm,tx-eye-tuning = <1 10 10 2 10 10>; + }; + -+ phy3: phy@1f23a000 { ++ phy3: phy at 1f23a000 { + compatible = "apm,xgene-phy"; + reg = <0x0 0x1f23a000 0x0 0x100>; + #phy-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index ab938d0..6a8509a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,22 +2,10 @@ "ref\01389888598-29690-2-git-send-email-lho@apm.com\0" "ref\01389888598-29690-3-git-send-email-lho@apm.com\0" "ref\01389888598-29690-4-git-send-email-lho@apm.com\0" - "From\0Loc Ho <lho@apm.com>\0" + "From\0lho@apm.com (Loc Ho)\0" "Subject\0[PATCH v8 4/4] arm64: Add APM X-Gene SoC 15Gbps Multi-purpose PHY DTS entries\0" "Date\0Thu, 16 Jan 2014 09:09:58 -0700\0" - "To\0olof@lixom.net" - tj@kernel.org - " arnd@arndb.de\0" - "Cc\0linux-scsi@vger.kernel.org" - linux-ide@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - dmilburn@redhat.com - jcm@redhat.com - patches@apm.com - Loc Ho <lho@apm.com> - Tuan Phan <tphan@apm.com> - " Suman Tripathi <stripathi@apm.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This patch adds the DTS entries for the APM X-Gene SoC 15Gbps Multi-purpose\n" @@ -39,7 +27,7 @@ " \t\t\t\tclock-output-names = \"eth8clk\";\n" " \t\t\t};\n" "+\n" - "+\t\t\tsataphy1clk: sataphy1clk@1f21c000 {\n" + "+\t\t\tsataphy1clk: sataphy1clk at 1f21c000 {\n" "+\t\t\t\tcompatible = \"apm,xgene-device-clock\";\n" "+\t\t\t\t#clock-cells = <1>;\n" "+\t\t\t\tclocks = <&socplldiv2 0>;\n" @@ -54,7 +42,7 @@ "+\t\t\t\tenable-mask = <0x06>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tsataphy2clk: sataphy1clk@1f22c000 {\n" + "+\t\t\tsataphy2clk: sataphy1clk at 1f22c000 {\n" "+\t\t\t\tcompatible = \"apm,xgene-device-clock\";\n" "+\t\t\t\t#clock-cells = <1>;\n" "+\t\t\t\tclocks = <&socplldiv2 0>;\n" @@ -69,7 +57,7 @@ "+\t\t\t\tenable-mask = <0x06>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tsataphy3clk: sataphy1clk@1f23c000 {\n" + "+\t\t\tsataphy3clk: sataphy1clk at 1f23c000 {\n" "+\t\t\t\tcompatible = \"apm,xgene-device-clock\";\n" "+\t\t\t\t#clock-cells = <1>;\n" "+\t\t\t\tclocks = <&socplldiv2 0>;\n" @@ -85,13 +73,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\tserial0: serial@1c020000 {\n" + " \t\tserial0: serial at 1c020000 {\n" "@@ -193,5 +238,35 @@\n" " \t\t\treg = <0x0 0x17000014 0x0 0x100>;\n" " \t\t\tmask = <0x1>;\n" " \t\t};\n" "+\n" - "+\t\tphy1: phy@1f21a000 {\n" + "+\t\tphy1: phy at 1f21a000 {\n" "+\t\t\tcompatible = \"apm,xgene-phy\";\n" "+\t\t\treg = <0x0 0x1f21a000 0x0 0x100>;\n" "+\t\t\t#phy-cells = <1>;\n" @@ -101,7 +89,7 @@ "+\t\t\tapm,tx-eye-tuning = <2 10 10 2 10 10>;\n" "+\t\t};\n" "+\n" - "+\t\tphy2: phy@1f22a000 {\n" + "+\t\tphy2: phy at 1f22a000 {\n" "+\t\t\tcompatible = \"apm,xgene-phy\";\n" "+\t\t\treg = <0x0 0x1f22a000 0x0 0x100>;\n" "+\t\t\t#phy-cells = <1>;\n" @@ -111,7 +99,7 @@ "+\t\t\tapm,tx-eye-tuning = <1 10 10 2 10 10>;\n" "+\t\t};\n" "+\n" - "+\t\tphy3: phy@1f23a000 {\n" + "+\t\tphy3: phy at 1f23a000 {\n" "+\t\t\tcompatible = \"apm,xgene-phy\";\n" "+\t\t\treg = <0x0 0x1f23a000 0x0 0x100>;\n" "+\t\t\t#phy-cells = <1>;\n" @@ -125,4 +113,4 @@ "-- \n" 1.5.5 -e91ec45936d97833a66eb40176fd68fcc4cb1c6b11c596e9cf4b570e19bdd44d +6f672de5193821a63e986d8b6c7bf1e30d9e2682646f224e277231cc39d500a4
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.