aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-11-05 10:03:58 +0000
committerJohn Crispin <john@openwrt.org>2015-11-05 10:03:58 +0000
commitaebf73f0458d4c201f69c78c2321edc4df59e0aa (patch)
tree752b7bf3416fcc53bd486fae02d12ff8ec9da9bb /target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch
parentdc699dd547a8105b953d1e5410baa9286a33eb6c (diff)
downloadupstream-aebf73f0458d4c201f69c78c2321edc4df59e0aa.tar.gz
upstream-aebf73f0458d4c201f69c78c2321edc4df59e0aa.tar.bz2
upstream-aebf73f0458d4c201f69c78c2321edc4df59e0aa.zip
ramips: fix previous commit
r47388 accidentially changed 2 files too many Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 47389
Diffstat (limited to 'target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch')
-rw-r--r--target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch b/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch
index f77e5e7062..443e07afed 100644
--- a/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch
+++ b/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch
@@ -1,5 +1,49 @@
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
+@@ -101,28 +101,28 @@ static struct rt2880_pmx_group mt7620a_p
+ };
+
+ static struct rt2880_pmx_func pwm1_grp_mt7628[] = {
+- FUNC("sdxc", 3, 19, 1),
++ FUNC("sdxc d6", 3, 19, 1),
+ FUNC("utif", 2, 19, 1),
+ FUNC("gpio", 1, 19, 1),
+- FUNC("pwm", 0, 19, 1),
++ FUNC("pwm1", 0, 19, 1),
+ };
+
+ static struct rt2880_pmx_func pwm0_grp_mt7628[] = {
+- FUNC("sdxc", 3, 18, 1),
++ FUNC("sdxc d7", 3, 18, 1),
+ FUNC("utif", 2, 18, 1),
+ FUNC("gpio", 1, 18, 1),
+- FUNC("pwm", 0, 18, 1),
++ FUNC("pwm0", 0, 18, 1),
+ };
+
+ static struct rt2880_pmx_func uart2_grp_mt7628[] = {
+- FUNC("sdxc", 3, 20, 2),
++ FUNC("sdxc d5 d4", 3, 20, 2),
+ FUNC("pwm", 2, 20, 2),
+ FUNC("gpio", 1, 20, 2),
+ FUNC("uart2", 0, 20, 2),
+ };
+
+ static struct rt2880_pmx_func uart1_grp_mt7628[] = {
+- FUNC("sdxc", 3, 45, 2),
++ FUNC("sw_r", 3, 45, 2),
+ FUNC("pwm", 2, 45, 2),
+ FUNC("gpio", 1, 45, 2),
+ FUNC("uart1", 0, 45, 2),
+@@ -165,7 +165,7 @@ static struct rt2880_pmx_func spi_cs1_gr
+ FUNC("-", 3, 6, 1),
+ FUNC("refclk", 2, 6, 1),
+ FUNC("gpio", 1, 6, 1),
+- FUNC("spi", 0, 6, 1),
++ FUNC("spi cs1", 0, 6, 1),
+ };
+
+ static struct rt2880_pmx_func spis_grp_mt7628[] = {
@@ -182,27 +182,43 @@ static struct rt2880_pmx_func gpio_grp_m
FUNC("gpio", 0, 11, 1),
};