serial: lantiq: Rename fpiclk to freqclk (2e81c1f3) · Commits · 戴 / test

drivers/tty/serial/lantiq.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}