From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] Input: synaptics - warn the users when there is a better mode
Date: Tue, 30 May 2017 10:16:06 +0200 [thread overview]
Message-ID: <20170530081606.GA1293@mail.corp.redhat.com> (raw)
In-Reply-To: <20170530031755.GF32841@dtor-ws>
On May 29 2017 or thereabouts, Dmitry Torokhov wrote:
> On Tue, May 23, 2017 at 02:20:51PM -0700, Dmitry Torokhov wrote:
> > On Tue, May 23, 2017 at 10:36:56AM +0200, Benjamin Tissoires wrote:
> > > The Synaptics touchpads are now either using i2c-hid or rmi-smbus.
> > > Warn the users if they are missing the rmi-smbus modules and have no
> > > chance of reporting correct data.
> > >
> > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> > > ---
> > > drivers/input/mouse/synaptics.c | 4 ++++
> > > 1 file changed, 4 insertions(+)
> > >
> > > diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
> > > index 58ff388..fc42259 100644
> > > --- a/drivers/input/mouse/synaptics.c
> > > +++ b/drivers/input/mouse/synaptics.c
> > > @@ -1814,6 +1814,10 @@ int synaptics_init(struct psmouse *psmouse)
> > > }
> > >
> > > if (SYN_CAP_INTERTOUCH(info.ext_cap_0c)) {
> > > +#if !IS_ENABLED(CONFIG_RMI4_SMB) || !defined(CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS)
> > > + psmouse_warn(psmouse, "The touchpad can support a better bus than the too old PS/2 protocol.\n"
> > > + "Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience.\n");
> > > +#endif
> >
> > I'll pull the checks into "if" to avoid preprocessor and also add checks
> > for forcepad PNP IDs as forcepads are not usable with RMI at the moment
> > since they need F21.
>
> I made the changes I mentioned and pushed to my for-linus branch, please
> take a peek and yell if I screwed up.
Looks good to me, thanks!
Cheers,
Benjamin
>
> >
> > > error = synaptics_setup_intertouch(psmouse, &info, true);
> > > if (!error)
> > > return PSMOUSE_SYNAPTICS_SMBUS;
> > > --
> > > 2.9.4
> > >
> >
> > Thanks.
> >
> > --
> > Dmitry
>
> --
> Dmitry
next prev parent reply other threads:[~2017-05-30 8:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 8:36 [PATCH 1/3] Input: synaptics - keep PS/2 around when RMI4_SMB is not compiled in Benjamin Tissoires
2017-05-23 8:36 ` [PATCH 2/3] Input: synaptics - warn the users when there is a better mode Benjamin Tissoires
2017-05-23 21:20 ` Dmitry Torokhov
2017-05-30 3:17 ` Dmitry Torokhov
2017-05-30 8:16 ` Benjamin Tissoires [this message]
2017-05-23 8:36 ` [PATCH 3/3] Input: synaptics - tell users to report when they should be using rmi-smbus Benjamin Tissoires
2017-05-23 21:18 ` [PATCH 1/3] Input: synaptics - keep PS/2 around when RMI4_SMB is not compiled in Dmitry Torokhov
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=20170530081606.GA1293@mail.corp.redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).