Commit fb8ebec0 authored by Philipp Zabel's avatar Philipp Zabel Committed by Greg Kroah-Hartman
Browse files

serial: pxa: add clk_prepare/clk_unprepare calls 



This patch adds clk_prepare/clk_unprepare calls to the serial/pxa
driver by using the helper functions clk_prepare_enable and
clk_disable_unprepare.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4a4c61b7

drivers/tty/serial/pxa.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -579,9 +579,9 @@ serial_pxa_pm(struct uart_port *port, unsigned int state, 
	struct uart_pxa_port *up = (struct uart_pxa_port *)port;

	struct uart_pxa_port *up = (struct uart_pxa_port *)port;





	if (!state)

	if (!state)

		clk_enable(up->clk);

		clk_prepare_enable(up->clk);

	else

	else

		clk_disable(up->clk);

		clk_disable_unprepare(up->clk);

}

}





static void serial_pxa_release_port(struct uart_port *port)

static void serial_pxa_release_port(struct uart_port *port)
@@ -668,7 +668,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) 
	struct uart_pxa_port *up = serial_pxa_ports[co->index];

	struct uart_pxa_port *up = serial_pxa_ports[co->index];

	unsigned int ier;

	unsigned int ier;





	clk_enable(up->clk);

	clk_prepare_enable(up->clk);





	/*

	/*

	 *	First save the IER then disable the interrupts

	 *	First save the IER then disable the interrupts
@@ -685,7 +685,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) 
	wait_for_xmitr(up);

	wait_for_xmitr(up);

	serial_out(up, UART_IER, ier);

	serial_out(up, UART_IER, ier);





	clk_disable(up->clk);

	clk_disable_unprepare(up->clk);

}

}





static int __init

static int __init