From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Dmitry Osipenko <digetx@gmail.com>,
Nick Dyer <nick@shmanahar.org>, Rob Herring <robh+dt@kernel.org>,
Jonathan Hunter <jonathanh@nvidia.com>,
Linus Walleij <linus.walleij@linaro.org>,
Jiada Wang <jiada_wang@mentor.com>,
linux-input@vger.kernel.org, devicetree@vger.kernel.org,
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v6 3/3] ARM: tegra: acer-a500: Add atmel,wakeup-method property
Date: Thu, 25 Mar 2021 11:15:54 -0700 [thread overview]
Message-ID: <YFzTWuUZbdXvnpHC@google.com> (raw)
In-Reply-To: <YFyZ0ejrSxWc3JZT@orome.fritz.box>
On Thu, Mar 25, 2021 at 03:10:25PM +0100, Thierry Reding wrote:
> On Sun, Mar 21, 2021 at 03:40:28PM -0700, Dmitry Torokhov wrote:
> > On Tue, Mar 02, 2021 at 01:21:58PM +0300, Dmitry Osipenko wrote:
> > > Acer A500 uses Atmel Maxtouch 1386 touchscreen controller. This controller
> > > has WAKE line which could be connected to I2C clock lane, dedicated GPIO
> > > or fixed to HIGH level. Controller wakes up from a deep sleep when WAKE
> > > line is asserted low. Acer A500 has WAKE line connected to I2C clock and
> > > Linux device driver doesn't work property without knowing what wakeup
> > > method is used by h/w.
> > >
> > > Add atmel,wakeup-method property to the touchscreen node.
> > >
> > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> >
> > Applied, thank you.
>
> I noticed that you had applied this as I was applying a different patch
> that touches the same area and it causes a conflict. In general I prefer
> to pick up all device tree changes into the Tegra tree, specifically to
> avoid such conflicts.
>
> That said, I didn't see an email from Stephen about this causing a
> conflict in linux-next, so perhaps it's fine. If this pops up again it
> might be worth considering to drop this from your tree so that I can
> resolve the conflict in the Tegra tree.
Sorry about that, I went ahead and dropped the patch from my branch.
Thanks.
--
Dmitry
next prev parent reply other threads:[~2021-03-25 18:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 10:21 [PATCH v6 0/3] Support wakeup methods of Atmel maXTouch controllers Dmitry Osipenko
2021-03-02 10:21 ` [PATCH v6 1/3] dt-bindings: input: atmel_mxt_ts: Document atmel,wakeup-method and WAKE line GPIO Dmitry Osipenko
2021-03-21 22:40 ` Dmitry Torokhov
2021-03-02 10:21 ` [PATCH v6 2/3] Input: atmel_mxt_ts - support wakeup methods Dmitry Osipenko
2021-03-21 22:40 ` Dmitry Torokhov
2021-03-02 10:21 ` [PATCH v6 3/3] ARM: tegra: acer-a500: Add atmel,wakeup-method property Dmitry Osipenko
2021-03-21 22:40 ` Dmitry Torokhov
2021-03-25 14:10 ` Thierry Reding
2021-03-25 18:15 ` Dmitry Torokhov [this message]
2021-03-26 12:21 ` Thierry Reding
2021-03-20 16:02 ` [PATCH v6 0/3] Support wakeup methods of Atmel maXTouch controllers Dmitry Osipenko
2021-03-21 22:44 ` Dmitry Torokhov
2021-03-21 23:08 ` Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YFzTWuUZbdXvnpHC@google.com \
--to=dmitry.torokhov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=digetx@gmail.com \
--cc=jiada_wang@mentor.com \
--cc=jonathanh@nvidia.com \
--cc=linus.walleij@linaro.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=nick@shmanahar.org \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).