diff for duplicates of <52B1417B.6060909@ti.com> diff --git a/a/1.txt b/N1/1.txt index 72ab10a..7c8be12 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ On Wednesday 18 December 2013 01:51 AM, Andrew Lunn wrote: Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > v1->v2: -> sata_phy@... ->sata-phy@ +> sata_phy at ... ->sata-phy@ > value after '@' matching the first address in the reg. > > v2->v3: @@ -34,7 +34,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > status = "disabled"; > }; > -> + sata_phy0: sata-phy@a2000 { +> + sata_phy0: sata-phy at a2000 { > + compatible = "marvell,mvebu-sata-phy"; > + reg = <0xa2000 0x0334>; > + clocks = <&gate_clk 3>; @@ -43,7 +43,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > + status = "ok"; > + }; > + -> rtc: real-time-clock@d8500 { +> rtc: real-time-clock at d8500 { > compatible = "marvell,orion-rtc"; > reg = <0xd8500 0x20>; > diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi @@ -81,7 +81,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > }; > }; > + -> + sata_phy0: sata-phy@82000 { +> + sata_phy0: sata-phy at 82000 { > + compatible = "marvell,mvebu-sata-phy"; > + reg = <0x82000 0x0334>; > + clocks = <&gate_clk 14>; @@ -90,7 +90,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > + status = "ok"; > + }; > + -> + sata_phy1: sata-phy@84000 { +> + sata_phy1: sata-phy at 84000 { > + compatible = "marvell,mvebu-sata-phy"; > + reg = <0x84000 0x0334>; > + clocks = <&gate_clk 15>; diff --git a/a/content_digest b/N1/content_digest index 6452716..cbdfde1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01387311713-1926-1-git-send-email-andrew@lunn.ch\0" "ref\01387311713-1926-4-git-send-email-andrew@lunn.ch\0" - "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" - "Subject\0Re: [PATCH 4/4] Phy: Add DT nodes on kirkwood and Dove for the SATA PHY\0" + "From\0kishon@ti.com (Kishon Vijay Abraham I)\0" + "Subject\0[PATCH 4/4] Phy: Add DT nodes on kirkwood and Dove for the SATA PHY\0" "Date\0Wed, 18 Dec 2013 12:02:27 +0530\0" - "To\0Andrew Lunn <andrew@lunn.ch>" - " Jason Cooper <jason@lakedaemon.net>\0" - "Cc\0Gregory Clement <gregory.clement@free-electrons.com>" - devicetree@vger.kernel.org - Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com> - linux ARM <linux-arm-kernel@lists.infradead.org> - " linux-ide@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wednesday 18 December 2013 01:51 AM, Andrew Lunn wrote:\n" @@ -21,7 +15,7 @@ "Acked-by: Kishon Vijay Abraham I <kishon@ti.com>\n" "> ---\n" "> v1->v2:\n" - "> sata_phy@... ->sata-phy@\n" + "> sata_phy at ... ->sata-phy@\n" "> value after '@' matching the first address in the reg.\n" "> \n" "> v2->v3:\n" @@ -48,7 +42,7 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tsata_phy0: sata-phy@a2000 {\n" + "> +\t\t\tsata_phy0: sata-phy at a2000 {\n" "> +\t\t\t\tcompatible = \"marvell,mvebu-sata-phy\";\n" "> +\t\t\t\treg = <0xa2000 0x0334>;\n" "> +\t\t\t\tclocks = <&gate_clk 3>;\n" @@ -57,7 +51,7 @@ "> +\t\t\t\tstatus = \"ok\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\trtc: real-time-clock@d8500 {\n" + "> \t\t\trtc: real-time-clock at d8500 {\n" "> \t\t\t\tcompatible = \"marvell,orion-rtc\";\n" "> \t\t\t\treg = <0xd8500 0x20>;\n" "> diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi\n" @@ -95,7 +89,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> +\n" - "> +\t\tsata_phy0: sata-phy@82000 {\n" + "> +\t\tsata_phy0: sata-phy at 82000 {\n" "> +\t\t\tcompatible = \"marvell,mvebu-sata-phy\";\n" "> +\t\t\treg = <0x82000 0x0334>;\n" "> +\t\t\tclocks = <&gate_clk 14>;\n" @@ -104,7 +98,7 @@ "> +\t\t\tstatus = \"ok\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsata_phy1: sata-phy@84000 {\n" + "> +\t\tsata_phy1: sata-phy at 84000 {\n" "> +\t\t\tcompatible = \"marvell,mvebu-sata-phy\";\n" "> +\t\t\treg = <0x84000 0x0334>;\n" "> +\t\t\tclocks = <&gate_clk 15>;\n" @@ -116,4 +110,4 @@ "> };\n" > -50e4f09594336294c17b98ccc6b634e981cb7a19666a475a53175bff954bd66e +ff987c1d1ba35f64f737a8581e15977d08d8e387479ca9396fd486bc58db4356
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.