HID: remove ThingM blink(1) driver
Now that support for ThingM blink(1) was merged into the hid-led driver the dedicated driver for this device can be removed. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Acked-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Heiner Kallweit
Jiri Kosina
parent
007414e8fb
commit
38b09c030b
@ -11042,11 +11042,6 @@ F: Documentation/thermal/cpu-cooling-api.txt
|
||||
F: drivers/thermal/cpu_cooling.c
|
||||
F: include/linux/cpu_cooling.h
|
||||
|
||||
THINGM BLINK(1) USB RGB LED DRIVER
|
||||
M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
||||
S: Maintained
|
||||
F: drivers/hid/hid-thingm.c
|
||||
|
||||
THINKPAD ACPI EXTRAS DRIVER
|
||||
M: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
|
||||
L: ibm-acpi-devel@lists.sourceforge.net
|
||||
|
||||
@ -832,11 +832,11 @@ config HID_THINGM
|
||||
tristate "ThingM blink(1) USB RGB LED"
|
||||
depends on HID
|
||||
depends on LEDS_CLASS
|
||||
select HID_LED
|
||||
---help---
|
||||
Support for the ThingM blink(1) USB RGB LED. This driver registers a
|
||||
Linux LED class instance, plus additional sysfs attributes to control
|
||||
RGB colors, fade time and playing. The device is exposed through hidraw
|
||||
to access other functions.
|
||||
Support for the ThingM blink(1) USB RGB LED. This driver has been
|
||||
merged into the generic hid led driver. Config symbol HID_THINGM
|
||||
just selects HID_LED and will be removed soon.
|
||||
|
||||
config HID_THRUSTMASTER
|
||||
tristate "ThrustMaster devices support"
|
||||
|
||||
@ -90,7 +90,6 @@ obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o
|
||||
obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
|
||||
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
|
||||
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
|
||||
obj-$(CONFIG_HID_THINGM) += hid-thingm.o
|
||||
obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
|
||||
obj-$(CONFIG_HID_TIVO) += hid-tivo.o
|
||||
obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o
|
||||
|
||||
@ -1,263 +0,0 @@
|
||||
/*
|
||||
* ThingM blink(1) USB RGB LED driver
|
||||
*
|
||||
* Copyright 2013-2014 Savoir-faire Linux Inc.
|
||||
* Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation, version 2.
|
||||
*/
|
||||
|
||||
#include <linux/hid.h>
|
||||
#include <linux/hidraw.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#include "hid-ids.h"
|
||||
|
||||
#define REPORT_ID 1
|
||||
#define REPORT_SIZE 9
|
||||
|
||||
/* Firmware major number of supported devices */
|
||||
#define THINGM_MAJOR_MK1 '1'
|
||||
#define THINGM_MAJOR_MK2 '2'
|
||||
|
||||
struct thingm_fwinfo {
|
||||
char major;
|
||||
unsigned numrgb;
|
||||
unsigned first;
|
||||
};
|
||||
|
||||
static const struct thingm_fwinfo thingm_fwinfo[] = {
|
||||
{
|
||||
.major = THINGM_MAJOR_MK1,
|
||||
.numrgb = 1,
|
||||
.first = 0,
|
||||
}, {
|
||||
.major = THINGM_MAJOR_MK2,
|
||||
.numrgb = 2,
|
||||
.first = 1,
|
||||
}
|
||||
};
|
||||
|
||||
/* A red, green or blue channel, part of an RGB chip */
|
||||
struct thingm_led {
|
||||
struct thingm_rgb *rgb;
|
||||
struct led_classdev ldev;
|
||||
char name[32];
|
||||
};
|
||||
|
||||
/* Basically a WS2812 5050 RGB LED chip */
|
||||
struct thingm_rgb {
|
||||
struct thingm_device *tdev;
|
||||
struct thingm_led red;
|
||||
struct thingm_led green;
|
||||
struct thingm_led blue;
|
||||
u8 num;
|
||||
};
|
||||
|
||||
struct thingm_device {
|
||||
struct hid_device *hdev;
|
||||
struct {
|
||||
char major;
|
||||
char minor;
|
||||
} version;
|
||||
const struct thingm_fwinfo *fwinfo;
|
||||
struct mutex lock;
|
||||
struct thingm_rgb *rgb;
|
||||
};
|
||||
|
||||
static int thingm_send(struct thingm_device *tdev, u8 buf[REPORT_SIZE])
|
||||
{
|
||||
int ret;
|
||||
|
||||
hid_dbg(tdev->hdev, "-> %d %c %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx\n",
|
||||
buf[0], buf[1], buf[2], buf[3], buf[4],
|
||||
buf[5], buf[6], buf[7], buf[8]);
|
||||
|
||||
mutex_lock(&tdev->lock);
|
||||
|
||||
ret = hid_hw_raw_request(tdev->hdev, buf[0], buf, REPORT_SIZE,
|
||||
HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
|
||||
|
||||
mutex_unlock(&tdev->lock);
|
||||
|
||||
return ret < 0 ? ret : 0;
|
||||
}
|
||||
|
||||
static int thingm_recv(struct thingm_device *tdev, u8 buf[REPORT_SIZE])
|
||||
{
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* A read consists of two operations: sending the read command
|
||||
* and the actual read from the device. Use the mutex to protect
|
||||
* the full sequence of both operations.
|
||||
*/
|
||||
mutex_lock(&tdev->lock);
|
||||
|
||||
ret = hid_hw_raw_request(tdev->hdev, buf[0], buf, REPORT_SIZE,
|
||||
HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
ret = hid_hw_raw_request(tdev->hdev, buf[0], buf, REPORT_SIZE,
|
||||
HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
ret = 0;
|
||||
|
||||
hid_dbg(tdev->hdev, "<- %d %c %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx\n",
|
||||
buf[0], buf[1], buf[2], buf[3], buf[4],
|
||||
buf[5], buf[6], buf[7], buf[8]);
|
||||
err:
|
||||
mutex_unlock(&tdev->lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int thingm_version(struct thingm_device *tdev)
|
||||
{
|
||||
u8 buf[REPORT_SIZE] = { REPORT_ID, 'v', 0, 0, 0, 0, 0, 0, 0 };
|
||||
int err;
|
||||
|
||||
err = thingm_recv(tdev, buf);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
tdev->version.major = buf[3];
|
||||
tdev->version.minor = buf[4];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thingm_write_color(struct thingm_rgb *rgb)
|
||||
{
|
||||
u8 buf[REPORT_SIZE] = { REPORT_ID, 'c', 0, 0, 0, 0, 0, rgb->num, 0 };
|
||||
|
||||
buf[2] = rgb->red.ldev.brightness;
|
||||
buf[3] = rgb->green.ldev.brightness;
|
||||
buf[4] = rgb->blue.ldev.brightness;
|
||||
|
||||
return thingm_send(rgb->tdev, buf);
|
||||
}
|
||||
|
||||
static int thingm_led_set(struct led_classdev *ldev,
|
||||
enum led_brightness brightness)
|
||||
{
|
||||
struct thingm_led *led = container_of(ldev, struct thingm_led, ldev);
|
||||
|
||||
return thingm_write_color(led->rgb);
|
||||
}
|
||||
|
||||
static int thingm_init_led(struct thingm_led *led, const char *color_name,
|
||||
struct thingm_rgb *rgb, int minor)
|
||||
{
|
||||
snprintf(led->name, sizeof(led->name), "thingm%d:%s:led%d",
|
||||
minor, color_name, rgb->num);
|
||||
led->ldev.name = led->name;
|
||||
led->ldev.max_brightness = 255;
|
||||
led->ldev.brightness_set_blocking = thingm_led_set;
|
||||
led->ldev.flags = LED_HW_PLUGGABLE;
|
||||
led->rgb = rgb;
|
||||
return devm_led_classdev_register(&rgb->tdev->hdev->dev, &led->ldev);
|
||||
}
|
||||
|
||||
static int thingm_init_rgb(struct thingm_rgb *rgb)
|
||||
{
|
||||
const int minor = ((struct hidraw *) rgb->tdev->hdev->hidraw)->minor;
|
||||
int err;
|
||||
|
||||
/* Register the red diode */
|
||||
err = thingm_init_led(&rgb->red, "red", rgb, minor);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
/* Register the green diode */
|
||||
err = thingm_init_led(&rgb->green, "green", rgb, minor);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
/* Register the blue diode */
|
||||
return thingm_init_led(&rgb->blue, "blue", rgb, minor);
|
||||
}
|
||||
|
||||
static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
struct thingm_device *tdev;
|
||||
int i, err;
|
||||
|
||||
tdev = devm_kzalloc(&hdev->dev, sizeof(struct thingm_device),
|
||||
GFP_KERNEL);
|
||||
if (!tdev)
|
||||
return -ENOMEM;
|
||||
|
||||
tdev->hdev = hdev;
|
||||
hid_set_drvdata(hdev, tdev);
|
||||
|
||||
err = hid_parse(hdev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
mutex_init(&tdev->lock);
|
||||
|
||||
err = thingm_version(tdev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
hid_dbg(hdev, "firmware version: %c.%c\n",
|
||||
tdev->version.major, tdev->version.minor);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(thingm_fwinfo) && !tdev->fwinfo; ++i)
|
||||
if (thingm_fwinfo[i].major == tdev->version.major)
|
||||
tdev->fwinfo = &thingm_fwinfo[i];
|
||||
|
||||
if (!tdev->fwinfo) {
|
||||
hid_err(hdev, "unsupported firmware %c\n", tdev->version.major);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
tdev->rgb = devm_kzalloc(&hdev->dev,
|
||||
sizeof(struct thingm_rgb) * tdev->fwinfo->numrgb,
|
||||
GFP_KERNEL);
|
||||
if (!tdev->rgb)
|
||||
return -ENOMEM;
|
||||
|
||||
err = hid_hw_start(hdev, HID_CONNECT_HIDRAW);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
for (i = 0; i < tdev->fwinfo->numrgb; ++i) {
|
||||
struct thingm_rgb *rgb = tdev->rgb + i;
|
||||
|
||||
rgb->tdev = tdev;
|
||||
rgb->num = tdev->fwinfo->first + i;
|
||||
err = thingm_init_rgb(rgb);
|
||||
if (err) {
|
||||
hid_hw_stop(hdev);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct hid_device_id thingm_table[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(hid, thingm_table);
|
||||
|
||||
static struct hid_driver thingm_driver = {
|
||||
.name = "thingm",
|
||||
.probe = thingm_probe,
|
||||
.id_table = thingm_table,
|
||||
};
|
||||
|
||||
module_hid_driver(thingm_driver);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Vivien Didelot <vivien.didelot@savoirfairelinux.com>");
|
||||
MODULE_DESCRIPTION("ThingM blink(1) USB RGB LED driver");
|
||||
Loading…
Reference in New Issue
Block a user