diff mbox

HID: i2c-hid: Add hid-over-i2c name to i2c id table

Message ID 20160308192539.GA23955@dtor-ws (mailing list archive)
State New, archived
Headers show

Commit Message

Dmitry Torokhov March 8, 2016, 7:25 p.m. UTC
When using the device tree binding OF compatible = "hid-over-i2c" the
i2c id table also needs to have that name in order to auto load this
driver, since i2c core reports module alias as i2c:<string> where
<string> is compatible string of OF binding stripped of manufacturer's
prefix.

Signed-off-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
---
 drivers/hid/i2c-hid/i2c-hid.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Andrew Duggan March 9, 2016, 6:37 p.m. UTC | #1
On Tue, Mar 8, 2016 at 11:25 AM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> When using the device tree binding OF compatible = "hid-over-i2c" the
> i2c id table also needs to have that name in order to auto load this
> driver, since i2c core reports module alias as i2c:<string> where
> <string> is compatible string of OF binding stripped of manufacturer's
> prefix.
>
> Signed-off-by: Benson Leung <bleung@chromium.org>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>

Tested-by: Andrew Duggan <aduggan@synaptics.com>

> ---
>  drivers/hid/i2c-hid/i2c-hid.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
> index b921693..a2c6c98 100644
> --- a/drivers/hid/i2c-hid/i2c-hid.c
> +++ b/drivers/hid/i2c-hid/i2c-hid.c
> @@ -1191,6 +1191,7 @@ static const struct dev_pm_ops i2c_hid_pm = {
>
>  static const struct i2c_device_id i2c_hid_id_table[] = {
>         { "hid", 0 },
> +       { "hid-over-i2c", 0 },
>         { },
>  };
>  MODULE_DEVICE_TABLE(i2c, i2c_hid_id_table);
> --
> 2.7.0.rc3.207.g0ac5344
>
>
> --
> Dmitry
> --
> 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
--
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
Benjamin Tissoires March 9, 2016, 7:50 p.m. UTC | #2
On Mar 08 2016 or thereabouts, Dmitry Torokhov wrote:
> When using the device tree binding OF compatible = "hid-over-i2c" the
> i2c id table also needs to have that name in order to auto load this
> driver, since i2c core reports module alias as i2c:<string> where
> <string> is compatible string of OF binding stripped of manufacturer's
> prefix.

OK, so the story here is during the first submissions, I had something
similar (i2c-hid or so). I was then told that it was not necessary to
use "i2c" in the name given that it was an I2C driver already. But it
looks like when I created the device tree binding, I forgot about it and
messed around a little bit, again.

My apologies, and:
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>.

Would it make sense to remove the other name ("hid") which should have
less compatibility issues (all the users *should* be in the kernel
tree).

Cheers,
Benjamin

> 
> Signed-off-by: Benson Leung <bleung@chromium.org>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> ---
>  drivers/hid/i2c-hid/i2c-hid.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
> index b921693..a2c6c98 100644
> --- a/drivers/hid/i2c-hid/i2c-hid.c
> +++ b/drivers/hid/i2c-hid/i2c-hid.c
> @@ -1191,6 +1191,7 @@ static const struct dev_pm_ops i2c_hid_pm = {
>  
>  static const struct i2c_device_id i2c_hid_id_table[] = {
>  	{ "hid", 0 },
> +	{ "hid-over-i2c", 0 },
>  	{ },
>  };
>  MODULE_DEVICE_TABLE(i2c, i2c_hid_id_table);
> -- 
> 2.7.0.rc3.207.g0ac5344
> 
> 
> -- 
> Dmitry
--
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
Jiri Kosina March 9, 2016, 8:50 p.m. UTC | #3
On Tue, 8 Mar 2016, Dmitry Torokhov wrote:

> When using the device tree binding OF compatible = "hid-over-i2c" the
> i2c id table also needs to have that name in order to auto load this
> driver, since i2c core reports module alias as i2c:<string> where
> <string> is compatible string of OF binding stripped of manufacturer's
> prefix.
> 
> Signed-off-by: Benson Leung <bleung@chromium.org>
> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>

Applied, thanks.
Dmitry Torokhov March 10, 2016, 12:15 a.m. UTC | #4
On Wed, Mar 9, 2016 at 12:50 PM, Jiri Kosina <jikos@kernel.org> wrote:
> On Tue, 8 Mar 2016, Dmitry Torokhov wrote:
>
>> When using the device tree binding OF compatible = "hid-over-i2c" the
>> i2c id table also needs to have that name in order to auto load this
>> driver, since i2c core reports module alias as i2c:<string> where
>> <string> is compatible string of OF binding stripped of manufacturer's
>> prefix.
>>
>> Signed-off-by: Benson Leung <bleung@chromium.org>
>> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
>
> Applied, thanks.

Crap, can you change author on this to "Benson Leung
<bleung@chromium.org>" and on "HID: i2c-hid: Fix suspend/resume when
already runtime suspended" to "Doug Anderson <dianders@chromium.org>"?

I need to fix my script...

Thanks.
Jiri Kosina March 10, 2016, 9:05 a.m. UTC | #5
On Wed, 9 Mar 2016, Dmitry Torokhov wrote:

> >> When using the device tree binding OF compatible = "hid-over-i2c" the
> >> i2c id table also needs to have that name in order to auto load this
> >> driver, since i2c core reports module alias as i2c:<string> where
> >> <string> is compatible string of OF binding stripped of manufacturer's
> >> prefix.
> >>
> >> Signed-off-by: Benson Leung <bleung@chromium.org>
> >> Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
> >
> > Applied, thanks.
> 
> Crap, can you change author on this to "Benson Leung
> <bleung@chromium.org>" and on "HID: i2c-hid: Fix suspend/resume when
> already runtime suspended" to "Doug Anderson <dianders@chromium.org>"?
> 
> I need to fix my script...

Alright, this is one of the rare ocasions where I believe that rebase of a 
public git tree is justifiable. I've just fixed the commits and pushed out 
the new branches.

Thanks,
diff mbox

Patch

diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index b921693..a2c6c98 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -1191,6 +1191,7 @@  static const struct dev_pm_ops i2c_hid_pm = {
 
 static const struct i2c_device_id i2c_hid_id_table[] = {
 	{ "hid", 0 },
+	{ "hid-over-i2c", 0 },
 	{ },
 };
 MODULE_DEVICE_TABLE(i2c, i2c_hid_id_table);