KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: add CD polling to sd driver

Browse source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 46475
This commit is contained in:
John Crispin 2015-07-24 09:12:10 +00:00
parent ebe957fad6
commit 351a55ac29
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
target/linux/ramips/patches-3.18/0053-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
View file

@ -25,7 +25,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/mmc/host/Kconfig --- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig
@@ -773,3 +773,5 @@ config MMC_SUNXI @@ -773,3 +773,5 @@
help help
This selects support for the SD/MMC Host Controller on This selects support for the SD/MMC Host Controller on
Allwinner sunxi SoCs. Allwinner sunxi SoCs.
@ -1760,7 +1760,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ +
--- /dev/null --- /dev/null
+++ b/drivers/mmc/host/mtk-mmc/sd.c +++ b/drivers/mmc/host/mtk-mmc/sd.c
@@ -0,0 +1,3047 @@ @@ -0,0 +1,3050 @@
+/* Copyright Statement: +/* Copyright Statement:
+ * + *
+ * This software/firmware and related documentation ("MediaTek Software") are + * This software/firmware and related documentation ("MediaTek Software") are
@ -1821,6 +1821,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+#include <linux/kernel.h> +#include <linux/kernel.h>
+#include <linux/version.h> +#include <linux/version.h>
+#include <linux/pm.h> +#include <linux/pm.h>
+#include <linux/of.h>
+ +
+#define MSDC_SMPL_FALLING (1) +#define MSDC_SMPL_FALLING (1)
+#define MSDC_CD_PIN_EN (1 << 0) /* card detection pin is wired */ +#define MSDC_CD_PIN_EN (1 << 0) /* card detection pin is wired */
@ -1916,6 +1917,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+static struct msdc_regs *msdc_reg[HOST_MAX_NUM]; +static struct msdc_regs *msdc_reg[HOST_MAX_NUM];
+#endif +#endif
+ +
+static int mtk_sw_poll;
+
+//================================= +//=================================
+#define PERI_MSDC0_PDN (15) +#define PERI_MSDC0_PDN (15)
+//#define PERI_MSDC1_PDN (16) +//#define PERI_MSDC1_PDN (16)
@ -2331,7 +2334,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ spin_lock(&host->lock); + spin_lock(&host->lock);
+ +
+ if (hw->get_cd_status) { // NULL + if (hw->get_cd_status) { // NULL
+ inserted = hw->get_cd_status(); + inserted = hw->get_cd_status();
+ } else { + } else {
+ status = sdr_read32(MSDC_PS); + status = sdr_read32(MSDC_PS);
+ inserted = (status & MSDC_PS_CDSTS) ? 0 : 1; + inserted = (status & MSDC_PS_CDSTS) ? 0 : 1;
@ -2401,7 +2404,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ //u8 clksrc = hw->clk_src; + //u8 clksrc = hw->clk_src;
+ +
+ if (!hz) { // set mmc system clock to 0 ? + if (!hz) { // set mmc system clock to 0 ?
+ ERR_MSG("set mclk to 0!!!"); + //ERR_MSG("set mclk to 0!!!");
+ msdc_reset(); + msdc_reset();
+ return; + return;
+ } + }
@ -3899,7 +3902,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ +
+ if (msdc_do_request(mmc,mrq)) { + if (msdc_do_request(mmc,mrq)) {
+ if(host->hw->flags & MSDC_REMOVABLE && mrq->data && mrq->data->error) { + if(host->hw->flags & MSDC_REMOVABLE && mrq->data && mrq->data->error) {
+ msdc_tune_request(mmc,mrq); + //msdc_tune_request(mmc,mrq);
+ } + }
+ } + }
+ +
@ -4148,10 +4151,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ +
+ /* card change interrupt */ + /* card change interrupt */
+ if (intsts & MSDC_INT_CDSC){ + if (intsts & MSDC_INT_CDSC){
+#if defined CONFIG_MTK_MMC_CD_POLL + if (mtk_sw_poll)
+ return IRQ_HANDLED; + return IRQ_HANDLED;
+#endif + IRQ_MSG("MSDC_INT_CDSC irq<0x%.8x>", intsts);
+ IRQ_MSG("MSDC_INT_CDSC irq<0x%.8x>", intsts);
+#if 0 /* ---/+++ by chhung: fix slot mechanical bounce issue */ +#if 0 /* ---/+++ by chhung: fix slot mechanical bounce issue */
+ tasklet_hi_schedule(&host->card_tasklet); + tasklet_hi_schedule(&host->card_tasklet);
+#else +#else
@ -4532,9 +4534,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ)) + if ((hw->flags & MSDC_SDIO_IRQ) || (hw->flags & MSDC_EXT_SDIO_IRQ))
+ mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */ + mmc->caps |= MMC_CAP_SDIO_IRQ; /* yes for sdio */
+ +
+#if defined CONFIG_MTK_MMC_CD_POLL + mtk_sw_poll = of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll");
+ mmc->caps |= MMC_CAP_NEEDS_POLL; +
+#endif + if (mtk_sw_poll)
+ mmc->caps |= MMC_CAP_NEEDS_POLL;
+ +
+ /* MMC core transfer sizes tunable parameters */ + /* MMC core transfer sizes tunable parameters */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0) +#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0)