diff for duplicates of <20140107223605.GB5074@atomide.com> diff --git a/a/1.txt b/N1/1.txt index db19490..574085d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ > +++ b/arch/arm/boot/dts/omap3.dtsi > @@ -117,7 +117,18 @@ > -> omap3_pmx_core: pinmux@48002030 { +> omap3_pmx_core: pinmux at 48002030 { > compatible = "ti,omap3-padconf", "pinctrl-single"; > - reg = <0x48002030 0x05cc>; > + reg = <0x48002030 0x0238>; @@ -15,7 +15,7 @@ > + pinctrl-single,function-mask = <0xff1f>; > + }; > + -> + omap3_pmx_core2: pinmux@480025a0 { +> + omap3_pmx_core2: pinmux at 480025a0 { > + compatible = "ti,omap3-padconf", "pinctrl-single"; > + reg = <0x480025a0 0x005c>; > #address-cells = <1>; @@ -59,7 +59,7 @@ Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-By: Sebastian Reichel <sre@debian.org> Signed-off-by: Nishanth Menon <nm@ti.com> -[tony@atomide.com: updated for 3430 vs 3630 core2 based on Nishant's patch] +[tony at atomide.com: updated for 3430 vs 3630 core2 based on Nishant's patch] Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -345,7 +345,7 @@ index daabf99..427395c 100644 +++ b/arch/arm/boot/dts/omap3.dtsi @@ -117,7 +117,7 @@ - omap3_pmx_core: pinmux@48002030 { + omap3_pmx_core: pinmux at 48002030 { compatible = "ti,omap3-padconf", "pinctrl-single"; - reg = <0x48002030 0x05cc>; + reg = <0x48002030 0x0238>; @@ -362,7 +362,7 @@ index 5355d61..77d1246 100644 }; + + ocp { -+ omap3_pmx_core2: pinmux@480025d8 { ++ omap3_pmx_core2: pinmux at 480025d8 { + compatible = "ti,omap3-padconf", "pinctrl-single"; + reg = <0x480025d8 0x24>; + #address-cells = <1>; @@ -383,7 +383,7 @@ index 380c22e..b7c7bd9 100644 clock-frequency = <48000000>; }; + -+ omap3_pmx_core2: pinmux@480025a0 { ++ omap3_pmx_core2: pinmux at 480025a0 { + compatible = "ti,omap3-padconf", "pinctrl-single"; + reg = <0x480025a0 0x5c>; + #address-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 72142ab..2a5159d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01387554677-21100-1-git-send-email-laurent.pinchart@ideasonboard.com\0" "ref\01387554677-21100-3-git-send-email-laurent.pinchart@ideasonboard.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH v2 2/2] ARM: omap3: Split the pinmux core device\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH v2 2/2] ARM: omap3: Split the pinmux core device\0" "Date\0Tue, 7 Jan 2014 14:36:06 -0800\0" - "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - Linus Walleij <linus.walleij@linaro.org> - Sebastian Reichel <sre@debian.org> - " Sakari Ailus <sakari.ailus@iki.fi>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Laurent Pinchart <laurent.pinchart@ideasonboard.com> [131220 07:52]:\n" @@ -17,7 +11,7 @@ "> +++ b/arch/arm/boot/dts/omap3.dtsi\n" "> @@ -117,7 +117,18 @@\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 0x0238>;\n" @@ -29,7 +23,7 @@ "> +\t\t\tpinctrl-single,function-mask = <0xff1f>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tomap3_pmx_core2: pinmux@480025a0 {\n" + "> +\t\tomap3_pmx_core2: pinmux at 480025a0 {\n" "> +\t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "> +\t\t\treg = <0x480025a0 0x005c>;\n" "> \t\t\t#address-cells = <1>;\n" @@ -73,7 +67,7 @@ "Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n" "Acked-By: Sebastian Reichel <sre@debian.org>\n" "Signed-off-by: Nishanth Menon <nm@ti.com>\n" - "[tony@atomide.com: updated for 3430 vs 3630 core2 based on Nishant's patch]\n" + "[tony at atomide.com: updated for 3430 vs 3630 core2 based on Nishant's patch]\n" "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "\n" "diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts\n" @@ -359,7 +353,7 @@ "+++ b/arch/arm/boot/dts/omap3.dtsi\n" "@@ -117,7 +117,7 @@\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 0x0238>;\n" @@ -376,7 +370,7 @@ " \t};\n" "+\n" "+\tocp {\n" - "+\t\tomap3_pmx_core2: pinmux@480025d8 {\n" + "+\t\tomap3_pmx_core2: pinmux at 480025d8 {\n" "+\t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "+\t\t\treg = <0x480025d8 0x24>;\n" "+\t\t\t#address-cells = <1>;\n" @@ -397,7 +391,7 @@ " \t\t\tclock-frequency = <48000000>;\n" " \t\t};\n" "+\n" - "+\t\tomap3_pmx_core2: pinmux@480025a0 {\n" + "+\t\tomap3_pmx_core2: pinmux at 480025a0 {\n" "+\t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "+\t\t\treg = <0x480025a0 0x5c>;\n" "+\t\t\t#address-cells = <1>;\n" @@ -410,4 +404,4 @@ " \t};\n" }; -758b8f5379106aeb43e14dc3e1011a549e9332fecf8c31b68e99610529fd13f4 +8fa26e90026fff0eb98471b73aec227daa9c5e00fe266324818d3d771164948c
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.