diff for duplicates of <20151120164109.GI32142@lukather> diff --git a/a/1.txt b/N1/1.txt index 4de257a..dac9faa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Fri, Nov 20, 2015 at 02:59:09PM +0100, Hans de Goede wrote: > Add a node describing the lcd panel backlight on the pov protab2 ips9 > tablet. > -> Signed-off-by: Hans de Goede <hdegoede@redhat.com> +> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Fixed the conflict and applied. Thanks, @@ -45,14 +45,14 @@ Maxime > }; > > &pio { -> + bl_en_pin_protab: bl_en_pin at 0 { +> + bl_en_pin_protab: bl_en_pin@0 { > + allwinner,pins = "PH7"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + -> touchscreen_pins: touchscreen_pins at 0 { +> touchscreen_pins: touchscreen_pins@0 { > allwinner,pins = "PA5", "PB13"; > allwinner,function = "gpio_out"; > @@ -167,6 +185,12 @@ @@ -76,10 +76,3 @@ Maxime Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --------------- next part -------------- -A non-text attachment was scrubbed... -Name: signature.asc -Type: application/pgp-signature -Size: 819 bytes -Desc: Digital signature -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151120/838307c1/attachment-0001.sig> diff --git a/a/content_digest b/N1/content_digest index 1b289bd..57400d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,21 @@ "ref\01448027950-14629-1-git-send-email-hdegoede@redhat.com\0" "ref\01448027950-14629-3-git-send-email-hdegoede@redhat.com\0" - "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" - "Subject\0[PATCH 3/4] ARM: dts: sun4i: Add backlight node to pov protab2 ips9 tablet\0" + "ref\01448027950-14629-3-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org\0" + "From\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [PATCH 3/4] ARM: dts: sun4i: Add backlight node to pov protab2 ips9 tablet\0" "Date\0Fri, 20 Nov 2015 17:41:09 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "Cc\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" + "\01:1\0" "b\0" "On Fri, Nov 20, 2015 at 02:59:09PM +0100, Hans de Goede wrote:\n" "> Add a node describing the lcd panel backlight on the pov protab2 ips9\n" "> tablet.\n" "> \n" - "> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" + "> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" "\n" "Fixed the conflict and applied. Thanks,\n" "\n" @@ -53,14 +58,14 @@ "> };\n" "> \n" "> &pio {\n" - "> +\tbl_en_pin_protab: bl_en_pin at 0 {\n" + "> +\tbl_en_pin_protab: bl_en_pin@0 {\n" "> +\t\tallwinner,pins = \"PH7\";\n" "> +\t\tallwinner,function = \"gpio_out\";\n" "> +\t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> +\t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> +\t};\n" "> +\n" - "> \ttouchscreen_pins: touchscreen_pins at 0 {\n" + "> \ttouchscreen_pins: touchscreen_pins@0 {\n" "> \t\tallwinner,pins = \"PA5\", \"PB13\";\n" "> \t\tallwinner,function = \"gpio_out\";\n" "> @@ -167,6 +185,12 @@\n" @@ -83,13 +88,6 @@ "-- \n" "Maxime Ripard, Free Electrons\n" "Embedded Linux, Kernel and Android engineering\n" - "http://free-electrons.com\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: signature.asc\n" - "Type: application/pgp-signature\n" - "Size: 819 bytes\n" - "Desc: Digital signature\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151120/838307c1/attachment-0001.sig> + http://free-electrons.com -28049977c05e3d4260f80bcfddc3d39f14add5a6540afbdf9e981fea49b89603 +5126681c27d82bf329154ad5fc19536007984dc4044eaab9de081fb958d04e0d
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.