EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ramips: fix sdhci support on mt7621

Browse Source 
the IRQ level was wrong. refresh the patch while at it.

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2016-12-01 18:29:50 +01:00
parent 0b3b8c83c0
commit 7c809f1687
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/ramips/patches-4.4/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
View File

@ -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,3060 @@ @@ -0,0 +1,3067 @@
+/* Copyright Statement: +/* Copyright Statement:
+ * + *
+ * This software/firmware and related documentation ("MediaTek Software") are + * This software/firmware and related documentation ("MediaTek Software") are
@ -1958,7 +1958,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ .dat_drv = 4, + .dat_drv = 4,
+ .data_pins = 4, + .data_pins = 4,
+ .data_offset = 0, + .data_offset = 0,
+ .flags = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED, + .flags = MSDC_SYS_SUSPEND | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,
+// .flags = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE, +// .flags = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,
+}; +};
+ +
@ -4509,6 +4509,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ int ret, irq; + int ret, irq;
+ +
+ pdev->dev.platform_data = &msdc0_hw; + pdev->dev.platform_data = &msdc0_hw;
+
+ if (of_property_read_bool(pdev->dev.of_node, "mtk,wp-en"))
+ msdc0_hw.flags |= MSDC_WP_PIN_EN;
+ +
+ /* Allocate MMC host for this device */ + /* Allocate MMC host for this device */
+ mmc = mmc_alloc_host(sizeof(struct msdc_host), &pdev->dev); + mmc = mmc_alloc_host(sizeof(struct msdc_host), &pdev->dev);
@ -4603,7 +4606,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ spin_lock_init(&host->lock); + spin_lock_init(&host->lock);
+ msdc_init_hw(host); + msdc_init_hw(host);
+ +
+ ret = request_irq((unsigned int)irq, msdc_irq, IRQF_TRIGGER_LOW, dev_name(&pdev->dev), host); + if (ralink_soc == MT762X_SOC_MT7621AT)
+ ret = request_irq((unsigned int)irq, msdc_irq, 0, dev_name(&pdev->dev), host);
+ else
+ ret = request_irq((unsigned int)irq, msdc_irq, IRQF_TRIGGER_LOW, dev_name(&pdev->dev), host);
+
+ if (ret) goto release; + if (ret) goto release;
+ // mt65xx_irq_unmask(irq); /* --- by chhung */ + // mt65xx_irq_unmask(irq); /* --- by chhung */
+ +

21
target/linux/ramips/patches-4.4/0085-sdhci-no-wp.patch
View File

@ -1,21 +0,0 @@
--- a/drivers/mmc/host/mtk-mmc/sd.c
+++ b/drivers/mmc/host/mtk-mmc/sd.c
@@ -195,7 +195,7 @@ struct msdc_hw msdc0_hw = {
.dat_drv = 4,
.data_pins = 4,
.data_offset = 0,
- .flags = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,
+ .flags = MSDC_SYS_SUSPEND | MSDC_CD_PIN_EN | MSDC_REMOVABLE | MSDC_HIGHSPEED,
// .flags = MSDC_SYS_SUSPEND | MSDC_WP_PIN_EN | MSDC_CD_PIN_EN | MSDC_REMOVABLE,
};
@@ -2746,6 +2746,9 @@ static int msdc_drv_probe(struct platfor
int ret, irq;
pdev->dev.platform_data = &msdc0_hw;
+
+ if (of_property_read_bool(pdev->dev.of_node, "mtk,wp-en"))
+ msdc0_hw.flags |= MSDC_WP_PIN_EN;
/* Allocate MMC host for this device */
mmc = mmc_alloc_host(sizeof(struct msdc_host), &pdev->dev);