Commit 5034ce06 authored by Songjun Wu's avatar Songjun Wu Committed by Greg Kroah-Hartman
Browse files

serial: lantiq: Replace clk_enable/clk_disable with clk generic API 



The clk driver has introduced new clock APIs that replace
the existing clk_enable and clk_disable.
- clk_enable() APIs is replaced with clk_prepare_enable()
- clk_disable() API is replaced with clk_disable_unprepare()

Signed-off-by: default avatarSongjun Wu <songjun.wu@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e81c1f3

drivers/tty/serial/lantiq.c

+3 −3
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ lqasc_startup(struct uart_port *port) 
	int retval;



	if (!IS_ERR(ltq_port->clk))

		clk_enable(ltq_port->clk);

		clk_prepare_enable(ltq_port->clk);

	port->uartclk = clk_get_rate(ltq_port->freqclk);



	asc_update_bits(ASCCLC_DISS | ASCCLC_RMCMASK, (1 << ASCCLC_RMCOFFSET),
@@ -376,7 +376,7 @@ lqasc_shutdown(struct uart_port *port) 
	asc_update_bits(ASCTXFCON_TXFEN, ASCTXFCON_TXFFLU,

		port->membase + LTQ_ASC_TXFCON);

	if (!IS_ERR(ltq_port->clk))

		clk_disable(ltq_port->clk);

		clk_disable_unprepare(ltq_port->clk);

}



static void
@@ -630,7 +630,7 @@ lqasc_console_setup(struct console *co, char *options) 
	port = &ltq_port->port;



	if (!IS_ERR(ltq_port->clk))

		clk_enable(ltq_port->clk);

		clk_prepare_enable(ltq_port->clk);



	port->uartclk = clk_get_rate(ltq_port->freqclk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE