diff for duplicates of <1364458106.3757.11.camel@mars> diff --git a/a/1.txt b/N1/1.txt index 521e855..42b9137 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ index 1acc261..6ce3b5c 100644 soc { @@ -77,20 +77,20 @@ - omap3_pmx_core: pinmux@48002030 { + omap3_pmx_core: pinmux at 48002030 { compatible = "ti,omap3-padconf", "pinctrl-single"; - reg = <0x48002030 0x05cc>; + reg = <0x48002030 0x234>; @@ -36,8 +36,8 @@ index 1acc261..6ce3b5c 100644 + pinctrl-single,function-mask = <0x7f1f>; }; -- omap3_pmx_wkup: pinmux@0x48002a58 { -+ omap3_pmx_wkup: pinmux@0x48002a00 { +- omap3_pmx_wkup: pinmux at 0x48002a58 { ++ omap3_pmx_wkup: pinmux at 0x48002a00 { compatible = "ti,omap3-padconf", "pinctrl-single"; - reg = <0x48002a58 0x5c>; + reg = <0x48002a00 0x54>; @@ -48,6 +48,6 @@ index 1acc261..6ce3b5c 100644 + pinctrl-single,function-mask = <0x7f1f>; }; - gpio1: gpio@48310000 { + gpio1: gpio at 48310000 { -- 1.7.10.4 diff --git a/a/content_digest b/N1/content_digest index 3c1bec6..7dfb741 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,7 @@ - "From\0Christoph Fritz <chf.fritz@googlemail.com>\0" + "From\0chf.fritz@googlemail.com (Christoph Fritz)\0" "Subject\0[PATCH] arm/dts: OMAP3: fix pinctrl-single configuration\0" "Date\0Thu, 28 Mar 2013 09:08:26 +0100\0" - "To\0Beno\303\256t Cousson <b-cousson@ti.com>" - Tony Lindgren <tony@atomide.com> - linux-omap@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0Daniel Mack <daniel@zonque.org>" - " Hans J. Koch <hjk@hansjkoch.de>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "- Fix 'function-mask' referring to TRM Section 7.4.4:\n" @@ -37,7 +31,7 @@ " \tsoc {\n" "@@ -77,20 +77,20 @@\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\treg = <0x48002030 0x05cc>;\n" "+\t\t\treg = <0x48002030 0x234>;\n" @@ -48,8 +42,8 @@ "+\t\t\tpinctrl-single,function-mask = <0x7f1f>;\n" " \t\t};\n" " \n" - "-\t\tomap3_pmx_wkup: pinmux@0x48002a58 {\n" - "+\t\tomap3_pmx_wkup: pinmux@0x48002a00 {\n" + "-\t\tomap3_pmx_wkup: pinmux at 0x48002a58 {\n" + "+\t\tomap3_pmx_wkup: pinmux at 0x48002a00 {\n" " \t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "-\t\t\treg = <0x48002a58 0x5c>;\n" "+\t\t\treg = <0x48002a00 0x54>;\n" @@ -60,8 +54,8 @@ "+\t\t\tpinctrl-single,function-mask = <0x7f1f>;\n" " \t\t};\n" " \n" - " \t\tgpio1: gpio@48310000 {\n" + " \t\tgpio1: gpio at 48310000 {\n" "-- \n" 1.7.10.4 -85ca519bbc34bf9a5a8b3a996c5235b3ee40fe9cbeb2e9eb5f9f755f0fc74199 +a3898adaa841ecb74883142e5df683bd4ffc3ba0281e1afa78826309c56c0f53
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.