diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-03 10:48:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-03 10:48:06 -0400 |
| commit | 996ec1dcc58a34b53891acde0ec5df9141b5fcc2 (patch) | |
| tree | 3f4c64df2a05124c7204d781caa1b2c963b12ec8 /arch | |
| parent | 97fec7105c6d31f52026921e669ec78e1b7ca623 (diff) | |
| parent | cce573e8d806fd430e7584b36bce6d62ae0430e8 (diff) | |
| download | talos-obmc-uboot-996ec1dcc58a34b53891acde0ec5df9141b5fcc2.tar.gz talos-obmc-uboot-996ec1dcc58a34b53891acde0ec5df9141b5fcc2.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/exynos4210-trats.dts | 4 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/clock.c | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/dts/exynos4210-trats.dts b/arch/arm/dts/exynos4210-trats.dts index 36d02df3b0..f3fac80190 100644 --- a/arch/arm/dts/exynos4210-trats.dts +++ b/arch/arm/dts/exynos4210-trats.dts @@ -117,4 +117,8 @@ sdhci@12540000 { status = "disabled"; }; + + dwmmc@12550000 { + status = "disabled"; + }; }; diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c index 1c6baa14b2..18eadf545f 100644 --- a/arch/arm/mach-exynos/clock.c +++ b/arch/arm/mach-exynos/clock.c @@ -1661,6 +1661,9 @@ unsigned long get_mmc_clk(int dev_index) { enum periph_id id; + if (cpu_is_exynos4()) + return exynos4_get_mmc_clk(dev_index); + switch (dev_index) { case 0: id = PERIPH_ID_SDMMC0; @@ -1679,12 +1682,7 @@ unsigned long get_mmc_clk(int dev_index) return -1; } - if (cpu_is_exynos5()) - return clock_get_periph_rate(id); - else if (cpu_is_exynos4()) - return exynos4_get_mmc_clk(dev_index); - - return 0; + return clock_get_periph_rate(id); } void set_mmc_clk(int dev_index, unsigned int div) |
