aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-08-09 18:43:20 +0000
committerMichael Büsch <mb@bu3sch.de>2010-08-09 18:43:20 +0000
commit1c4d148500f6567ccad3feb1bbaabfcc1983bc97 (patch)
tree135e5a45fd31d455515adea940adf31801179dc8 /target/linux/omap24xx
parent8ddd70bcffb675cfa45dedf3d573c5017ac82957 (diff)
downloadupstream-1c4d148500f6567ccad3feb1bbaabfcc1983bc97.tar.gz
upstream-1c4d148500f6567ccad3feb1bbaabfcc1983bc97.tar.bz2
upstream-1c4d148500f6567ccad3feb1bbaabfcc1983bc97.zip
omap24xx: Fix MMC multiplexer
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22563 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx')
-rw-r--r--target/linux/omap24xx/patches-2.6.35/811-mmc-multiplexer-fixes.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/omap24xx/patches-2.6.35/811-mmc-multiplexer-fixes.patch b/target/linux/omap24xx/patches-2.6.35/811-mmc-multiplexer-fixes.patch
new file mode 100644
index 0000000000..37082b875d
--- /dev/null
+++ b/target/linux/omap24xx/patches-2.6.35/811-mmc-multiplexer-fixes.patch
@@ -0,0 +1,18 @@
+---
+ drivers/mfd/menelaus.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.6.35.orig/drivers/mfd/menelaus.c
++++ linux-2.6.35/drivers/mfd/menelaus.c
+@@ -356,9 +356,9 @@ int menelaus_set_mmc_slot(int slot, int
+ int b;
+
+ if (enable)
+- ret |= 1 << 1;
++ val |= 1 << 1;
+ else
+- ret &= ~(1 << 1);
++ val &= ~(1 << 1);
+ b = menelaus_read_reg(MENELAUS_MCT_CTRL2);
+ b &= ~0x03;
+ b |= power;