Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[android-x86/kernel.git] / drivers / spi / spi-tegra20-slink.c

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 8d51db8..b8698b3 100644 (file)
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -35,7 +35,7 @@
 #include <linux/of_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi-tegra.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
 
 #define SLINK_COMMAND                  0x000
 #define SLINK_BIT_LENGTH(x)            (((x) & 0x1f) << 0)
@@ -1169,11 +1169,9 @@ static int tegra_slink_probe(struct platform_device *pdev)
                goto exit_free_master;
        }
        tspi->phys = r->start;
-       tspi->base = devm_request_and_ioremap(&pdev->dev, r);
-       if (!tspi->base) {
-               dev_err(&pdev->dev,
-                       "Cannot request memregion/iomap dma address\n");
-               ret = -EADDRNOTAVAIL;
+       tspi->base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(tspi->base)) {
+               ret = PTR_ERR(tspi->base);
                goto exit_free_master;
        }
 
@@ -1188,7 +1186,7 @@ static int tegra_slink_probe(struct platform_device *pdev)
                goto exit_free_master;
        }
 
-       tspi->clk = devm_clk_get(&pdev->dev, "slink");
+       tspi->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(tspi->clk)) {
                dev_err(&pdev->dev, "can not get clock\n");
                ret = PTR_ERR(tspi->clk);