Explorar o código

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>
Uwe Kleine-König %!s(int64=12) %!d(string=hai) anos
pai
achega
b444d1dfe2
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 1 0
      drivers/spi/Kconfig
  2. 2 3
      drivers/spi/spi-fsl-dspi.c

+ 1 - 0
drivers/spi/Kconfig

@@ -264,6 +264,7 @@ config SPI_FSL_SPI
 config SPI_FSL_DSPI
 config SPI_FSL_DSPI
 	tristate "Freescale DSPI controller"
 	tristate "Freescale DSPI controller"
 	select SPI_BITBANG
 	select SPI_BITBANG
+	depends on SOC_VF610 || COMPILE_TEST
 	help
 	help
 	  This enables support for the Freescale DSPI controller in master
 	  This enables support for the Freescale DSPI controller in master
 	  mode. VF610 platform uses the controller.
 	  mode. VF610 platform uses the controller.

+ 2 - 3
drivers/spi/spi-fsl-dspi.c

@@ -165,7 +165,7 @@ static void hz_to_spi_baud(char *pbr, char *br, int speed_hz,
 			}
 			}
 		}
 		}
 
 
-	pr_warn("Can not find valid buad rate,speed_hz is %d,clkrate is %ld\
+	pr_warn("Can not find valid baud rate,speed_hz is %d,clkrate is %ld\
 		,we use the max prescaler value.\n", speed_hz, clkrate);
 		,we use the max prescaler value.\n", speed_hz, clkrate);
 	*pbr = ARRAY_SIZE(pbr_tbl) - 1;
 	*pbr = ARRAY_SIZE(pbr_tbl) - 1;
 	*br =  ARRAY_SIZE(brs) - 1;
 	*br =  ARRAY_SIZE(brs) - 1;
@@ -526,7 +526,6 @@ out_clk_put:
 	clk_disable_unprepare(dspi->clk);
 	clk_disable_unprepare(dspi->clk);
 out_master_put:
 out_master_put:
 	spi_master_put(master);
 	spi_master_put(master);
-	platform_set_drvdata(pdev, NULL);
 
 
 	return ret;
 	return ret;
 }
 }
@@ -553,5 +552,5 @@ static struct platform_driver fsl_dspi_driver = {
 module_platform_driver(fsl_dspi_driver);
 module_platform_driver(fsl_dspi_driver);
 
 
 MODULE_DESCRIPTION("Freescale DSPI Controller Driver");
 MODULE_DESCRIPTION("Freescale DSPI Controller Driver");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" DRIVER_NAME);
 MODULE_ALIAS("platform:" DRIVER_NAME);