Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 25 Mar 2021 15:10:25 +0100
From:   Thierry Reding <thierry.reding@gmail.com>
To:     Dmitry Torokhov <dmitry.torokhov@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
Message-ID: <YFyZ0ejrSxWc3JZT@orome.fritz.box>
References: <20210302102158.10533-1-digetx@gmail.com>
 <20210302102158.10533-4-digetx@gmail.com>
 <YFfLXLDIuRdj2bWs@google.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="JZH7iAiIxO3WXnjv"
Content-Disposition: inline
In-Reply-To: <YFfLXLDIuRdj2bWs@google.com>
User-Agent: Mutt/2.0.6 (98f8cb83) (2021-03-06)
Precedence: bulk


--JZH7iAiIxO3WXnjv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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 control=
ler
> > 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.
> >=20
> > Add atmel,wakeup-method property to the touchscreen node.
> >=20
> > Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
>=20
> 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.

Thierry

--JZH7iAiIxO3WXnjv
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmBcmdEACgkQ3SOs138+
s6HM1hAAv6/5w7f5FRWHIHF5G+bDGgIf2T9Bf6XOXEaLGpXdXYQjypKwmY9bZ2tg
ksZQ5Bo4Yf0lFKOfFRVJq8yrxYXGzrA2lj28RHOAgs8H6+KKw04/WIAv+/ySLeUl
w2fYrmlTlu6SEdMC0mpEhtB1nZcJFIZNOs2Yb1wBeh3bfUDcSt14vDcYxryUn57r
KV3jt5+djsRYkpp+uf6vQe1/YGoSnqSbWjKb4zpaF0YTK/FkHZfq3/p91F2YbiEi
3Ru+tB2W1AGoP+z5t/HL0qW2bnCssosm6vfZkO78L/zjagSVSIYshIYMLjVyczKv
4axWH0LRIcEKben0NczDyXjU+oN2gbDAeay7RYmpLM11HzjSpVWVmhHT27z1lIw1
tMKMCceERaqWJclInwv/62mv8rLs3QsyefzZEUQe039MgMzFTZBT4WYt+42qG6Fs
ZseZ/2ujdvXsTnwiMbjqxD1jBQCUchStvKLcXH8rHWE82QrwjulTxElAyAJ6LGJw
u3dN85bhfYQdry7TR9V5+zDHPabkJddVzb8BaHrJbjbbH2mLsk8RZOeJ6LjhKfDK
z6TnRacuY1E7li6BDaHbgCayUqRiDbhxfi90l88+Y7qIT2fPvlpwe4+gpp8llIsM
7jd6hNl19c6C66EsO9vAD5xBUz7ub283rbp1umk3vol8LbToUOc=
=RvcD
-----END PGP SIGNATURE-----

--JZH7iAiIxO3WXnjv--