diff for duplicates of <20130610153628.GJ8164@atomide.com> diff --git a/a/1.txt b/N1/1.txt index deb9b6d..6c4f416 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,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> @@ -37,7 +37,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>; @@ -46,7 +46,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>; @@ -59,7 +59,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>; @@ -68,7 +68,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>; @@ -81,7 +81,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>; @@ -90,7 +90,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 cd35386..17cac55 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,10 @@ "ref\020130607203936.16513.57494.stgit@localhost\0" "ref\020130607205046.16513.2802.stgit@localhost\0" "ref\020130607205219.GG3331@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 4/4] ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omap\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\0Mon, 10 Jun 2013 08:36:28 -0700\0" - "To\0linus.walleij@linaro.org\0" - "Cc\0devicetree-discuss@lists.ozlabs.org" - 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" "* Tony Lindgren <tony@atomide.com> [130607 13:58]:\n" @@ -40,7 +35,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" @@ -51,7 +46,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" @@ -60,7 +55,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" @@ -73,7 +68,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" @@ -82,7 +77,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" @@ -95,7 +90,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" @@ -104,7 +99,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" @@ -253,4 +248,4 @@ " \n" err: -3e96fa48e0fef4915f75be9d6454fc7dc581cbceba507192ebaadb4a6a5c05ed +2a9d566fa92863d5f150c98d7f4f574693181f1a5c9d9c4bf223e4f02aec6a38
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.