From d6c1d173ed4ee92de28ad6b498af738f3a93cba4 Mon Sep 17 00:00:00 2001 From: Antony Arun T Date: Mon, 27 May 2019 21:32:30 +0530 Subject: [PATCH] Revert "ipq6018: enable mmc workaround" This reverts commit 27df16579814a992e7b42d29442159cd5cfc2655. Change-Id: Ib729f94b4862cfcd7c3ce1cbc467dade503fc179 Signed-off-by: Antony Arun T --- arch/arm/dts/ipq6018-cp02-c1.dts | 2 +- arch/arm/dts/ipq6018-db-cp01.dts | 2 +- arch/arm/dts/ipq6018-db-cp02.dts | 2 +- arch/arm/dts/ipq6018-emulation.dts | 4 ++++ arch/arm/dts/ipq6018-soc.dtsi | 4 ---- board/qca/arm/ipq6018/ipq6018.c | 5 +---- drivers/mmc/sdhci.c | 9 +-------- 7 files changed, 9 insertions(+), 19 deletions(-) diff --git a/arch/arm/dts/ipq6018-cp02-c1.dts b/arch/arm/dts/ipq6018-cp02-c1.dts index 99b57089b4..77322f6c66 100644 --- a/arch/arm/dts/ipq6018-cp02-c1.dts +++ b/arch/arm/dts/ipq6018-cp02-c1.dts @@ -21,7 +21,7 @@ aliases { console = "/serial@78B1000"; - mmc = "/sdhci@07804000"; + mmc = "/sdhci@7804000"; pci0 = "/pci@20000000"; usb0 = "/xhci@8a00000"; }; diff --git a/arch/arm/dts/ipq6018-db-cp01.dts b/arch/arm/dts/ipq6018-db-cp01.dts index 35dc2ab1f1..b3df693a82 100644 --- a/arch/arm/dts/ipq6018-db-cp01.dts +++ b/arch/arm/dts/ipq6018-db-cp01.dts @@ -21,7 +21,7 @@ aliases { console = "/serial@78B1000"; - mmc = "/sdhci@07804000"; + mmc = "/sdhci@7804000"; pci0 = "/pci@20000000"; usb0 = "/xhci@8a00000"; usb1 = "/xhci@7000000"; diff --git a/arch/arm/dts/ipq6018-db-cp02.dts b/arch/arm/dts/ipq6018-db-cp02.dts index dd3dd94a0a..81c18a6569 100644 --- a/arch/arm/dts/ipq6018-db-cp02.dts +++ b/arch/arm/dts/ipq6018-db-cp02.dts @@ -21,7 +21,7 @@ aliases { console = "/serial@78B1000"; - mmc = "/sdhci@07804000"; + mmc = "/sdhci@7804000"; pci0 = "/pci@20000000"; usb0 = "/xhci@8a00000"; usb1 = "/xhci@7000000"; diff --git a/arch/arm/dts/ipq6018-emulation.dts b/arch/arm/dts/ipq6018-emulation.dts index e8489a148d..be7d1b9670 100644 --- a/arch/arm/dts/ipq6018-emulation.dts +++ b/arch/arm/dts/ipq6018-emulation.dts @@ -112,6 +112,10 @@ nand_gpio {}; }; + mmc: sdhci@7804000 { + compatible = "qcom,sdhci-msm"; + }; + i2c0: i2c@78b6000 { compatible = "qcom,qup-i2c"; #address-cells = <1>; diff --git a/arch/arm/dts/ipq6018-soc.dtsi b/arch/arm/dts/ipq6018-soc.dtsi index 335bec5775..e293eafa5a 100644 --- a/arch/arm/dts/ipq6018-soc.dtsi +++ b/arch/arm/dts/ipq6018-soc.dtsi @@ -66,10 +66,6 @@ reg = <0x7000000 0xcd00>; }; - mmc: sdhci@07804000 { - compatible = "qcom,sdhci-msm"; - }; - spi { status = "ok"; diff --git a/board/qca/arm/ipq6018/ipq6018.c b/board/qca/arm/ipq6018/ipq6018.c index 2aaf807e08..dddbd256e1 100644 --- a/board/qca/arm/ipq6018/ipq6018.c +++ b/board/qca/arm/ipq6018/ipq6018.c @@ -225,12 +225,9 @@ void emmc_clock_config() writel(0x20B, GCC_SDCC1_APPS_CFG_RCGR); /* Delay for clock operation complete */ udelay(10); -/* writel(0x1, GCC_SDCC1_APPS_M); + writel(0x1, GCC_SDCC1_APPS_M); writel(0xFC, GCC_SDCC1_APPS_N); writel(0xFD, GCC_SDCC1_APPS_D); -*/ - writel(0, GCC_SDCC1_APPS_M); - writel(0, GCC_SDCC1_APPS_N); /* Delay for clock operation complete */ udelay(10); /* Update APPS_CMD_RCGR to reflect source selection */ diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 6287e6d2c8..6cb2a3b3d6 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -485,15 +485,8 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock) timeout--; udelay(1000); } -#ifdef CONFIG_IPQ6018 - /*Forcefully change the clk to 24MHz for IPQ6018*/ - if (clock == 52000000) - clk |= 0x00000407; - else - clk |= SDHCI_CLOCK_CARD_EN; -#else + clk |= SDHCI_CLOCK_CARD_EN; -#endif sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); return 0; }