Merge tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / arizona-spi.c

diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c
index 8ef58bcff193e8c6c1f7e61872326cb545afdff2..1e845f6d407b82aa6e26ec5ef19b5545b911ddac 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:
+       case WM8280:
                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 },
+       { "wm8280", WM8280 },
        { },
 };
 MODULE_DEVICE_TABLE(spi, arizona_spi_ids);