diff for duplicates of <535F60D7.1080500@redhat.com> diff --git a/a/1.txt b/N1/1.txt index c08b15f..25b0d2c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ On 04/28/2014 09:32 PM, Maxime Ripard wrote: >> mmc0 is the only controller actually being used on boards, so limit the >> pin-muxing options to that. >> ->> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> arch/arm/boot/dts/sun4i-a10.dtsi | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) @@ -21,14 +21,14 @@ On 04/28/2014 09:32 PM, Maxime Ripard wrote: >> allwinner,pull = <0>; >> }; >> + ->> + mmc0_pins_a: mmc0@0 { +>> + mmc0_pins_a: mmc0 at 0 { >> + allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; >> + allwinner,function = "mmc0"; >> + allwinner,drive = <2>; >> + allwinner,pull = <0>; >> + }; >> + ->> + mmc0_cd_pin_a: mmc0_cd_pin@0 { +>> + mmc0_cd_pin_a: mmc0_cd_pin at 0 { >> + allwinner,pins = "PH1"; >> + allwinner,function = "gpio_in"; >> + allwinner,drive = <0>; diff --git a/a/content_digest b/N1/content_digest index f6acb28..790ac20 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,10 @@ "ref\01398507381-5614-1-git-send-email-hdegoede@redhat.com\0" "ref\01398507381-5614-6-git-send-email-hdegoede@redhat.com\0" "ref\020140428193210.GF3134@lukather\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCH v9 05/17] ARM: dts: sun4i: Add pin-muxing info for the mmc0 controller\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH v9 05/17] ARM: dts: sun4i: Add pin-muxing info for the mmc0 controller\0" "Date\0Tue, 29 Apr 2014 10:20:39 +0200\0" - "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" - "Cc\0Chris Ball <chris-OsFVWbfNK3isTnJN9+BGXg@public.gmane.org>" - Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Emilio Lopez <emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org> - Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org - " David Lanzend\303\266rfer <david.lanzendoerfer-Z7Kmv9EsliU@public.gmane.org>" - linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -25,7 +16,7 @@ ">> mmc0 is the only controller actually being used on boards, so limit the\n" ">> pin-muxing options to that.\n" ">>\n" - ">> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" ">> ---\n" ">> arch/arm/boot/dts/sun4i-a10.dtsi | 14 ++++++++++++++\n" ">> 1 file changed, 14 insertions(+)\n" @@ -39,14 +30,14 @@ ">> \t\t\t\tallwinner,pull = <0>;\n" ">> \t\t\t};\n" ">> +\n" - ">> +\t\t\tmmc0_pins_a: mmc0@0 {\n" + ">> +\t\t\tmmc0_pins_a: mmc0 at 0 {\n" ">> +\t\t\t\tallwinner,pins = \"PF0\",\"PF1\",\"PF2\",\"PF3\",\"PF4\",\"PF5\";\n" ">> +\t\t\t\tallwinner,function = \"mmc0\";\n" ">> +\t\t\t\tallwinner,drive = <2>;\n" ">> +\t\t\t\tallwinner,pull = <0>;\n" ">> +\t\t\t};\n" ">> +\n" - ">> +\t\t\tmmc0_cd_pin_a: mmc0_cd_pin@0 {\n" + ">> +\t\t\tmmc0_cd_pin_a: mmc0_cd_pin at 0 {\n" ">> +\t\t\t\tallwinner,pins = \"PH1\";\n" ">> +\t\t\t\tallwinner,function = \"gpio_in\";\n" ">> +\t\t\t\tallwinner,drive = <0>;\n" @@ -63,4 +54,4 @@ "\n" Hans -c28072c573496e86ebdf7818be6df3dfd604af25a2b25af0d5ed5644befb125d +3300b2f7dc976058d3a897ad244fab4a9b2e0d667116a1f6a4ced4e74ff0fc4a
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.