diff mbox

synaptics: fix rmi4 bus dependencies

Message ID 20180102191609.21460-1-mcroce@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Matteo Croce Jan. 2, 2018, 7:16 p.m. UTC
Make MOUSE_PS2_SYNAPTICS_SMBUS select MOUSE_PS2_SYNAPTICS because if
the latter is disabled the detection and switching code isn't being run.

Signed-off-by: Matteo Croce <mcroce@redhat.com>
---
 drivers/input/mouse/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Dmitry Torokhov Jan. 2, 2018, 7:21 p.m. UTC | #1
On Tue, Jan 02, 2018 at 08:16:09PM +0100, Matteo Croce wrote:
> Make MOUSE_PS2_SYNAPTICS_SMBUS select MOUSE_PS2_SYNAPTICS because if
> the latter is disabled the detection and switching code isn't being run.

Hmm, it should. In synaptics.c:

#if defined(CONFIG_MOUSE_PS2_SYNAPTICS) || \
    defined(CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS)

int synaptics_init(struct psmouse *psmouse)
{
	struct synaptics_device_info info;
	int error;
	int retval;

	psmouse_reset(psmouse);
...
}

The intent was to allow disabling the PS/2 portion of Synaptics driver
while retaining the switching to SMbus capability.

Thanks.

> 
> Signed-off-by: Matteo Croce <mcroce@redhat.com>
> ---
>  drivers/input/mouse/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
> index 89ebb8f39fee..77a0bcb611a4 100644
> --- a/drivers/input/mouse/Kconfig
> +++ b/drivers/input/mouse/Kconfig
> @@ -83,6 +83,7 @@ config MOUSE_PS2_SYNAPTICS_SMBUS
>  	default y
>  	depends on MOUSE_PS2
>  	depends on I2C=y || I2C=MOUSE_PS2
> +	select MOUSE_PS2_SYNAPTICS
>  	select MOUSE_PS2_SMBUS
>  	help
>  	  Say Y here if you have a Synaptics RMI4 touchpad connected to
> -- 
> 2.14.3
>
Andrew Duggan Jan. 2, 2018, 7:37 p.m. UTC | #2
On 01/02/2018 11:21 AM, Dmitry Torokhov wrote:
> On Tue, Jan 02, 2018 at 08:16:09PM +0100, Matteo Croce wrote:
>> Make MOUSE_PS2_SYNAPTICS_SMBUS select MOUSE_PS2_SYNAPTICS because if
>> the latter is disabled the detection and switching code isn't being run.
> Hmm, it should. In synaptics.c:
>
> #if defined(CONFIG_MOUSE_PS2_SYNAPTICS) || \
>      defined(CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS)
>
> int synaptics_init(struct psmouse *psmouse)
> {
> 	struct synaptics_device_info info;
> 	int error;
> 	int retval;
>
> 	psmouse_reset(psmouse);
> ...
> }
>
> The intent was to allow disabling the PS/2 portion of Synaptics driver
> while retaining the switching to SMbus capability.

Oh, I suggested to Matteo that this patch might be needed off list. I 
clearly didn't look closely enough to see that MOUSE_PS2_SYNAPTICS_SMBUS 
is intended to be able to be used independently of MOUSE_PS2_SYNAPTICS.

However, he did seem to see behavior where the mode switch did not occur 
when MOUSE_PS2_SYNAPTICS was disabled, but MOUSE_PS2_SYNAPTICS_SMBUS was 
enabled. That will need to be investigated further.

Andrew

> Thanks.
>
>> Signed-off-by: Matteo Croce <mcroce@redhat.com>
>> ---
>>   drivers/input/mouse/Kconfig | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
>> index 89ebb8f39fee..77a0bcb611a4 100644
>> --- a/drivers/input/mouse/Kconfig
>> +++ b/drivers/input/mouse/Kconfig
>> @@ -83,6 +83,7 @@ config MOUSE_PS2_SYNAPTICS_SMBUS
>>   	default y
>>   	depends on MOUSE_PS2
>>   	depends on I2C=y || I2C=MOUSE_PS2
>> +	select MOUSE_PS2_SYNAPTICS
>>   	select MOUSE_PS2_SMBUS
>>   	help
>>   	  Say Y here if you have a Synaptics RMI4 touchpad connected to
>> -- 
>> 2.14.3
>>

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 89ebb8f39fee..77a0bcb611a4 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -83,6 +83,7 @@  config MOUSE_PS2_SYNAPTICS_SMBUS
 	default y
 	depends on MOUSE_PS2
 	depends on I2C=y || I2C=MOUSE_PS2
+	select MOUSE_PS2_SYNAPTICS
 	select MOUSE_PS2_SMBUS
 	help
 	  Say Y here if you have a Synaptics RMI4 touchpad connected to