diff options
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-tegra20-sflash.c | 4 | ||||
-rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index 8a61b27a9f2d..3d6a12b2af04 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/of_device.h> | 34 | #include <linux/of_device.h> |
35 | #include <linux/spi/spi.h> | 35 | #include <linux/spi/spi.h> |
36 | #include <linux/spi/spi-tegra.h> | 36 | #include <linux/spi/spi-tegra.h> |
37 | #include <mach/clk.h> | 37 | #include <linux/clk/tegra.h> |
38 | 38 | ||
39 | #define SPI_COMMAND 0x000 | 39 | #define SPI_COMMAND 0x000 |
40 | #define SPI_GO BIT(30) | 40 | #define SPI_GO BIT(30) |
@@ -531,7 +531,7 @@ static int tegra_sflash_probe(struct platform_device *pdev) | |||
531 | goto exit_free_master; | 531 | goto exit_free_master; |
532 | } | 532 | } |
533 | 533 | ||
534 | tsd->clk = devm_clk_get(&pdev->dev, "spi"); | 534 | tsd->clk = devm_clk_get(&pdev->dev, NULL); |
535 | if (IS_ERR(tsd->clk)) { | 535 | if (IS_ERR(tsd->clk)) { |
536 | dev_err(&pdev->dev, "can not get clock\n"); | 536 | dev_err(&pdev->dev, "can not get clock\n"); |
537 | ret = PTR_ERR(tsd->clk); | 537 | ret = PTR_ERR(tsd->clk); |
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 8458c4bf7172..b8698b389ef3 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <linux/of_device.h> | 35 | #include <linux/of_device.h> |
36 | #include <linux/spi/spi.h> | 36 | #include <linux/spi/spi.h> |
37 | #include <linux/spi/spi-tegra.h> | 37 | #include <linux/spi/spi-tegra.h> |
38 | #include <mach/clk.h> | 38 | #include <linux/clk/tegra.h> |
39 | 39 | ||
40 | #define SLINK_COMMAND 0x000 | 40 | #define SLINK_COMMAND 0x000 |
41 | #define SLINK_BIT_LENGTH(x) (((x) & 0x1f) << 0) | 41 | #define SLINK_BIT_LENGTH(x) (((x) & 0x1f) << 0) |
@@ -1186,7 +1186,7 @@ static int tegra_slink_probe(struct platform_device *pdev) | |||
1186 | goto exit_free_master; | 1186 | goto exit_free_master; |
1187 | } | 1187 | } |
1188 | 1188 | ||
1189 | tspi->clk = devm_clk_get(&pdev->dev, "slink"); | 1189 | tspi->clk = devm_clk_get(&pdev->dev, NULL); |
1190 | if (IS_ERR(tspi->clk)) { | 1190 | if (IS_ERR(tspi->clk)) { |
1191 | dev_err(&pdev->dev, "can not get clock\n"); | 1191 | dev_err(&pdev->dev, "can not get clock\n"); |
1192 | ret = PTR_ERR(tspi->clk); | 1192 | ret = PTR_ERR(tspi->clk); |