mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Fix RPI compilation
This commit is contained in:
parent
d4dc8a5b5a
commit
f3db4bc40c
1 changed files with 9 additions and 9 deletions
|
@ -1,4 +1,4 @@
|
||||||
From ad3220a823c154937685522d9af69025ce7c2ce5 Mon Sep 17 00:00:00 2001
|
From c9b2c57e7fbfbebf73f96e58fb783bba83c50bd9 Mon Sep 17 00:00:00 2001
|
||||||
From: gellert <gellert@raspberrypi.org>
|
From: gellert <gellert@raspberrypi.org>
|
||||||
Date: Fri, 15 Aug 2014 16:35:06 +0100
|
Date: Fri, 15 Aug 2014 16:35:06 +0100
|
||||||
Subject: [PATCH] MMC: added alternative MMC driver
|
Subject: [PATCH] MMC: added alternative MMC driver
|
||||||
|
@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
static inline int mmc_blk_part_switch(struct mmc_card *card,
|
static inline int mmc_blk_part_switch(struct mmc_card *card,
|
||||||
unsigned int part_type);
|
unsigned int part_type);
|
||||||
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
|
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
|
||||||
@@ -2994,6 +3001,8 @@ static int mmc_blk_probe(struct mmc_card
|
@@ -2998,6 +3005,8 @@ static int mmc_blk_probe(struct mmc_card
|
||||||
{
|
{
|
||||||
struct mmc_blk_data *md;
|
struct mmc_blk_data *md;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check that the card supports the command class(es) we need.
|
* Check that the card supports the command class(es) we need.
|
||||||
@@ -3001,7 +3010,16 @@ static int mmc_blk_probe(struct mmc_card
|
@@ -3005,7 +3014,16 @@ static int mmc_blk_probe(struct mmc_card
|
||||||
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
|
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
card->complete_wq = alloc_workqueue("mmc_complete",
|
card->complete_wq = alloc_workqueue("mmc_complete",
|
||||||
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
|
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
|
||||||
@@ -3016,6 +3034,17 @@ static int mmc_blk_probe(struct mmc_card
|
@@ -3020,6 +3038,17 @@ static int mmc_blk_probe(struct mmc_card
|
||||||
goto out_free;
|
goto out_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -313,7 +313,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
goto out;
|
goto out;
|
||||||
--- a/drivers/mmc/core/core.c
|
--- a/drivers/mmc/core/core.c
|
||||||
+++ b/drivers/mmc/core/core.c
|
+++ b/drivers/mmc/core/core.c
|
||||||
@@ -1814,7 +1814,8 @@ EXPORT_SYMBOL(mmc_erase);
|
@@ -1819,7 +1819,8 @@ EXPORT_SYMBOL(mmc_erase);
|
||||||
|
|
||||||
int mmc_can_erase(struct mmc_card *card)
|
int mmc_can_erase(struct mmc_card *card)
|
||||||
{
|
{
|
||||||
|
@ -325,7 +325,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
}
|
}
|
||||||
--- a/drivers/mmc/core/quirks.h
|
--- a/drivers/mmc/core/quirks.h
|
||||||
+++ b/drivers/mmc/core/quirks.h
|
+++ b/drivers/mmc/core/quirks.h
|
||||||
@@ -129,6 +129,14 @@ static const struct mmc_fixup __maybe_un
|
@@ -130,6 +130,14 @@ static const struct mmc_fixup __maybe_un
|
||||||
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
|
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
|
||||||
MMC_QUIRK_BROKEN_SD_DISCARD),
|
MMC_QUIRK_BROKEN_SD_DISCARD),
|
||||||
|
|
||||||
|
@ -2007,12 +2007,12 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
sdhci_dumpregs(host);
|
sdhci_dumpregs(host);
|
||||||
--- a/include/linux/mmc/card.h
|
--- a/include/linux/mmc/card.h
|
||||||
+++ b/include/linux/mmc/card.h
|
+++ b/include/linux/mmc/card.h
|
||||||
@@ -296,6 +296,8 @@ struct mmc_card {
|
@@ -297,6 +297,8 @@ struct mmc_card {
|
||||||
#define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */
|
|
||||||
#define MMC_QUIRK_BROKEN_SD_CACHE (1<<15) /* Disable broken SD cache support */
|
#define MMC_QUIRK_BROKEN_SD_CACHE (1<<15) /* Disable broken SD cache support */
|
||||||
|
#define MMC_QUIRK_BROKEN_CACHE_FLUSH (1<<16) /* Don't flush cache until the write has occurred */
|
||||||
|
|
||||||
+#define MMC_QUIRK_ERASE_BROKEN (1<<31) /* Skip erase */
|
+#define MMC_QUIRK_ERASE_BROKEN (1<<31) /* Skip erase */
|
||||||
+
|
+
|
||||||
|
bool written_flag; /* Indicates eMMC has been written since power on */
|
||||||
bool reenable_cmdq; /* Re-enable Command Queue */
|
bool reenable_cmdq; /* Re-enable Command Queue */
|
||||||
|
|
||||||
unsigned int erase_size; /* erase size in sectors */
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue