diff for duplicates of <20150127020254.GI7696@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 1d430c4..2c0ef1d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> }; }; -- dm816x_pinmux: pinmux@44e10800 { +- dm816x_pinmux: pinmux at 44e10800 { - compatible = "pinctrl-single"; - reg = <0x48140800 0x50a>; - #address-cells = <1>; @@ -35,7 +35,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> @@ -89,12 +80,29 @@ }; - scrm: scrm@48140000 { + scrm: scrm at 48140000 { - compatible = "ti,dm816-scrm"; + compatible = "ti,dm816-scrm", "simple-bus"; reg = <0x48140000 0x21000>; @@ -43,7 +43,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> #size-cells = <1>; ranges = <0 0x48140000 0x21000>; -+ dm816x_pinmux: pinmux@800 { ++ dm816x_pinmux: pinmux at 800 { + compatible = "pinctrl-single"; + reg = <0x800 0x50a>; + #address-cells = <1>; @@ -53,7 +53,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> + }; + + /* Device Configuration Registers */ -+ scm_conf: syscon@600 { ++ scm_conf: syscon at 600 { + compatible = "syscon"; + reg = <0x600 0x110>; + #address-cells = <1>; @@ -67,12 +67,12 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> }; }; -- cm: syscon@44e10000 { +- cm: syscon at 44e10000 { - compatible = "ti,am33xx-controlmodule", "syscon"; - reg = <0x44e10000 0x800>; - }; - - edma: edma@49000000 { + edma: edma at 49000000 { compatible = "ti,edma3"; ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2", "tptc3"; @@ -213,6 +216,7 @@ diff --git a/a/content_digest b/N1/content_digest index 251a0e0..3c8b6fe 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 dm816x pinctrl and syscon so they are children of SCM\0" "Date\0Mon, 26 Jan 2015 18:02:55 -0800\0" - "To\0linux-omap@vger.kernel.org\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - " Brian Hutchinson <b.hutchman@gmail.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Tony Lindgren <tony@atomide.com>\n" @@ -28,7 +26,7 @@ " \t\t};\n" " \t};\n" " \n" - "-\tdm816x_pinmux: pinmux@44e10800 {\n" + "-\tdm816x_pinmux: pinmux at 44e10800 {\n" "-\t\tcompatible = \"pinctrl-single\";\n" "-\t\treg = <0x48140800 0x50a>;\n" "-\t\t#address-cells = <1>;\n" @@ -43,7 +41,7 @@ "@@ -89,12 +80,29 @@\n" " \t\t};\n" " \n" - " \t\tscrm: scrm@48140000 {\n" + " \t\tscrm: scrm at 48140000 {\n" "-\t\t\tcompatible = \"ti,dm816-scrm\";\n" "+\t\t\tcompatible = \"ti,dm816-scrm\", \"simple-bus\";\n" " \t\t\treg = <0x48140000 0x21000>;\n" @@ -51,7 +49,7 @@ " \t\t\t#size-cells = <1>;\n" " \t\t\tranges = <0 0x48140000 0x21000>;\n" " \n" - "+\t\t\tdm816x_pinmux: pinmux@800 {\n" + "+\t\t\tdm816x_pinmux: pinmux at 800 {\n" "+\t\t\t\tcompatible = \"pinctrl-single\";\n" "+\t\t\t\treg = <0x800 0x50a>;\n" "+\t\t\t\t#address-cells = <1>;\n" @@ -61,7 +59,7 @@ "+\t\t\t};\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\treg = <0x600 0x110>;\n" "+\t\t\t\t#address-cells = <1>;\n" @@ -75,12 +73,12 @@ " \t\t\t};\n" " \t\t};\n" " \n" - "-\t\tcm: syscon@44e10000 {\n" + "-\t\tcm: syscon at 44e10000 {\n" "-\t\t\tcompatible = \"ti,am33xx-controlmodule\", \"syscon\";\n" "-\t\t\treg = <0x44e10000 0x800>;\n" "-\t\t};\n" "-\n" - " \t\tedma: edma@49000000 {\n" + " \t\tedma: edma at 49000000 {\n" " \t\t\tcompatible = \"ti,edma3\";\n" " \t\t\tti,hwmods = \"tpcc\", \"tptc0\", \"tptc1\", \"tptc2\", \"tptc3\";\n" "@@ -213,6 +216,7 @@\n" @@ -100,4 +98,4 @@ " \t\t\tti,davinci-ctrl-mod-reg-offset = <0x900>;\n" " \t\t\tti,davinci-ctrl-ram-offset = <0x2000>;" -c0640ec8d7c134abaf4caee4171f97e1508d7b9d58a2f73e6125c8a672cb2539 +9b2589fb6451aa2366cb86daccc8a248f5ad49b0dcca5ea33a776b10dd40c8a4
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.