Message ID | 1385851897-23475-10-git-send-email-gsi@denx.de (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Anatolij Gustschin |
Headers | show |
On Sat, Nov 30, 2013 at 11:51:29PM +0100, 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 > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Jiri Slaby <jslaby@suse.cz> > Cc: linux-serial@vger.kernel.org > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> # for v4 > Signed-off-by: Gerhard Sittig <gsi@denx.de> > --- > Greg, the difference since v4 of this patch is that v4 took the 'mclk' > and 'ipg' clock items in reverse order, and thus potentially obfuscated > the adjusted name for 'mclk' -- the updated version of the patch is > identical in content but cleaner diff-wise That's fine: Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On Sat, 30 Nov 2013 23:51:29 +0100 Gerhard Sittig <gsi@denx.de> 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 > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Jiri Slaby <jslaby@suse.cz> > Cc: linux-serial@vger.kernel.org > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> # for v4 > Signed-off-by: Gerhard Sittig <gsi@denx.de> > --- > Greg, the difference since v4 of this patch is that v4 took the 'mclk' > and 'ipg' clock items in reverse order, and thus potentially obfuscated > the adjusted name for 'mclk' -- the updated version of the patch is > identical in content but cleaner diff-wise > > --- > drivers/tty/serial/mpc52xx_uart.c | 40 ++++++++++++++++++++++++++++++++----- > 1 file changed, 35 insertions(+), 5 deletions(-) applied to next. Thanks! Anatolij
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c index ec06505e3ae6..6345f377a246 100644 --- a/drivers/tty/serial/mpc52xx_uart.c +++ b/drivers/tty/serial/mpc52xx_uart.c @@ -619,29 +619,55 @@ static irqreturn_t mpc512x_psc_handle_irq(struct uart_port *port) } static struct clk *psc_mclk_clk[MPC52xx_PSC_MAXNUM]; +static struct clk *psc_ipg_clk[MPC52xx_PSC_MAXNUM]; /* called from within the .request_port() callback (allocation) */ static int mpc512x_psc_alloc_clock(struct uart_port *port) { int psc_num; - char clk_name[16]; struct clk *clk; int err; psc_num = (port->mapbase & 0xf00) >> 8; - snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num); - clk = devm_clk_get(port->dev, clk_name); + + clk = devm_clk_get(port->dev, "mclk"); if (IS_ERR(clk)) { dev_err(port->dev, "Failed to get MCLK!\n"); - return PTR_ERR(clk); + err = PTR_ERR(clk); + goto out_err; } err = clk_prepare_enable(clk); if (err) { dev_err(port->dev, "Failed to enable MCLK!\n"); - return err; + goto out_err; } psc_mclk_clk[psc_num] = clk; + + clk = devm_clk_get(port->dev, "ipg"); + if (IS_ERR(clk)) { + dev_err(port->dev, "Failed to get IPG clock!\n"); + err = PTR_ERR(clk); + goto out_err; + } + err = clk_prepare_enable(clk); + if (err) { + dev_err(port->dev, "Failed to enable IPG clock!\n"); + goto out_err; + } + psc_ipg_clk[psc_num] = clk; + return 0; + +out_err: + if (psc_mclk_clk[psc_num]) { + clk_disable_unprepare(psc_mclk_clk[psc_num]); + psc_mclk_clk[psc_num] = NULL; + } + if (psc_ipg_clk[psc_num]) { + clk_disable_unprepare(psc_ipg_clk[psc_num]); + psc_ipg_clk[psc_num] = NULL; + } + return err; } /* called from within the .release_port() callback (release) */ @@ -656,6 +682,10 @@ static void mpc512x_psc_relse_clock(struct uart_port *port) clk_disable_unprepare(clk); psc_mclk_clk[psc_num] = NULL; } + if (psc_ipg_clk[psc_num]) { + clk_disable_unprepare(psc_ipg_clk[psc_num]); + psc_ipg_clk[psc_num] = NULL; + } } /* implementation of the .clock() callback (enable/disable) */