diff for duplicates of <20140711115406.GB2954@lee--X1> diff --git a/a/1.txt b/N1/1.txt index 8b7a579..6323150 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,12 +16,12 @@ index 4e2df66..c3c2ac6 100644 compatible = "st,stih416-b2020", "st,stih416"; + + soc { -+ miphy365x_phy: miphy365x at fe382000 { -+ phy_port0: port at fe382000 { ++ miphy365x_phy: miphy365x@fe382000 { ++ phy_port0: port@fe382000 { + st,sata-gen = <3>; + }; + -+ phy_port1: port at fe38a000 { ++ phy_port1: port@fe38a000 { + st,pcie-tx-pol-inv; + }; + }; @@ -32,16 +32,16 @@ index ba0fa2c..80aff0f 100644 --- a/arch/arm/boot/dts/stih416-b2020e.dts +++ b/arch/arm/boot/dts/stih416-b2020e.dts @@ -31,5 +31,15 @@ - ethernet1: dwmac at fef08000 { + ethernet1: dwmac@fef08000 { snps,reset-gpio = <&PIO0 7>; }; + -+ miphy365x_phy: miphy365x at fe382000 { -+ phy_port0: port at fe382000 { ++ miphy365x_phy: miphy365x@fe382000 { ++ phy_port0: port@fe382000 { + st,sata-gen = <3>; + }; + -+ phy_port1: port at fe38a000 { ++ phy_port1: port@fe38a000 { + st,pcie-tx-pol-inv; + }; + }; @@ -65,20 +65,20 @@ index 84758d7..2b98a0a 100644 <&softreset STIH416_KEYSCAN_SOFTRESET>; }; + -+ miphy365x_phy: miphy365x at fe382000 { ++ miphy365x_phy: miphy365x@fe382000 { + compatible = "st,miphy365x-phy"; + st,syscfg = <&syscfg_rear>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ phy_port0: port at fe382000 { ++ phy_port0: port@fe382000 { + #phy-cells = <1>; + reg = <0xfe382000 0x100>, <0xfe394000 0x100>, <0x824 0x4>; + reg-names = "sata", "pcie", "syscfg"; + }; + -+ phy_port1: port at fe38a000 { ++ phy_port1: port@fe38a000 { + #phy-cells = <1>; + reg = <0xfe38a000 0x100>, <0xfe804000 0x100>, <0x828 0x4>; + reg-names = "sata", "pcie", "syscfg"; diff --git a/a/content_digest b/N1/content_digest index f9e3695..b739d0e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,12 @@ "ref\01404906074-31992-1-git-send-email-lee.jones@linaro.org\0" "ref\01404906074-31992-6-git-send-email-lee.jones@linaro.org\0" - "From\0lee.jones@linaro.org (Lee Jones)\0" + "From\0Lee Jones <lee.jones@linaro.org>\0" "Subject\0[PATCH v3+1 5/5] ARM: DT: STi: STiH416: Add DT node for MiPHY365x\0" "Date\0Fri, 11 Jul 2014 12:54:06 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org" + linux-kernel@vger.kernel.org + " kishon@ti.com\0" + "Cc\0kernel@stlinux.com\0" "\00:1\0" "b\0" "The MiPHY365x is a Generic PHY which can serve various SATA or PCIe\n" @@ -24,12 +27,12 @@ " \tcompatible = \"st,stih416-b2020\", \"st,stih416\";\n" "+\n" "+\tsoc {\n" - "+\t\tmiphy365x_phy: miphy365x at fe382000 {\n" - "+\t\t\tphy_port0: port at fe382000 {\n" + "+\t\tmiphy365x_phy: miphy365x@fe382000 {\n" + "+\t\t\tphy_port0: port@fe382000 {\n" "+\t\t\t\tst,sata-gen = <3>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tphy_port1: port at fe38a000 {\n" + "+\t\t\tphy_port1: port@fe38a000 {\n" "+\t\t\t\tst,pcie-tx-pol-inv;\n" "+\t\t\t};\n" "+\t\t};\n" @@ -40,16 +43,16 @@ "--- a/arch/arm/boot/dts/stih416-b2020e.dts\n" "+++ b/arch/arm/boot/dts/stih416-b2020e.dts\n" "@@ -31,5 +31,15 @@\n" - " \t\tethernet1: dwmac at fef08000 {\n" + " \t\tethernet1: dwmac@fef08000 {\n" " \t\t\tsnps,reset-gpio = <&PIO0 7>;\n" " \t\t};\n" "+\n" - "+\t\tmiphy365x_phy: miphy365x at fe382000 {\n" - "+\t\t\tphy_port0: port at fe382000 {\n" + "+\t\tmiphy365x_phy: miphy365x@fe382000 {\n" + "+\t\t\tphy_port0: port@fe382000 {\n" "+\t\t\t\tst,sata-gen = <3>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tphy_port1: port at fe38a000 {\n" + "+\t\t\tphy_port1: port@fe38a000 {\n" "+\t\t\t\tst,pcie-tx-pol-inv;\n" "+\t\t\t};\n" "+\t\t};\n" @@ -73,20 +76,20 @@ " \t\t\t\t <&softreset STIH416_KEYSCAN_SOFTRESET>;\n" " \t\t};\n" "+\n" - "+\t\tmiphy365x_phy: miphy365x at fe382000 {\n" + "+\t\tmiphy365x_phy: miphy365x@fe382000 {\n" "+\t\t\tcompatible = \"st,miphy365x-phy\";\n" "+\t\t\tst,syscfg \t= <&syscfg_rear>;\n" "+\t\t\t#address-cells\t= <1>;\n" "+\t\t\t#size-cells\t= <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tphy_port0: port at fe382000 {\n" + "+\t\t\tphy_port0: port@fe382000 {\n" "+\t\t\t\t#phy-cells = <1>;\n" "+\t\t\t\treg = <0xfe382000 0x100>, <0xfe394000 0x100>, <0x824 0x4>;\n" "+\t\t\t\treg-names = \"sata\", \"pcie\", \"syscfg\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tphy_port1: port at fe38a000 {\n" + "+\t\t\tphy_port1: port@fe38a000 {\n" "+\t\t\t\t#phy-cells = <1>;\n" "+\t\t\t\treg = <0xfe38a000 0x100>, <0xfe804000 0x100>, <0x828 0x4>;\n" "+\t\t\t\treg-names = \"sata\", \"pcie\", \"syscfg\";\n" @@ -95,4 +98,4 @@ " \t};\n" }; -3b7566b75fc807701d9c69b8b0c09e8e378c57341ea9c192d97287a5186e0f61 +ff0d241eb2f50213d548a5a7223fcf7f608c78b0f77f1b5d45ea2bf029742802
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.