]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
serial: lantiq: Rename fpiclk to freqclk
authorSongjun Wu <songjun.wu@linux.intel.com>
Tue, 16 Oct 2018 09:19:08 +0000 (17:19 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Nov 2018 16:43:27 +0000 (08:43 -0800)
fpiclk is platform specific, freqclk is more generic.

Signed-off-by: Songjun Wu <songjun.wu@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/lantiq.c

index e351f80996d324c153c706fb3fd2b3e116d57da2..4acdbdf8fe7a72fcc48f8e3f368e82b4452a58bb 100644 (file)
@@ -105,7 +105,7 @@ static DEFINE_SPINLOCK(ltq_asc_lock);
 struct ltq_uart_port {
        struct uart_port        port;
        /* clock used to derive divider */
-       struct clk              *fpiclk;
+       struct clk              *freqclk;
        /* clock gating of the ASC core */
        struct clk              *clk;
        unsigned int            tx_irq;
@@ -309,7 +309,7 @@ lqasc_startup(struct uart_port *port)
 
        if (!IS_ERR(ltq_port->clk))
                clk_enable(ltq_port->clk);
-       port->uartclk = clk_get_rate(ltq_port->fpiclk);
+       port->uartclk = clk_get_rate(ltq_port->freqclk);
 
        asc_update_bits(ASCCLC_DISS | ASCCLC_RMCMASK, (1 << ASCCLC_RMCOFFSET),
                port->membase + LTQ_ASC_CLC);
@@ -632,7 +632,7 @@ lqasc_console_setup(struct console *co, char *options)
        if (!IS_ERR(ltq_port->clk))
                clk_enable(ltq_port->clk);
 
-       port->uartclk = clk_get_rate(ltq_port->fpiclk);
+       port->uartclk = clk_get_rate(ltq_port->freqclk);
 
        if (options)
                uart_parse_options(options, &baud, &parity, &bits, &flow);
@@ -744,8 +744,8 @@ lqasc_probe(struct platform_device *pdev)
        port->irq       = irqres[0].start;
        port->mapbase   = mmres->start;
 
-       ltq_port->fpiclk = clk_get_fpi();
-       if (IS_ERR(ltq_port->fpiclk)) {
+       ltq_port->freqclk = clk_get_fpi();
+       if (IS_ERR(ltq_port->freqclk)) {
                pr_err("failed to get fpi clk\n");
                return -ENOENT;
        }