diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/Kconfig b/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/Kconfig index a58b0f3dc1..d23ed777fe 100644 --- a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/Kconfig +++ b/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/Kconfig @@ -10,7 +10,3 @@ config MTK_MMC_CD_POLL bool "Card Detect with Polling" depends on MTK_MMC -config MTK_MMC_EMMC_8BIT - bool "eMMC 8-bit support" - depends on MTK_MMC && RALINK_MT7628 - diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c index 97ae927d2d..4ced4b6605 100644 --- a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c +++ b/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c @@ -2207,27 +2207,15 @@ static int msdc_drv_probe(struct platform_device *pdev) int ret; u32 reg; - // Set the pins for sdxc to sdxc mode - //FIXME: this should be done by pinctl and not by the sd driver - if (ralink_soc == MT762X_SOC_MT7620A || - ralink_soc == MT762X_SOC_MT7621AT) { - reg = sdr_read32((void __iomem *)(RALINK_SYSCTL_BASE + - 0x60)) & ~(0x3 << 18); - if (ralink_soc == MT762X_SOC_MT7620A) - reg |= 0x1 << 18; - } else { + //FIXME: this should be done by pinconf and not by the sd driver + if (ralink_soc == MT762X_SOC_MT7688 || + ralink_soc == MT762X_SOC_MT7628AN) { + /* set EPHY pads to digital mode */ reg = sdr_read32((void __iomem *)(RALINK_SYSCTL_BASE + 0x3c)); reg |= 0x1e << 16; sdr_write32((void __iomem *)(RALINK_SYSCTL_BASE + 0x3c), reg); - reg = sdr_read32((void __iomem *)(RALINK_SYSCTL_BASE + - 0x60)) & ~(0x3 << 10); -#if defined(CONFIG_MTK_MMC_EMMC_8BIT) - reg |= 0x3 << 26 | 0x3 << 28 | 0x3 << 30; -#endif } - sdr_write32((void __iomem *)(RALINK_SYSCTL_BASE + 0x60), reg); - hw = &msdc0_hw; if (of_property_read_bool(pdev->dev.of_node, "mtk,wp-en"))