Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a24d850b authored by Padmavathi Venna's avatar Padmavathi Venna Committed by Kukjin Kim
Browse files

spi/s3c64xx: Use bus clocks created using clkdev 



This patch modifies the driver to stop depending on the
clock names being passed from platform and switch over
to lookup clocks generic names using clkdev

Signed-off-by: default avatarPadmavathi Venna <padma.v@samsung.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 4346b6d9

drivers/spi/spi-s3c64xx.c

+5 −9
Original line number Diff line number Diff line
@@ -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;

	}