Re: [PATCH v6 3/3] ARM: tegra: acer-a500: Add atmel,wakeup-method property

[Thierry Reding]

On Thu, Mar 25, 2021 at 11:15:54AM -0700, Dmitry Torokhov wrote:
> 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@xxxxxxxxx>
> > > 
> > > 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.

Applied to the Tegra tree now.

Thanks,
Thierry

Attachment: signature.asc
Description: PGP signature