openwrtv3/target/linux/brcm2708/patches-4.4/0121-MMC-Do-not-use-mmc_debug-if-CONFIG_MMC_BCM2835-is-no.patch
Felix Fietkau 4224b52c3a brcm2708: add linux 4.4 support
- random-bcm2708 and spi-bcm2708 have been removed.
- sound-soc-bcm2708-i2s has been upstreamed as sound-soc-bcm2835-i2s.

Let's keep linux 4.1 for a while, since linux 4.4 appears to have some issues
with multicast traffic on RPi ethernet:
https://gist.github.com/Noltari/5b1cfdecce5ed4bc08fd

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 48266
2016-01-17 10:42:23 +00:00

37 lines
1.2 KiB
Diff

From 5fc7b3491b5961dcb35251fc908c0fd5988eecde Mon Sep 17 00:00:00 2001
From: janluca <janluca@zedat.fu-berlin.de>
Date: Sun, 27 Dec 2015 14:34:04 +0100
Subject: [PATCH 121/127] MMC: Do not use mmc_debug if CONFIG_MMC_BCM2835 is
not set
If CONFIG_MMC_BCM2835 was not set the compiling of the kernel failed
since mmc_debug was not defined but used in drivers/mmc/core/quirks.c.
This patch add a ifdef-check for CONFIG_MMC_BCM2835 to the change of
commit 64d395457f793250d2e582eeb38cc3403b1db98c
---
drivers/mmc/core/quirks.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/mmc/core/quirks.c
+++ b/drivers/mmc/core/quirks.c
@@ -53,7 +53,9 @@ static const struct mmc_fixup mmc_fixup_
void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table)
{
+#ifdef CONFIG_MMC_BCM2835
extern unsigned mmc_debug;
+#endif
const struct mmc_fixup *f;
u64 rev = cid_rev_card(card);
@@ -81,7 +83,9 @@ void mmc_fixup_device(struct mmc_card *c
/* SDHCI on BCM2708 - bug causes a certain sequence of CMD23 operations to fail.
* Disable this flag for all cards (fall-back to CMD25/CMD18 multi-block transfers).
*/
+#ifdef CONFIG_MMC_BCM2835
if (mmc_debug & (1<<13))
card->quirks |= MMC_QUIRK_BLK_NO_CMD23;
+#endif
}
EXPORT_SYMBOL(mmc_fixup_device);