diff for duplicates of <512E86F4.6000909@wwwdotorg.org> diff --git a/a/1.txt b/N1/1.txt index c91cd10..d0096aa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,14 +23,14 @@ various DT files in a single patch. > diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi > +/* -> gpio: gpio-controller at d8110000 { +> gpio: gpio-controller@d8110000 { > compatible = "wm,wm8650-gpio"; > gpio-controller; > reg = <0xd8110000 0x10000>; > #gpio-cells = <3>; > }; > +*/ -> + pinmux: pinmux at d8110000 { +> + pinmux: pinmux@d8110000 { > + compatible = "wm,wm8850-gpio"; > + reg = <0xd8110000 0x10000>; > + }; diff --git a/a/content_digest b/N1/content_digest index 5802f6c..69112a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,13 @@ "ref\01360896534-20637-1-git-send-email-linux@prisktech.co.nz\0" "ref\01360896534-20637-2-git-send-email-linux@prisktech.co.nz\0" - "From\0swarren@wwwdotorg.org (Stephen Warren)\0" - "Subject\0[PATCH] pinctrl: gpio: vt8500: Add pin control driver for Wondermedia SoCs\0" + "From\0Stephen Warren <swarren@wwwdotorg.org>\0" + "Subject\0Re: [PATCH] pinctrl: gpio: vt8500: Add pin control driver for Wondermedia SoCs\0" "Date\0Wed, 27 Feb 2013 15:21:40 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Tony Prisk <linux@prisktech.co.nz>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + grant.likely@secretlab.ca + linus.walleij@linaro.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 02/14/2013 07:48 PM, Tony Prisk wrote:\n" @@ -31,14 +35,14 @@ "> diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi\n" "\n" "> +/*\n" - "> \t\tgpio: gpio-controller at d8110000 {\n" + "> \t\tgpio: gpio-controller@d8110000 {\n" "> \t\t\tcompatible = \"wm,wm8650-gpio\";\n" "> \t\t\tgpio-controller;\n" "> \t\t\treg = <0xd8110000 0x10000>;\n" "> \t\t\t#gpio-cells = <3>;\n" "> \t\t};\n" "> +*/\n" - "> +\t\tpinmux: pinmux at d8110000 {\n" + "> +\t\tpinmux: pinmux@d8110000 {\n" "> +\t\t\tcompatible = \"wm,wm8850-gpio\";\n" "> +\t\t\treg = <0xd8110000 0x10000>;\n" "> +\t\t};\n" @@ -146,4 +150,4 @@ "\n" Nit: I'm never really sure that's useful. -1541ec212a1b251b1b422239832f901c9af363b3c4a5ddc31a6ce646aa543a57 +acbdd4e555ac87158a3fdce70bfdf4697d524cb4f2e60d67eb0c56fe0781b7a2
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.