diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-09-10 04:46:33 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-16 19:21:03 -0400 |
commit | b444d1dfe296433a93d6b814d924e0ab99ad7e7b (patch) | |
tree | 3beee9337914000ec8954f092e5505d9e8ec001b /drivers/spi | |
parent | 2ef3599d8181afcbd347226faba75991f9e008fc (diff) |
spi: fsl-dspi: several minor improvements and fixes
- improve dependencies using COMPILE_TEST
- fix a typo
- drop platform_set_drvdata(pdev, NULL) in error path of probe
- make MODULE_LICENSE match the header
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/Kconfig | 1 | ||||
-rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 5 |
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 | |||
264 | config SPI_FSL_DSPI | 264 | config 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); |
527 | out_master_put: | 527 | out_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 = { | |||
553 | module_platform_driver(fsl_dspi_driver); | 552 | module_platform_driver(fsl_dspi_driver); |
554 | 553 | ||
555 | MODULE_DESCRIPTION("Freescale DSPI Controller Driver"); | 554 | MODULE_DESCRIPTION("Freescale DSPI Controller Driver"); |
556 | MODULE_LICENSE("GPL v2"); | 555 | MODULE_LICENSE("GPL"); |
557 | MODULE_ALIAS("platform:" DRIVER_NAME); | 556 | MODULE_ALIAS("platform:" DRIVER_NAME); |