aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/Kconfig1
-rw-r--r--drivers/spi/spi-fsl-dspi.c5
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index b9c53cc40e1f..c463d364b3dd 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -264,6 +264,7 @@ config SPI_FSL_SPI
264config SPI_FSL_DSPI 264config SPI_FSL_DSPI
265 tristate "Freescale DSPI controller" 265 tristate "Freescale DSPI controller"
266 select SPI_BITBANG 266 select SPI_BITBANG
267 depends on SOC_VF610 || COMPILE_TEST
267 help 268 help
268 This enables support for the Freescale DSPI controller in master 269 This enables support for the Freescale DSPI controller in master
269 mode. VF610 platform uses the controller. 270 mode. VF610 platform uses the controller.
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 735d4f51016c..dc3d4eb0531c 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -165,7 +165,7 @@ static void hz_to_spi_baud(char *pbr, char *br, int speed_hz,
165 } 165 }
166 } 166 }
167 167
168 pr_warn("Can not find valid buad rate,speed_hz is %d,clkrate is %ld\ 168 pr_warn("Can not find valid baud rate,speed_hz is %d,clkrate is %ld\
169 ,we use the max prescaler value.\n", speed_hz, clkrate); 169 ,we use the max prescaler value.\n", speed_hz, clkrate);
170 *pbr = ARRAY_SIZE(pbr_tbl) - 1; 170 *pbr = ARRAY_SIZE(pbr_tbl) - 1;
171 *br = ARRAY_SIZE(brs) - 1; 171 *br = ARRAY_SIZE(brs) - 1;
@@ -526,7 +526,6 @@ out_clk_put:
526 clk_disable_unprepare(dspi->clk); 526 clk_disable_unprepare(dspi->clk);
527out_master_put: 527out_master_put:
528 spi_master_put(master); 528 spi_master_put(master);
529 platform_set_drvdata(pdev, NULL);
530 529
531 return ret; 530 return ret;
532} 531}
@@ -553,5 +552,5 @@ static struct platform_driver fsl_dspi_driver = {
553module_platform_driver(fsl_dspi_driver); 552module_platform_driver(fsl_dspi_driver);
554 553
555MODULE_DESCRIPTION("Freescale DSPI Controller Driver"); 554MODULE_DESCRIPTION("Freescale DSPI Controller Driver");
556MODULE_LICENSE("GPL v2"); 555MODULE_LICENSE("GPL");
557MODULE_ALIAS("platform:" DRIVER_NAME); 556MODULE_ALIAS("platform:" DRIVER_NAME);