aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-gpio_stp-driver-to-clkdev-api.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-04-12 12:33:56 +0000
committerJohn Crispin <blogic@openwrt.org>2012-04-12 12:33:56 +0000
commit37a565ab654f3ce80f9514e1e625d3bd07739e86 (patch)
treed933bb536eb34a7b28b804d06d8dac93d585fd62 /target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-gpio_stp-driver-to-clkdev-api.patch
parent4879e3f58a284e6afd51899140abd6df30ef8408 (diff)
downloadupstream-37a565ab654f3ce80f9514e1e625d3bd07739e86.tar.gz
upstream-37a565ab654f3ce80f9514e1e625d3bd07739e86.tar.bz2
upstream-37a565ab654f3ce80f9514e1e625d3bd07739e86.zip
[lantiq] update 3.2 patches
sync with lantiq kernel series git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31260 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-gpio_stp-driver-to-clkdev-api.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-gpio_stp-driver-to-clkdev-api.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-gpio_stp-driver-to-clkdev-api.patch b/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-gpio_stp-driver-to-clkdev-api.patch
deleted file mode 100644
index e9655db6b8..0000000000
--- a/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-gpio_stp-driver-to-clkdev-api.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 81cf50fd6cfff13e06cd587094f5094dec32d57d Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Thu, 8 Mar 2012 11:21:33 +0100
-Subject: [PATCH 29/70] MIPS: lantiq: convert gpio_stp driver to clkdev api
-
-Update from old pmu_{dis,en}able() to ckldev api.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- arch/mips/lantiq/xway/gpio_stp.c | 12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
---- a/arch/mips/lantiq/xway/gpio_stp.c
-+++ b/arch/mips/lantiq/xway/gpio_stp.c
-@@ -15,6 +15,8 @@
- #include <linux/mutex.h>
- #include <linux/io.h>
- #include <linux/gpio.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
-
- #include <lantiq_soc.h>
-
-@@ -78,8 +80,10 @@ static struct gpio_chip ltq_stp_chip = {
- .owner = THIS_MODULE,
- };
-
--static int ltq_stp_hw_init(void)
-+static int ltq_stp_hw_init(struct device *dev)
- {
-+ struct clk *clk;
-+
- /* sane defaults */
- ltq_stp_w32(0, LTQ_STP_AR);
- ltq_stp_w32(0, LTQ_STP_CPU0);
-@@ -105,7 +109,9 @@ static int ltq_stp_hw_init(void)
- */
- ltq_stp_w32_mask(0, LTQ_STP_ADSL_SRC, LTQ_STP_CON0);
-
-- ltq_pmu_enable(PMU_LED);
-+ clk = clk_get(dev, NULL);
-+ WARN_ON(IS_ERR(clk));
-+ clk_enable(clk);
- return 0;
- }
-
-@@ -138,7 +144,7 @@ static int __devinit ltq_stp_probe(struc
- }
- ret = gpiochip_add(&ltq_stp_chip);
- if (!ret)
-- ret = ltq_stp_hw_init();
-+ ret = ltq_stp_hw_init(&pdev->dev);
-
- return ret;
- }