]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 9 Jun 2015 17:35:46 +0000 (18:35 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 9 Jun 2015 17:35:46 +0000 (18:35 +0100)
drivers/spi/spi-fsl-dspi.c

index 8af20aa65abf77161eec8832b961f21b456d6d06..c184f21c1ffa68039b6a4df5785e36ed1f768dc0 100644 (file)
@@ -566,7 +566,7 @@ static int dspi_probe(struct platform_device *pdev)
                goto out_master_put;
        }
 
-       dspi->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "dspi", base,
+       dspi->regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL, base,
                                                &dspi_regmap_config);
        if (IS_ERR(dspi->regmap)) {
                dev_err(&pdev->dev, "failed to init regmap: %ld\n",