From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cam-admin0.cambridge.arm.com (cam-admin0.cambridge.arm.com [217.140.96.50]) by ozlabs.org (Postfix) with ESMTP id 7201C2C009E for ; Mon, 2 Dec 2013 20:51:07 +1100 (EST) Date: Mon, 2 Dec 2013 09:50:34 +0000 From: Mark Rutland To: Gerhard Sittig Subject: Re: [PATCH v6 08/17] spi: mpc512x: adjust to OF based clock lookup Message-ID: <20131202095034.GB12952@e106331-lin.cambridge.arm.com> References: <1385851897-23475-1-git-send-email-gsi@denx.de> <1385851897-23475-9-git-send-email-gsi@denx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1385851897-23475-9-git-send-email-gsi@denx.de> Cc: Mike Turquette , Detlev Zundel , "linux-spi@vger.kernel.org" , Mark Brown , Scott Wood , Anatolij Gustschin , "linuxppc-dev@lists.ozlabs.org" , "linux-arm-kernel@lists.infradead.org" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Sat, Nov 30, 2013 at 10:51:28PM +0000, Gerhard Sittig wrote: > after device tree based clock lookup became available, the peripheral > driver need no longer construct clock names which include the PSC index, > remove the "psc%d_mclk" template and unconditionally use 'mclk' > > acquire and release the 'ipg' clock item for register access as well For this and the other peripheral updates, it would be nice to have the expected clock-names entries added to the respective binding documents. Otherwise this looks fine to me. Thanks, Mark. > > Cc: Mark Brown > Cc: linux-spi@vger.kernel.org > Signed-off-by: Gerhard Sittig > --- > drivers/spi/spi-mpc512x-psc.c | 26 ++++++++++++++++++-------- > 1 file changed, 18 insertions(+), 8 deletions(-) > > diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c > index 9602bbd8d7ea..de66c676c248 100644 > --- a/drivers/spi/spi-mpc512x-psc.c > +++ b/drivers/spi/spi-mpc512x-psc.c > @@ -40,6 +40,7 @@ struct mpc512x_psc_spi { > unsigned int irq; > u8 bits_per_word; > struct clk *clk_mclk; > + struct clk *clk_ipg; > u32 mclk_rate; > > struct completion txisrdone; > @@ -475,8 +476,6 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, > struct spi_master *master; > int ret; > void *tempp; > - int psc_num; > - char clk_name[16]; > struct clk *clk; > > master = spi_alloc_master(dev, sizeof *mps); > @@ -520,9 +519,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, > goto free_master; > init_completion(&mps->txisrdone); > > - psc_num = master->bus_num; > - snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num); > - clk = devm_clk_get(dev, clk_name); > + clk = devm_clk_get(dev, "mclk"); > if (IS_ERR(clk)) { > ret = PTR_ERR(clk); > goto free_irq; > @@ -533,17 +530,29 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, > mps->clk_mclk = clk; > mps->mclk_rate = clk_get_rate(clk); > > + clk = devm_clk_get(dev, "ipg"); > + if (IS_ERR(clk)) { > + ret = PTR_ERR(clk); > + goto free_mclk_clock; > + } > + ret = clk_prepare_enable(clk); > + if (ret) > + goto free_mclk_clock; > + mps->clk_ipg = clk; > + > ret = mpc512x_psc_spi_port_config(master, mps); > if (ret < 0) > - goto free_clock; > + goto free_ipg_clock; > > ret = devm_spi_register_master(dev, master); > if (ret < 0) > - goto free_clock; > + goto free_ipg_clock; > > return ret; > > -free_clock: > +free_ipg_clock: > + clk_disable_unprepare(mps->clk_ipg); > +free_mclk_clock: > clk_disable_unprepare(mps->clk_mclk); > free_irq: > free_irq(mps->irq, mps); > @@ -561,6 +570,7 @@ static int mpc512x_psc_spi_do_remove(struct device *dev) > struct mpc512x_psc_spi *mps = spi_master_get_devdata(master); > > clk_disable_unprepare(mps->clk_mclk); > + clk_disable_unprepare(mps->clk_ipg); > free_irq(mps->irq, mps); > if (mps->psc) > iounmap(mps->psc); > -- > 1.7.10.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >