wlcore: add wl1285 compatible

Motorola Droid 4 uses a WL 1285C. With differences between
chips not being public let's add explicit binding for wl1285
instead of relying on wl1283 being very similar.

Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt b/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt
index 2a3d90d..7b2cbb1 100644 (file)
--- a/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt
+++ b/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt
@@ -10,6 +10,7 @@ Required properties:
     * "ti,wl1273"
     * "ti,wl1281"
     * "ti,wl1283"
+    * "ti,wl1285"
     * "ti,wl1801"
     * "ti,wl1805"
     * "ti,wl1807"

diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 287023e..2fb3871 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -237,6 +237,7 @@ static const struct of_device_id wlcore_sdio_of_match_table[] = {
        { .compatible = "ti,wl1273", .data = &wl127x_data },
        { .compatible = "ti,wl1281", .data = &wl128x_data },
        { .compatible = "ti,wl1283", .data = &wl128x_data },
+       { .compatible = "ti,wl1285", .data = &wl128x_data },
        { .compatible = "ti,wl1801", .data = &wl18xx_data },
        { .compatible = "ti,wl1805", .data = &wl18xx_data },
        { .compatible = "ti,wl1807", .data = &wl18xx_data },

diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index fa3547e..698bfa9 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -433,6 +433,7 @@ static const struct of_device_id wlcore_spi_of_match_table[] = {
        { .compatible = "ti,wl1273", .data = &wl127x_data},
        { .compatible = "ti,wl1281", .data = &wl128x_data},
        { .compatible = "ti,wl1283", .data = &wl128x_data},
+       { .compatible = "ti,wl1285", .data = &wl128x_data},
        { .compatible = "ti,wl1801", .data = &wl18xx_data},
        { .compatible = "ti,wl1805", .data = &wl18xx_data},
        { .compatible = "ti,wl1807", .data = &wl18xx_data},