summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-12-30 09:11:42 -0500
committerTom Rini <trini@ti.com>2014-12-30 09:11:42 -0500
commit87b27c7aa73241d1eb244048f7aee06fc24af4ef (patch)
tree8ca6d21d4f2c10e1682778adf4f25b9c4afe689a /arch/arm/cpu/armv7
parent125738e819a3b9d15210794b3dcef9f4d9bcf866 (diff)
parent66223787869e2059560ac583431e9968ac4cf26f (diff)
downloadu-boot-imx-87b27c7aa73241d1eb244048f7aee06fc24af4ef.zip
u-boot-imx-87b27c7aa73241d1eb244048f7aee06fc24af4ef.tar.gz
u-boot-imx-87b27c7aa73241d1eb244048f7aee06fc24af4ef.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'arch/arm/cpu/armv7')
-rw-r--r--arch/arm/cpu/armv7/exynos/Kconfig4
-rw-r--r--arch/arm/cpu/armv7/exynos/clock.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index f3eadb4..7fcb5d2 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -24,6 +24,10 @@ config TARGET_TRATS2
config TARGET_ODROID
bool "Exynos4412 Odroid board"
+config TARGET_ODROID_XU3
+ bool "Exynos5422 Odroid board"
+ select OF_CONTROL
+
config TARGET_ARNDALE
bool "Exynos5250 Arndale board"
select CPU_V7_HAS_NONSEC
diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c
index 8fab135..b31c13b 100644
--- a/arch/arm/cpu/armv7/exynos/clock.c
+++ b/arch/arm/cpu/armv7/exynos/clock.c
@@ -848,6 +848,8 @@ static unsigned long exynos5420_get_mmc_clk(int dev_index)
if (sel == 0x3)
sclk = get_pll_clk(MPLL);
+ else if (sel == 0x4)
+ sclk = get_pll_clk(SPLL);
else if (sel == 0x6)
sclk = get_pll_clk(EPLL);
else