| Message ID | 20210302102158.10533-4-digetx@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f0a77ed9080a39a75faecff53fa37b3328926421 |
| Headers | show |
| Series | Support wakeup methods of Atmel maXTouch controllers | expand |
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.
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. Thierry
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.
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@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. Applied to the Tegra tree now. Thanks, Thierry
diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts index d3b99535d755..40c1bab22155 100644 --- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; +#include <dt-bindings/input/atmel-maxtouch.h> #include <dt-bindings/input/gpio-keys.h> #include <dt-bindings/input/input.h> #include <dt-bindings/thermal/thermal.h> @@ -450,6 +451,8 @@ touchscreen@4c { avdd-supply = <&vdd_3v3_sys>; vdd-supply = <&vdd_3v3_sys>; + + atmel,wakeup-method = <ATMEL_MXT_WAKEUP_I2C_SCL>; }; gyroscope@68 {
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> --- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 3 +++ 1 file changed, 3 insertions(+)