mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ipq6018: enable mmc workaround"

Browse source 
This reverts commit 27df165798.

Change-Id: Ib729f94b4862cfcd7c3ce1cbc467dade503fc179
Signed-off-by: Antony Arun T <antothom@codeaurora.org>
This commit is contained in:
Antony Arun T 2019-05-27 21:32:30 +05:30
parent b858c4fdae
commit d6c1d173ed
7 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/dts/ipq6018-cp02-c1.dts
View file

@ -21,7 +21,7 @@
aliases { aliases {
console = "/serial@78B1000"; console = "/serial@78B1000";
mmc = "/sdhci@07804000"; mmc = "/sdhci@7804000";
pci0 = "/pci@20000000"; pci0 = "/pci@20000000";
usb0 = "/xhci@8a00000"; usb0 = "/xhci@8a00000";
}; };

2
arch/arm/dts/ipq6018-db-cp01.dts
View file

@ -21,7 +21,7 @@
aliases { aliases {
console = "/serial@78B1000"; console = "/serial@78B1000";
mmc = "/sdhci@07804000"; mmc = "/sdhci@7804000";
pci0 = "/pci@20000000"; pci0 = "/pci@20000000";
usb0 = "/xhci@8a00000"; usb0 = "/xhci@8a00000";
usb1 = "/xhci@7000000"; usb1 = "/xhci@7000000";

2
arch/arm/dts/ipq6018-db-cp02.dts
View file

@ -21,7 +21,7 @@
aliases { aliases {
console = "/serial@78B1000"; console = "/serial@78B1000";
mmc = "/sdhci@07804000"; mmc = "/sdhci@7804000";
pci0 = "/pci@20000000"; pci0 = "/pci@20000000";
usb0 = "/xhci@8a00000"; usb0 = "/xhci@8a00000";
usb1 = "/xhci@7000000"; usb1 = "/xhci@7000000";

4
arch/arm/dts/ipq6018-emulation.dts
View file

@ -112,6 +112,10 @@
nand_gpio {}; nand_gpio {};
}; };
mmc: sdhci@7804000 {
compatible = "qcom,sdhci-msm";
};
i2c0: i2c@78b6000 { i2c0: i2c@78b6000 {
compatible = "qcom,qup-i2c"; compatible = "qcom,qup-i2c";
#address-cells = <1>; #address-cells = <1>;

4
arch/arm/dts/ipq6018-soc.dtsi
View file

@ -66,10 +66,6 @@
reg = <0x7000000 0xcd00>; reg = <0x7000000 0xcd00>;
}; };
mmc: sdhci@07804000 {
compatible = "qcom,sdhci-msm";
};
spi { spi {
status = "ok"; status = "ok";

5
board/qca/arm/ipq6018/ipq6018.c
View file

@ -225,12 +225,9 @@ void emmc_clock_config()
writel(0x20B, GCC_SDCC1_APPS_CFG_RCGR); writel(0x20B, GCC_SDCC1_APPS_CFG_RCGR);
/* Delay for clock operation complete */ /* Delay for clock operation complete */
udelay(10); udelay(10);
/* writel(0x1, GCC_SDCC1_APPS_M); writel(0x1, GCC_SDCC1_APPS_M);
writel(0xFC, GCC_SDCC1_APPS_N); writel(0xFC, GCC_SDCC1_APPS_N);
writel(0xFD, GCC_SDCC1_APPS_D); writel(0xFD, GCC_SDCC1_APPS_D);
*/
writel(0, GCC_SDCC1_APPS_M);
writel(0, GCC_SDCC1_APPS_N);
/* Delay for clock operation complete */ /* Delay for clock operation complete */
udelay(10); udelay(10);
/* Update APPS_CMD_RCGR to reflect source selection */ /* Update APPS_CMD_RCGR to reflect source selection */

9
drivers/mmc/sdhci.c
View file

@ -485,15 +485,8 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
timeout--; timeout--;
udelay(1000); 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; clk |= SDHCI_CLOCK_CARD_EN;
#endif
sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
return 0; return 0;
} }