diff for duplicates of <1389888687-29741-5-git-send-email-lho@apm.com> diff --git a/a/1.txt b/N1/1.txt index dd466f4..92d2c10 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ index b1e9cc9..ae9d145 100644 enable-mask = <0x06>; }; + -+ sata01clk: sata01clk@1f21c000 { ++ sata01clk: sata01clk at 1f21c000 { + compatible = "apm,xgene-device-clock"; + #clock-cells = <1>; + clocks = <&socplldiv2 0>; @@ -28,7 +28,7 @@ index b1e9cc9..ae9d145 100644 + enable-mask = <0x39>; + }; + -+ sata23clk: sata23clk@1f22c000 { ++ sata23clk: sata23clk at 1f22c000 { + compatible = "apm,xgene-device-clock"; + #clock-cells = <1>; + clocks = <&socplldiv2 0>; @@ -42,7 +42,7 @@ index b1e9cc9..ae9d145 100644 + enable-mask = <0x39>; + }; + -+ sata45clk: sata45clk@1f23c000 { ++ sata45clk: sata45clk at 1f23c000 { + compatible = "apm,xgene-device-clock"; + #clock-cells = <1>; + clocks = <&socplldiv2 0>; @@ -57,13 +57,13 @@ index b1e9cc9..ae9d145 100644 + }; }; - serial0: serial@1c020000 { + serial0: serial at 1c020000 { @@ -268,5 +310,38 @@ apm,tx-boost-gain = <31 31 31 31 31 31>; apm,tx-eye-tuning = <2 10 10 2 10 10>; }; + -+ sata1: sata@1a000000 { ++ sata1: sata at 1a000000 { + compatible = "apm,xgene-ahci-sgmii"; + reg = <0x0 0x1a000000 0x0 0x1000>, + <0x0 0x1f210000 0x0 0x10000>; @@ -74,7 +74,7 @@ index b1e9cc9..ae9d145 100644 + phy-names = "sata-6g"; + }; + -+ sata2: sata@1a400000 { ++ sata2: sata at 1a400000 { + compatible = "apm,xgene-ahci-sgmii"; + reg = <0x0 0x1a400000 0x0 0x1000>, + <0x0 0x1f220000 0x0 0x10000>; @@ -85,7 +85,7 @@ index b1e9cc9..ae9d145 100644 + phy-names = "sata-6g"; + }; + -+ sata3: sata@1a800000 { ++ sata3: sata at 1a800000 { + compatible = "apm,xgene-ahci-pcie"; + reg = <0x0 0x1a800000 0x0 0x1000>, + <0x0 0x1f230000 0x0 0x10000>; diff --git a/a/content_digest b/N1/content_digest index a83f244..7e6bc50 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,22 +2,10 @@ "ref\01389888687-29741-2-git-send-email-lho@apm.com\0" "ref\01389888687-29741-3-git-send-email-lho@apm.com\0" "ref\01389888687-29741-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 v10 4/4] arm64: Add APM X-Gene SoC SATA host controller DTS entries\0" "Date\0Thu, 16 Jan 2014 09:11:27 -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" "Signed-off-by: Loc Ho <lho@apm.com>\n" @@ -36,7 +24,7 @@ " \t\t\t\tenable-mask = <0x06>;\n" " \t\t\t};\n" "+\n" - "+\t\t\tsata01clk: sata01clk@1f21c000 {\n" + "+\t\t\tsata01clk: sata01clk 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" @@ -50,7 +38,7 @@ "+\t\t\t\tenable-mask = <0x39>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tsata23clk: sata23clk@1f22c000 {\n" + "+\t\t\tsata23clk: sata23clk 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" @@ -64,7 +52,7 @@ "+\t\t\t\tenable-mask = <0x39>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tsata45clk: sata45clk@1f23c000 {\n" + "+\t\t\tsata45clk: sata45clk 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" @@ -79,13 +67,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\tserial0: serial@1c020000 {\n" + " \t\tserial0: serial at 1c020000 {\n" "@@ -268,5 +310,38 @@\n" " \t\t\tapm,tx-boost-gain = <31 31 31 31 31 31>;\n" " \t\t\tapm,tx-eye-tuning = <2 10 10 2 10 10>;\n" " \t\t};\n" "+\n" - "+\t\tsata1: sata@1a000000 {\n" + "+\t\tsata1: sata at 1a000000 {\n" "+\t\t\tcompatible = \"apm,xgene-ahci-sgmii\";\n" "+\t\t\treg = <0x0 0x1a000000 0x0 0x1000>,\n" "+\t\t\t <0x0 0x1f210000 0x0 0x10000>;\n" @@ -96,7 +84,7 @@ "+\t\t\tphy-names = \"sata-6g\";\n" "+\t\t};\n" "+\n" - "+\t\tsata2: sata@1a400000 {\n" + "+\t\tsata2: sata at 1a400000 {\n" "+\t\t\tcompatible = \"apm,xgene-ahci-sgmii\";\n" "+\t\t\treg = <0x0 0x1a400000 0x0 0x1000>,\n" "+\t\t\t <0x0 0x1f220000 0x0 0x10000>;\n" @@ -107,7 +95,7 @@ "+\t\t\tphy-names = \"sata-6g\";\n" "+\t\t};\n" "+\n" - "+\t\tsata3: sata@1a800000 {\n" + "+\t\tsata3: sata at 1a800000 {\n" "+\t\t\tcompatible = \"apm,xgene-ahci-pcie\";\n" "+\t\t\treg = <0x0 0x1a800000 0x0 0x1000>,\n" "+\t\t\t <0x0 0x1f230000 0x0 0x10000>;\n" @@ -122,4 +110,4 @@ "-- \n" 1.5.5 -530e1bc23176b702e3ff14d760f8266db1589d31129f366d0ec45205121a6186 +a2925fad9f695902cea6e7eb99ceaed8b310338fde656e6158ba60f5384dc109
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.