diff for duplicates of <20150731101108.GC2564@lukather> diff --git a/a/1.txt b/N1/1.txt index 4d707f1..413e4a2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On Fri, Jul 31, 2015 at 10:59:51AM +0200, Hans de Goede wrote: > enough to make vbus-det always report 1, so we do not use vbus-det on > this board. > -> Signed-off-by: Hans de Goede <hdegoede@redhat.com> +> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > --- > arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 30 +++++++++++++++++++++++- > 1 file changed, 29 insertions(+), 1 deletion(-) @@ -24,14 +24,14 @@ On Fri, Jul 31, 2015 at 10:59:51AM +0200, Hans de Goede wrote: > +}; > + > &pio { -> mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin at 0 { +> mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 { > allwinner,pins = "PG1"; > @@ -224,6 +228,22 @@ > allwinner,drive = <SUN4I_PINCTRL_10_MA>; > allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > }; > + -> + usb0_vbus_pin_a: usb0_vbus_pin at 0 { +> + usb0_vbus_pin_a: usb0_vbus_pin@0 { > + allwinner,pins = "PG11"; > + }; @@ -48,10 +48,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/20150731/e3a5ee3e/attachment-0001.sig> diff --git a/a/content_digest b/N1/content_digest index fafb5d8..4d0ebf1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,14 @@ "ref\01438333194-21181-1-git-send-email-hdegoede@redhat.com\0" "ref\01438333194-21181-3-git-send-email-hdegoede@redhat.com\0" - "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" - "Subject\0[PATCH 2/5] ARM: dts: sun5i: Enable USB DRC on A10s OLinuxIno Micro\0" + "ref\01438333194-21181-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 2/5] ARM: dts: sun5i: Enable USB DRC on A10s OLinuxIno Micro\0" "Date\0Fri, 31 Jul 2015 12:11:08 +0200\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\0linux-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, Jul 31, 2015 at 10:59:51AM +0200, Hans de Goede wrote:\n" "> Enable the otg/drc usb controller on the A10s OLinuxIno Micro.\n" @@ -14,7 +18,7 @@ "> enough to make vbus-det always report 1, so we do not use vbus-det on\n" "> this board.\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" "> arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 30 +++++++++++++++++++++++-\n" "> 1 file changed, 29 insertions(+), 1 deletion(-)\n" @@ -32,14 +36,14 @@ "> +};\n" "> +\n" "> &pio {\n" - "> \tmmc0_cd_pin_olinuxino_micro: mmc0_cd_pin at 0 {\n" + "> \tmmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {\n" "> \t\tallwinner,pins = \"PG1\";\n" "> @@ -224,6 +228,22 @@\n" "> \t\tallwinner,drive = <SUN4I_PINCTRL_10_MA>;\n" "> \t\tallwinner,pull = <SUN4I_PINCTRL_NO_PULL>;\n" "> \t};\n" "> +\n" - "> +\tusb0_vbus_pin_a: usb0_vbus_pin at 0 {\n" + "> +\tusb0_vbus_pin_a: usb0_vbus_pin@0 {\n" "> +\t\tallwinner,pins = \"PG11\";\n" "> +\t};\n" "\n" @@ -55,13 +59,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/20150731/e3a5ee3e/attachment-0001.sig> + http://free-electrons.com -744b9bde1a58457396404f17c6ef4166de53e8367f9ed787755e9884d85048d3 +128daf629e9042264aee65433fd876465c3fc86ac06f2622227532a5d3816f60
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.