projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ntb-4.2' of git://github.com/jonmason/ntb
[cascardo/linux.git]
/
drivers
/
mfd
/
arizona-spi.c
diff --git
a/drivers/mfd/arizona-spi.c
b/drivers/mfd/arizona-spi.c
index
8ef58bc
..
1e845f6
100644
(file)
--- a/
drivers/mfd/arizona-spi.c
+++ b/
drivers/mfd/arizona-spi.c
@@
-44,6
+44,7
@@
static int arizona_spi_probe(struct spi_device *spi)
#endif
#ifdef CONFIG_MFD_WM5110
case WM5110:
#endif
#ifdef CONFIG_MFD_WM5110
case WM5110:
+ case WM8280:
regmap_config = &wm5110_spi_regmap;
break;
#endif
regmap_config = &wm5110_spi_regmap;
break;
#endif
@@
-84,6
+85,7
@@
static int arizona_spi_remove(struct spi_device *spi)
static const struct spi_device_id arizona_spi_ids[] = {
{ "wm5102", WM5102 },
{ "wm5110", WM5110 },
static const struct spi_device_id arizona_spi_ids[] = {
{ "wm5102", WM5102 },
{ "wm5110", WM5110 },
+ { "wm8280", WM8280 },
{ },
};
MODULE_DEVICE_TABLE(spi, arizona_spi_ids);
{ },
};
MODULE_DEVICE_TABLE(spi, arizona_spi_ids);