diff for duplicates of <20130607205046.16513.2802.stgit@localhost> diff --git a/a/1.txt b/N1/1.txt index 4a6fcec..1fbead4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ Done in collaboration with Roger Quadros <rogerq@ti.com>. Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> -Cc: devicetree-discuss@lists.ozlabs.org +Cc: devicetree-discuss at lists.ozlabs.org Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> --- @@ -24,7 +24,7 @@ index 99ba6e1..847af56 100644 @@ -94,7 +94,7 @@ }; - omap3_pmx_core: pinmux@48002030 { + omap3_pmx_core: pinmux at 48002030 { - compatible = "ti,omap3-padconf", "pinctrl-single"; + compatible = "ti,omap3-padconf"; reg = <0x48002030 0x05cc>; @@ -33,7 +33,7 @@ index 99ba6e1..847af56 100644 @@ -103,7 +103,7 @@ }; - omap3_pmx_wkup: pinmux@0x48002a00 { + omap3_pmx_wkup: pinmux at 0x48002a00 { - compatible = "ti,omap3-padconf", "pinctrl-single"; + compatible = "ti,omap3-padconf"; reg = <0x48002a00 0x5c>; @@ -46,7 +46,7 @@ index 2a56428..2a4f099 100644 @@ -107,7 +107,7 @@ }; - omap4_pmx_core: pinmux@4a100040 { + omap4_pmx_core: pinmux at 4a100040 { - compatible = "ti,omap4-padconf", "pinctrl-single"; + compatible = "ti,omap4-padconf"; reg = <0x4a100040 0x0196>; @@ -55,7 +55,7 @@ index 2a56428..2a4f099 100644 @@ -115,7 +115,7 @@ pinctrl-single,function-mask = <0x7fff>; }; - omap4_pmx_wkup: pinmux@4a31e040 { + omap4_pmx_wkup: pinmux at 4a31e040 { - compatible = "ti,omap4-padconf", "pinctrl-single"; + compatible = "ti,omap4-padconf"; reg = <0x4a31e040 0x0038>; @@ -68,7 +68,7 @@ index 3dd7ff8..5515d58 100644 @@ -100,7 +100,7 @@ }; - omap5_pmx_core: pinmux@4a002840 { + omap5_pmx_core: pinmux at 4a002840 { - compatible = "ti,omap4-padconf", "pinctrl-single"; + compatible = "ti,omap4-padconf"; reg = <0x4a002840 0x01b6>; @@ -77,7 +77,7 @@ index 3dd7ff8..5515d58 100644 @@ -108,7 +108,7 @@ pinctrl-single,function-mask = <0x7fff>; }; - omap5_pmx_wkup: pinmux@4ae0c840 { + omap5_pmx_wkup: pinmux at 4ae0c840 { - compatible = "ti,omap4-padconf", "pinctrl-single"; + compatible = "ti,omap4-padconf"; reg = <0x4ae0c840 0x0038>; diff --git a/a/content_digest b/N1/content_digest index 1a02017..5209c2d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\020130607203936.16513.57494.stgit@localhost\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 4/4] ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omap\0" "Date\0Fri, 07 Jun 2013 13:50:46 -0700\0" - "To\0linus.walleij@linaro.org\0" - "Cc\0devicetree-discuss@lists.ozlabs.org" - Haojian Zhuang <haojian.zhuang@gmail.com> - Peter Ujfalusi <peter.ujfalusi@ti.com> - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " Roger Quadros <rogerq@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Now pinctrl-single-omap can handle the wake-up events for us now\n" @@ -18,7 +12,7 @@ "\n" "Cc: Haojian Zhuang <haojian.zhuang@gmail.com>\n" "Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>\n" - "Cc: devicetree-discuss@lists.ozlabs.org\n" + "Cc: devicetree-discuss at lists.ozlabs.org\n" "Signed-off-by: Roger Quadros <rogerq@ti.com>\n" "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "---\n" @@ -37,7 +31,7 @@ "@@ -94,7 +94,7 @@\n" " \t\t};\n" " \n" - " \t\tomap3_pmx_core: pinmux@48002030 {\n" + " \t\tomap3_pmx_core: pinmux at 48002030 {\n" "-\t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "+\t\t\tcompatible = \"ti,omap3-padconf\";\n" " \t\t\treg = <0x48002030 0x05cc>;\n" @@ -46,7 +40,7 @@ "@@ -103,7 +103,7 @@\n" " \t\t};\n" " \n" - " \t\tomap3_pmx_wkup: pinmux@0x48002a00 {\n" + " \t\tomap3_pmx_wkup: pinmux at 0x48002a00 {\n" "-\t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "+\t\t\tcompatible = \"ti,omap3-padconf\";\n" " \t\t\treg = <0x48002a00 0x5c>;\n" @@ -59,7 +53,7 @@ "@@ -107,7 +107,7 @@\n" " \t\t};\n" " \n" - " \t\tomap4_pmx_core: pinmux@4a100040 {\n" + " \t\tomap4_pmx_core: pinmux at 4a100040 {\n" "-\t\t\tcompatible = \"ti,omap4-padconf\", \"pinctrl-single\";\n" "+\t\t\tcompatible = \"ti,omap4-padconf\";\n" " \t\t\treg = <0x4a100040 0x0196>;\n" @@ -68,7 +62,7 @@ "@@ -115,7 +115,7 @@\n" " \t\t\tpinctrl-single,function-mask = <0x7fff>;\n" " \t\t};\n" - " \t\tomap4_pmx_wkup: pinmux@4a31e040 {\n" + " \t\tomap4_pmx_wkup: pinmux at 4a31e040 {\n" "-\t\t\tcompatible = \"ti,omap4-padconf\", \"pinctrl-single\";\n" "+\t\t\tcompatible = \"ti,omap4-padconf\";\n" " \t\t\treg = <0x4a31e040 0x0038>;\n" @@ -81,7 +75,7 @@ "@@ -100,7 +100,7 @@\n" " \t\t};\n" " \n" - " \t\tomap5_pmx_core: pinmux@4a002840 {\n" + " \t\tomap5_pmx_core: pinmux at 4a002840 {\n" "-\t\t\tcompatible = \"ti,omap4-padconf\", \"pinctrl-single\";\n" "+\t\t\tcompatible = \"ti,omap4-padconf\";\n" " \t\t\treg = <0x4a002840 0x01b6>;\n" @@ -90,7 +84,7 @@ "@@ -108,7 +108,7 @@\n" " \t\t\tpinctrl-single,function-mask = <0x7fff>;\n" " \t\t};\n" - " \t\tomap5_pmx_wkup: pinmux@4ae0c840 {\n" + " \t\tomap5_pmx_wkup: pinmux at 4ae0c840 {\n" "-\t\t\tcompatible = \"ti,omap4-padconf\", \"pinctrl-single\";\n" "+\t\t\tcompatible = \"ti,omap4-padconf\";\n" " \t\t\treg = <0x4ae0c840 0x0038>;\n" @@ -203,4 +197,4 @@ " \n" err: -35a946ece62619b48586d7f111dfeff3bc27bebe5474c9c91fd5890f0b998276 +18bf5d3925952b36a8aeacf35ea54de35b80b5f9819f85cfff1da91355cd54ba
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.