mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
ramips: remove lantiq specific patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37830
This commit is contained in:
parent
9330662208
commit
a76371970e
@ -1,25 +0,0 @@
|
|||||||
From 0b78522f6e136fa5901e72cdbf4a44693d100826 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Langer <thomas.langer@lantiq.com>
|
|
||||||
Date: Sun, 28 Jul 2013 14:44:44 +0200
|
|
||||||
Subject: [PATCH 07/25] serial: MIPS: lantiq: add clk_enable() call to driver
|
|
||||||
|
|
||||||
Enable the clock if one is present when setting up the console.
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
|
|
||||||
Acked-by: John Crispin <blogic@openwrt.org>
|
|
||||||
---
|
|
||||||
drivers/tty/serial/lantiq.c | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/tty/serial/lantiq.c
|
|
||||||
+++ b/drivers/tty/serial/lantiq.c
|
|
||||||
@@ -636,6 +636,9 @@ lqasc_console_setup(struct console *co,
|
|
||||||
|
|
||||||
port = <q_port->port;
|
|
||||||
|
|
||||||
+ if (!IS_ERR(ltq_port->clk))
|
|
||||||
+ clk_enable(ltq_port->clk);
|
|
||||||
+
|
|
||||||
port->uartclk = clk_get_rate(ltq_port->fpiclk);
|
|
||||||
|
|
||||||
if (options)
|
|
@ -1,32 +0,0 @@
|
|||||||
From d94da02421c14fa9295feb218cd45fc01d0f470b Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Crispin <blogic@openwrt.org>
|
|
||||||
Date: Thu, 8 Aug 2013 17:19:42 +0200
|
|
||||||
Subject: [PATCH 08/25] serial: MIPS: lantiq: fix clock error check
|
|
||||||
|
|
||||||
The clk should be checked with the proper IS_ERR() api before accessing it.
|
|
||||||
|
|
||||||
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
||||||
---
|
|
||||||
drivers/tty/serial/lantiq.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/tty/serial/lantiq.c
|
|
||||||
+++ b/drivers/tty/serial/lantiq.c
|
|
||||||
@@ -318,7 +318,7 @@ lqasc_startup(struct uart_port *port)
|
|
||||||
struct ltq_uart_port *ltq_port = to_ltq_uart_port(port);
|
|
||||||
int retval;
|
|
||||||
|
|
||||||
- if (ltq_port->clk)
|
|
||||||
+ if (!IS_ERR(ltq_port->clk))
|
|
||||||
clk_enable(ltq_port->clk);
|
|
||||||
port->uartclk = clk_get_rate(ltq_port->fpiclk);
|
|
||||||
|
|
||||||
@@ -386,7 +386,7 @@ lqasc_shutdown(struct uart_port *port)
|
|
||||||
port->membase + LTQ_ASC_RXFCON);
|
|
||||||
ltq_w32_mask(ASCTXFCON_TXFEN, ASCTXFCON_TXFFLU,
|
|
||||||
port->membase + LTQ_ASC_TXFCON);
|
|
||||||
- if (ltq_port->clk)
|
|
||||||
+ if (!IS_ERR(ltq_port->clk))
|
|
||||||
clk_disable(ltq_port->clk);
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user