[PATCH 1/7] SPI: S3C64XX: Use bus clocks created using clkdev

[Kukjin Kim]

Grant Likely wrote:
> 
> On Fri, Sep 23, 2011 at 05:23:41PM +0530, Padmavathi Venna wrote:
> > 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: Padmavathi Venna <padma.v at samsung.com>
> 
> Looks okay to me.
> 
> Acked-by: Grant Likely <grant.likely at secretlab.ca>
> 
> This series I imagine should go in via the arm-soc tree.
> 
OK, if others ok to me, I will pick up this series so that it will be sent
to upstream via arm-soc.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim at samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> 
> > ---
> >  drivers/spi/spi-s3c64xx.c |   14 +++++---------
> >  1 files changed, 5 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
> > index 019a716..dcf7e10 100644
> > --- a/drivers/spi/spi-s3c64xx.c
> > +++ b/drivers/spi/spi-s3c64xx.c
> > @@ -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;
> >  	}
> > --
> > 1.7.4.4
> >