diff for duplicates of <20150319173640.GS32500@ld-irv-0074> diff --git a/a/1.txt b/N1/1.txt index 223f11b..77d8d21 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,7 @@ On Thu, Mar 19, 2015 at 06:02:16PM +0100, Hans de Goede wrote: > >>> brcm,int-fwd-mask = <0x70000>; > >>> }; > >>>+ -> >>>+ sata@f045a000 { +> >>>+ sata at f045a000 { > >>>+ compatible = "brcm,bcm7445-ahci", "brcm,sata3-ahci"; > >>>+ reg-names = "ahci", "top-ctrl"; > >>>+ reg = <0x45a000 0xa9c>, <0x458040 0x24>; @@ -132,18 +132,18 @@ your former suggestion, actually. > >>>+ #address-cells = <1>; > >>>+ #size-cells = <0>; > >>>+ -> >>>+ sata0: sata-port@0 { +> >>>+ sata0: sata-port at 0 { > >>>+ reg = <0>; > >>>+ phys = <&sata_phy 0>; > >>>+ }; > >>>+ -> >>>+ sata1: sata-port@1 { +> >>>+ sata1: sata-port at 1 { > >>>+ reg = <1>; > >>>+ phys = <&sata_phy 1>; > >>>+ }; > >>>+ }; > >>>+ -> >>>+ sata_phy: sata-phy@f0458100 { +> >>>+ sata_phy: sata-phy at f0458100 { > >>>+ compatible = "brcm,bcm7445-sata-phy", "brcm,phy-sata3"; > >>>+ reg = <0x458100 0x1e00>, <0x45804c 0x10>; > >> diff --git a/a/content_digest b/N1/content_digest index 9d8d471..ce7a2aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,23 +3,10 @@ "ref\0550AAEA1.5080301@redhat.com\0" "ref\020150319155358.GA19571@brian-ubuntu\0" "ref\0550B0118.3040104@redhat.com\0" - "From\0Brian Norris <computersforpeace@gmail.com>\0" - "Subject\0Re: [PATCH 5/5] ARM: dts: brcmstb: add nodes for SATA controller and PHY\0" + "From\0computersforpeace@gmail.com (Brian Norris)\0" + "Subject\0[PATCH 5/5] ARM: dts: brcmstb: add nodes for SATA controller and PHY\0" "Date\0Thu, 19 Mar 2015 10:36:40 -0700\0" - "To\0Hans de Goede <hdegoede@redhat.com>\0" - "Cc\0Tejun Heo <tj@kernel.org>" - Kishon Vijay Abraham I <kishon@ti.com> - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Gregory Fong <gregory.0xf0@gmail.com> - Florian Fainelli <f.fainelli@gmail.com> - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " linux-ide@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, Mar 19, 2015 at 06:02:16PM +0100, Hans de Goede wrote:\n" @@ -44,7 +31,7 @@ "> >>> \t\t\tbrcm,int-fwd-mask = <0x70000>;\n" "> >>> \t\t};\n" "> >>>+\n" - "> >>>+\t\tsata@f045a000 {\n" + "> >>>+\t\tsata at f045a000 {\n" "> >>>+\t\t\tcompatible = \"brcm,bcm7445-ahci\", \"brcm,sata3-ahci\";\n" "> >>>+\t\t\treg-names = \"ahci\", \"top-ctrl\";\n" "> >>>+\t\t\treg = <0x45a000 0xa9c>, <0x458040 0x24>;\n" @@ -156,18 +143,18 @@ "> >>>+\t\t\t#address-cells = <1>;\n" "> >>>+\t\t\t#size-cells = <0>;\n" "> >>>+\n" - "> >>>+\t\t\tsata0: sata-port@0 {\n" + "> >>>+\t\t\tsata0: sata-port at 0 {\n" "> >>>+\t\t\t\treg = <0>;\n" "> >>>+\t\t\t\tphys = <&sata_phy 0>;\n" "> >>>+\t\t\t};\n" "> >>>+\n" - "> >>>+\t\t\tsata1: sata-port@1 {\n" + "> >>>+\t\t\tsata1: sata-port at 1 {\n" "> >>>+\t\t\t\treg = <1>;\n" "> >>>+\t\t\t\tphys = <&sata_phy 1>;\n" "> >>>+\t\t\t};\n" "> >>>+\t\t};\n" "> >>>+\n" - "> >>>+\t\tsata_phy: sata-phy@f0458100 {\n" + "> >>>+\t\tsata_phy: sata-phy at f0458100 {\n" "> >>>+\t\t\tcompatible = \"brcm,bcm7445-sata-phy\", \"brcm,phy-sata3\";\n" "> >>>+\t\t\treg = <0x458100 0x1e00>, <0x45804c 0x10>;\n" "> >>\n" @@ -202,4 +189,4 @@ "\n" Brian -8e4347a510c37cab4ef08b5f44729f61cdf547fc480f304409d2a55b88ad2509 +d2b8f96208fb90ae5ec274731ca2fbcb90077bfac897996703a7a02e5cdc409a
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.