diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2014-03-06 00:09:30 +0000 |
|---|---|---|
| committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-03-06 00:09:30 +0000 |
| commit | ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7 (patch) | |
| tree | ef1ef8907c63a75c4ac441f8c95325a6d5abb9ec /target/linux/sunxi/patches-3.13/170-5-mmc-fix-caps-override.patch | |
| parent | 2c771cc71f3b6aceda5fe81f44a79b724e0941d0 (diff) | |
| download | upstream-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.tar.gz upstream-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.tar.bz2 upstream-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.zip | |
sunxi: driver refresh for 3.13 - update gmac / mmc / usb / ahci drivers to follow mainline dev trees - add driver for spi - update clock support - update a31 support - move to new DT compats where appropriate - re-order patchqueue where needed - verified working a20 smp - move most DTSes off files/ - update defconfig
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39782
Diffstat (limited to 'target/linux/sunxi/patches-3.13/170-5-mmc-fix-caps-override.patch')
| -rw-r--r-- | target/linux/sunxi/patches-3.13/170-5-mmc-fix-caps-override.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.13/170-5-mmc-fix-caps-override.patch b/target/linux/sunxi/patches-3.13/170-5-mmc-fix-caps-override.patch new file mode 100644 index 0000000000..9118563053 --- /dev/null +++ b/target/linux/sunxi/patches-3.13/170-5-mmc-fix-caps-override.patch @@ -0,0 +1,34 @@ +From dffb4d4d1fe3a6ba93102756152ec4518dbeac00 Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Mon, 17 Feb 2014 17:13:19 +0100 +Subject: [PATCH] sunxi-mmc: Or in caps, rather then overriding them + +Now that we use mmc_of_parse() there are already some caps set by mmc_of_parse, +so or in our driver caps, rather then using an assignment. This fixes the +card running only in 1 bit mode instead of 4 bit mode problem we've had +since we switched to using mmc_of_parse(). + +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + drivers/mmc/host/sunxi-mmc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c +index 2eaed10..d5e8ff9 100644 +--- a/drivers/mmc/host/sunxi-mmc.c ++++ b/drivers/mmc/host/sunxi-mmc.c +@@ -802,9 +802,9 @@ static int sunxi_mmc_probe(struct platform_device *pdev) + else + mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; + +- mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED | ++ mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED | + MMC_CAP_SDIO_IRQ; +- mmc->caps2 = MMC_CAP2_NO_PRESCAN_POWERUP; ++ mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP; + + ret = mmc_add_host(mmc); + +-- +1.8.5.5 + |