diff for duplicates of <572B7D48.6010807@nvidia.com> diff --git a/a/1.txt b/N1/1.txt index 78bf9ba..2df6f54 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On 04/05/16 15:40, Thierry Reding wrote: -> From: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> +> From: Thierry Reding <treding@nvidia.com> > > Starting with commit 0b52297f2288 ("reset: Add support for shared reset > controls") there is a reference count for reset control assertions. The @@ -53,9 +53,9 @@ On 04/05/16 15:40, Thierry Reding wrote: > Work around this by making sure we reuse the controller's reset if the > controller happens to be the first controller. > -> Cc: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> -> Cc: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> -> Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> +> Cc: Philipp Zabel <p.zabel@pengutronix.de> +> Cc: Hans de Goede <hdegoede@redhat.com> +> Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > Changes in v3: > - reword commit message to more accurately describe the hardware design @@ -157,3 +157,23 @@ index c1c1024a054c..70501053e1ec 100644 reset_control_deassert(usb1_reset); + reset_control_put(usb1_reset); } +- +- reset_control_put(usb1_reset); +- usb1_reset_attempted = true; + } + +- if (!of_property_read_bool(phy_np, "nvidia,has-utmi-pad-registers")) { +- reset_control_assert(tegra->rst); +- udelay(1); +- reset_control_deassert(tegra->rst); +- } ++ reset_control_assert(tegra->rst); ++ udelay(1); ++ reset_control_deassert(tegra->rst); ++ ++ usb1_reset_attempted = true; + ++out: + of_node_put(phy_np); + + return 0; diff --git a/a/content_digest b/N1/content_digest index 7424ba0..8a77a72 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,23 @@ "ref\01462372800-30900-1-git-send-email-thierry.reding@gmail.com\0" "ref\01462372800-30900-2-git-send-email-thierry.reding@gmail.com\0" - "ref\01462372800-30900-2-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" - "From\0Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" + "From\0Jon Hunter <jonathanh@nvidia.com>\0" "Subject\0Re: [PATCH v3 2/2] usb: host: ehci-tegra: Avoid getting the same reset twice\0" "Date\0Thu, 5 May 2016 18:05:12 +0100\0" - "To\0Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" - Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org> - " Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>\0" - "Cc\0Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>" - Alexandre Courbot <gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - " Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "To\0Thierry Reding <thierry.reding@gmail.com>" + Alan Stern <stern@rowland.harvard.edu> + " Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" + "Cc\0Stephen Warren <swarren@wwwdotorg.org>" + Alexandre Courbot <gnurou@gmail.com> + <linux-usb@vger.kernel.org> + <linux-tegra@vger.kernel.org> + <linux-kernel@vger.kernel.org> + Philipp Zabel <p.zabel@pengutronix.de> + " Hans de Goede <hdegoede@redhat.com>\0" "\00:1\0" "b\0" "\n" "On 04/05/16 15:40, Thierry Reding wrote:\n" - "> From: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" + "> From: Thierry Reding <treding@nvidia.com>\n" "> \n" "> Starting with commit 0b52297f2288 (\"reset: Add support for shared reset\n" "> controls\") there is a reference count for reset control assertions. The\n" @@ -71,9 +70,9 @@ "> Work around this by making sure we reuse the controller's reset if the\n" "> controller happens to be the first controller.\n" "> \n" - "> Cc: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" - "> Cc: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" - "> Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" + "> Cc: Philipp Zabel <p.zabel@pengutronix.de>\n" + "> Cc: Hans de Goede <hdegoede@redhat.com>\n" + "> Signed-off-by: Thierry Reding <treding@nvidia.com>\n" "> ---\n" "> Changes in v3:\n" "> - reword commit message to more accurately describe the hardware design\n" @@ -174,6 +173,26 @@ " udelay(1);\n" " reset_control_deassert(usb1_reset);\n" "+ reset_control_put(usb1_reset);\n" - } + " }\n" + "-\n" + "- reset_control_put(usb1_reset);\n" + "- usb1_reset_attempted = true;\n" + " }\n" + " \n" + "- if (!of_property_read_bool(phy_np, \"nvidia,has-utmi-pad-registers\")) {\n" + "- reset_control_assert(tegra->rst);\n" + "- udelay(1);\n" + "- reset_control_deassert(tegra->rst);\n" + "- }\n" + "+ reset_control_assert(tegra->rst);\n" + "+ udelay(1);\n" + "+ reset_control_deassert(tegra->rst);\n" + "+\n" + "+ usb1_reset_attempted = true;\n" + " \n" + "+out:\n" + " of_node_put(phy_np);\n" + " \n" + return 0; -c618dbdf444f51cae77c6bb1683e0625d0227d26adc0bfc41a410aa4f1464010 +99397c38cdd0f83c79e0a63bb4b5fd08e1f99cb2a9d8c2ccc9097b2db57033c5
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.