diff for duplicates of <20150205171201.GG25198@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 73150f8..12b27a3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,7 +71,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> @@ -97,10 +97,31 @@ /* Device Configuration Registers */ - scm_conf: syscon@600 { + scm_conf: syscon at 600 { - compatible = "syscon"; + compatible = "syscon", "simple-bus"; reg = <0x600 0x110>; @@ -79,7 +79,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> #size-cells = <1>; + ranges = <0 0x600 0x110>; + -+ usb_phy0: usb-phy@20 { ++ usb_phy0: usb-phy at 20 { + compatible = "ti,dm8168-usb-phy"; + reg = <0x20 0x8>; + reg-names = "phy"; @@ -89,7 +89,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> + syscon = <&scm_conf>; + }; + -+ usb_phy1: usb-phy@28 { ++ usb_phy1: usb-phy at 28 { + compatible = "ti,dm8168-usb-phy"; + reg = <0x28 0x8>; + reg-names = "phy"; @@ -115,7 +115,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> mentor,ram-bits = <12>; @@ -366,13 +390,15 @@ - usb1: usb@47401800 { + usb1: usb at 47401800 { compatible = "ti,musb-am33xx"; - status = "disabled"; reg = <0x47401c00 0x400 diff --git a/a/content_digest b/N1/content_digest index 5993226..01df724 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,7 @@ - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH] ARM: dts: Fix USB dts configuration for dm816x\0" "Date\0Thu, 5 Feb 2015 09:12:01 -0800\0" - "To\0linux-omap@vger.kernel.org\0" - "Cc\0Brian Hutchinson <b.hutchman@gmail.com>" - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Commit 7800064ba507 (\"ARM: dts: Add basic dm816x device tree\n" @@ -79,7 +77,7 @@ "@@ -97,10 +97,31 @@\n" " \n" " \t\t\t/* Device Configuration Registers */\n" - " \t\t\tscm_conf: syscon@600 {\n" + " \t\t\tscm_conf: syscon at 600 {\n" "-\t\t\t\tcompatible = \"syscon\";\n" "+\t\t\t\tcompatible = \"syscon\", \"simple-bus\";\n" " \t\t\t\treg = <0x600 0x110>;\n" @@ -87,7 +85,7 @@ " \t\t\t\t#size-cells = <1>;\n" "+\t\t\t\tranges = <0 0x600 0x110>;\n" "+\n" - "+\t\t\t\tusb_phy0: usb-phy@20 {\n" + "+\t\t\t\tusb_phy0: usb-phy at 20 {\n" "+\t\t\t\t\tcompatible = \"ti,dm8168-usb-phy\";\n" "+\t\t\t\t\treg = <0x20 0x8>;\n" "+\t\t\t\t\treg-names = \"phy\";\n" @@ -97,7 +95,7 @@ "+\t\t\t\t\tsyscon = <&scm_conf>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tusb_phy1: usb-phy@28 {\n" + "+\t\t\t\tusb_phy1: usb-phy at 28 {\n" "+\t\t\t\t\tcompatible = \"ti,dm8168-usb-phy\";\n" "+\t\t\t\t\treg = <0x28 0x8>;\n" "+\t\t\t\t\treg-names = \"phy\";\n" @@ -123,7 +121,7 @@ " \t\t\t\tmentor,ram-bits = <12>;\n" "@@ -366,13 +390,15 @@\n" " \n" - " \t\t\tusb1: usb@47401800 {\n" + " \t\t\tusb1: usb at 47401800 {\n" " \t\t\t\tcompatible = \"ti,musb-am33xx\";\n" "-\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\treg = <0x47401c00 0x400\n" @@ -140,4 +138,4 @@ " \t\t\t\tmentor,num-eps = <16>;\n" " \t\t\t\tmentor,ram-bits = <12>;" -3ac58ca7e6947f2fa66b1bdf470a86aac849f48a32d327f7f6e34450fb8d5a21 +19641529f50b735d62c4c3df39298b945c7d5da6bf63de5956fb4923c7f396c6
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.