projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
iio
/
adc
/
ti-adc128s052.c
diff --git
a/drivers/iio/adc/ti-adc128s052.c
b/drivers/iio/adc/ti-adc128s052.c
index 915be6b60097b259a29c3b780a3f04736a0ac9b3..ff6f7f63c8d9b8c2c7e758ce932912663b7fbc3f 100644
(file)
--- a/
drivers/iio/adc/ti-adc128s052.c
+++ b/
drivers/iio/adc/ti-adc128s052.c
@@
-174,6
+174,13
@@
static int adc128_remove(struct spi_device *spi)
return 0;
}
return 0;
}
+static const struct of_device_id adc128_of_match[] = {
+ { .compatible = "ti,adc128s052", },
+ { .compatible = "ti,adc122s021", },
+ { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, adc128_of_match);
+
static const struct spi_device_id adc128_id[] = {
{ "adc128s052", 0}, /* index into adc128_config */
{ "adc122s021", 1},
static const struct spi_device_id adc128_id[] = {
{ "adc128s052", 0}, /* index into adc128_config */
{ "adc122s021", 1},
@@
-184,7
+191,7
@@
MODULE_DEVICE_TABLE(spi, adc128_id);
static struct spi_driver adc128_driver = {
.driver = {
.name = "adc128s052",
static struct spi_driver adc128_driver = {
.driver = {
.name = "adc128s052",
- .o
wner = THIS_MODULE
,
+ .o
f_match_table = of_match_ptr(adc128_of_match)
,
},
.probe = adc128_probe,
.remove = adc128_remove,
},
.probe = adc128_probe,
.remove = adc128_remove,