Merge remote-tracking branch 'spi/fix/grant' into spi-linus

[karo-tx-linux.git] / drivers / spi / spi-davinci.c

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 8234d2259722f08401b0caf916c1e1fb2b15a5cc..50b13c9b1ab691fd5defcae44b98dc4bfccb5557 100644 (file)
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -776,15 +776,15 @@ rx_dma_failed:
 #if defined(CONFIG_OF)
 static const struct of_device_id davinci_spi_of_match[] = {
        {
-               .compatible = "ti,dm644x-spi",
+               .compatible = "ti,dm6441-spi",
        },
        {
-               .compatible = "ti,da8xx-spi",
+               .compatible = "ti,da830-spi",
                .data = (void *)SPI_VERSION_2,
        },
        { },
 };
-MODULE_DEVICE_TABLE(of, davini_spi_of_match);
+MODULE_DEVICE_TABLE(of, davinci_spi_of_match);
 
 /**
  * spi_davinci_get_pdata - Get platform data from DTS binding