diff options
author | John Crispin <john@openwrt.org> | 2012-04-12 12:33:56 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2012-04-12 12:33:56 +0000 |
commit | e3889bcf7c8ad2eff0eaeb62dbc4c0977a972788 (patch) | |
tree | c69a83b322c88d9516c9022635a80d5803ac83c3 /target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch | |
parent | 1b7578845130f5ea6f4096f62bfe0f49a7315d4f (diff) | |
download | upstream-e3889bcf7c8ad2eff0eaeb62dbc4c0977a972788.tar.gz upstream-e3889bcf7c8ad2eff0eaeb62dbc4c0977a972788.tar.bz2 upstream-e3889bcf7c8ad2eff0eaeb62dbc4c0977a972788.zip |
update 3.2 patches
sync with lantiq kernel series
SVN-Revision: 31260
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch b/target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch deleted file mode 100644 index e282b0ba93..0000000000 --- a/target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1fdd8c04b65bd55730e6931a520cc1dabfc4d190 Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Thu, 16 Feb 2012 20:17:16 +0100 -Subject: [PATCH 31/70] SERIAL: MIPS: lantiq: convert serial driver to clkdev - api - -Reference the FPI clock via its new access function. - -Signed-off-by: John Crispin <blogic@openwrt.org> -Cc: linux-serial@vger.kernel.org ---- - drivers/tty/serial/lantiq.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - ---- a/drivers/tty/serial/lantiq.c -+++ b/drivers/tty/serial/lantiq.c -@@ -540,6 +540,10 @@ lqasc_request_port(struct uart_port *por - if (ltq_gpio_request(&pdev->dev, MUXC_SIF_TX_PIN, - 3, 1, "asc1-tx")) - return -EBUSY; -+ ltq_port->clk = clk_get(&pdev->dev, NULL); -+ if (IS_ERR(ltq_port->clk)) -+ return PTR_ERR(ltq_port->clk); -+ clk_enable(ltq_port->clk); - } - return 0; - } -@@ -698,7 +702,7 @@ lqasc_probe(struct platform_device *pdev - if (lqasc_port[pdev->id] != NULL) - return -EBUSY; - -- clk = clk_get(&pdev->dev, "fpi"); -+ clk = clk_get_fpi(); - if (IS_ERR(clk)) { - pr_err("failed to get fpi clk\n"); - return -ENOENT; |