diff options
author | John Crispin <blogic@openwrt.org> | 2011-11-11 21:59:01 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2011-11-11 21:59:01 +0000 |
commit | 9b8ac845a1eef0a3bb5886e3e583417e948c0763 (patch) | |
tree | d7bb00d42686dd01037c88e10e6287ef3328cfe9 /target/linux/lantiq/patches/820-fix-falcon-ltq_gpio_request.patch | |
parent | c6af60f433ffe9c68626b2d65584115071349f15 (diff) | |
download | master-187ad058-9b8ac845a1eef0a3bb5886e3e583417e948c0763.tar.gz master-187ad058-9b8ac845a1eef0a3bb5886e3e583417e948c0763.tar.bz2 master-187ad058-9b8ac845a1eef0a3bb5886e3e583417e948c0763.zip |
lantiq: fix breakage introduced in 3.1 bump
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28961 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches/820-fix-falcon-ltq_gpio_request.patch')
-rw-r--r-- | target/linux/lantiq/patches/820-fix-falcon-ltq_gpio_request.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches/820-fix-falcon-ltq_gpio_request.patch b/target/linux/lantiq/patches/820-fix-falcon-ltq_gpio_request.patch new file mode 100644 index 0000000000..b3fdf33f0b --- /dev/null +++ b/target/linux/lantiq/patches/820-fix-falcon-ltq_gpio_request.patch @@ -0,0 +1,53 @@ +--- a/arch/mips/include/asm/mach-lantiq/falcon/lantiq_soc.h ++++ b/arch/mips/include/asm/mach-lantiq/falcon/lantiq_soc.h +@@ -129,8 +129,8 @@ extern __iomem void *ltq_sys1_membase; + ltq_sys1_w32((ltq_sys1_r32(reg) & ~(clear)) | (set), reg) + + /* gpio_request wrapper to help configure the pin */ +-extern int ltq_gpio_request(unsigned int pin, unsigned int val, +- unsigned int dir, const char *name); ++extern int ltq_gpio_request(unsigned int pin, unsigned int alt0, ++ unsigned int alt1, unsigned int dir, const char *name); + extern int ltq_gpio_mux_set(unsigned int pin, unsigned int mux); + + /* to keep the irq code generic we need to define these to 0 as falcon +--- a/arch/mips/lantiq/falcon/gpio.c ++++ b/arch/mips/lantiq/falcon/gpio.c +@@ -96,11 +96,12 @@ int ltq_gpio_mux_set(unsigned int pin, u + } + EXPORT_SYMBOL(ltq_gpio_mux_set); + +-int ltq_gpio_request(unsigned int pin, unsigned int val, +- unsigned int dir, const char *name) ++int ltq_gpio_request(unsigned int pin, unsigned int alt0, ++ unsigned int alt1, unsigned int dir, const char *name) + { + int port = pin / 100; + int offset = pin % 100; ++ unsigned int mux = (!!alt0) & ((!!alt1) << 1); + + if (offset >= PINS_PER_PORT || port >= MAX_PORTS) + return -EINVAL; +@@ -115,7 +116,7 @@ int ltq_gpio_request(unsigned int pin, u + else + gpio_direction_input(pin); + +- return ltq_gpio_mux_set(pin, val); ++ return ltq_gpio_mux_set(pin, mux); + } + EXPORT_SYMBOL(ltq_gpio_request); + +--- a/arch/mips/lantiq/falcon/prom.c ++++ b/arch/mips/lantiq/falcon/prom.c +@@ -43,9 +43,9 @@ ltq_soc_setup(void) + falcon_register_gpio(); + if (register_asc1) { + ltq_register_asc(1); +- if (ltq_gpio_request(MUXC_SIF_RX_PIN, 3, 0, "asc1-rx")) ++ if (ltq_gpio_request(MUXC_SIF_RX_PIN, 1, 1, 0, "asc1-rx")) + pr_err("failed to request asc1-rx"); +- if (ltq_gpio_request(MUXC_SIF_TX_PIN, 3, 1, "asc1-tx")) ++ if (ltq_gpio_request(MUXC_SIF_TX_PIN, 1, 1, 1, "asc1-tx")) + pr_err("failed to request asc1-tx"); + ltq_sysctl_activate(SYSCTL_SYS1, ACTS_ASC1_ACT); + } |