projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
9deef02
)
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Mark Brown
<broonie@kernel.org>
Tue, 9 Jun 2015 17:35:46 +0000
(18:35 +0100)
committer
Mark Brown
<broonie@kernel.org>
Tue, 9 Jun 2015 17:35:46 +0000
(18:35 +0100)
drivers/spi/spi-fsl-dspi.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-fsl-dspi.c
b/drivers/spi/spi-fsl-dspi.c
index 8af20aa65abf77161eec8832b961f21b456d6d06..c184f21c1ffa68039b6a4df5785e36ed1f768dc0 100644
(file)
--- a/
drivers/spi/spi-fsl-dspi.c
+++ b/
drivers/spi/spi-fsl-dspi.c
@@
-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",