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

[mirror_ubuntu-jammy-kernel.git] / drivers / spi / spi-tegra20-sflash.c

diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 8a61b27a9f2de3222b7338f0f9349fabe566e1bf..3d6a12b2af041683d9d3ee6f90b755426437e436 100644 (file)
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -34,7 +34,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 SPI_COMMAND                            0x000
 #define SPI_GO                                 BIT(30)
@@ -531,7 +531,7 @@ static int tegra_sflash_probe(struct platform_device *pdev)
                goto exit_free_master;
        }
 
-       tsd->clk = devm_clk_get(&pdev->dev, "spi");
+       tsd->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(tsd->clk)) {
                dev_err(&pdev->dev, "can not get clock\n");
                ret = PTR_ERR(tsd->clk);