|
@@ -971,6 +971,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
struct s3c64xx_spi_info *sci;
|
|
|
struct spi_master *master;
|
|
|
int ret;
|
|
|
+ char clk_name[16];
|
|
|
|
|
|
if (pdev->id < 0) {
|
|
|
dev_err(&pdev->dev,
|
|
@@ -984,11 +985,6 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
sci = pdev->dev.platform_data;
|
|
|
- if (!sci->src_clk_name) {
|
|
|
- dev_err(&pdev->dev,
|
|
|
- "Board init must call s3c64xx_spi_set_info()\n");
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
|
|
|
/* Check for availability of necessary resource */
|
|
|
|
|
@@ -1073,17 +1069,17 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
|
|
|
goto err4;
|
|
|
}
|
|
|
|
|
|
- sdd->src_clk = clk_get(&pdev->dev, sci->src_clk_name);
|
|
|
+ sprintf(clk_name, "spi_busclk%d", sci->src_clk_nr);
|
|
|
+ sdd->src_clk = clk_get(&pdev->dev, clk_name);
|
|
|
if (IS_ERR(sdd->src_clk)) {
|
|
|
dev_err(&pdev->dev,
|
|
|
- "Unable to acquire clock '%s'\n", sci->src_clk_name);
|
|
|
+ "Unable to acquire clock '%s'\n", clk_name);
|
|
|
ret = PTR_ERR(sdd->src_clk);
|
|
|
goto err5;
|
|
|
}
|
|
|
|
|
|
if (clk_enable(sdd->src_clk)) {
|
|
|
- dev_err(&pdev->dev, "Couldn't enable clock '%s'\n",
|
|
|
- sci->src_clk_name);
|
|
|
+ dev_err(&pdev->dev, "Couldn't enable clock '%s'\n", clk_name);
|
|
|
ret = -EBUSY;
|
|
|
goto err6;
|
|
|
}
|