2 files changed, 52 insertions, 19 deletions

diff --git a/src/cpu/samsung/exynos5420/clk.h b/src/cpu/samsung/exynos5420/clk.h
index b37c076582..c5e7f589ba 100644
--- a/src/cpu/samsung/exynos5420/clk.h
+++ b/src/cpu/samsung/exynos5420/clk.h
@@ -25,6 +25,7 @@
 
 enum periph_id;
 
+/* This master list of PLLs is ordered arbitrarily. */
 #define APLL	0
 #define MPLL	1
 #define EPLL	2
@@ -35,16 +36,7 @@ enum periph_id;
 #define SPLL	7
 #define CPLL	8
 #define DPLL	9
-
-enum pll_src_bit {
-	EXYNOS_SRC_CPLL = 1,
-	EXYNOS_SRC_DPLL = 2,
-	EXYNOS_SRC_MPLL = 3,
-	EXYNOS_SRC_SPLL = 4,
-	EXYNOS_SRC_IPLL = 5,
-	EXYNOS_SRC_EPLL = 6,
-	EXYNOS_SRC_RPLL = 7,
-};
+#define IPLL	10
 
 /* *
  * This structure is to store the src bit, div bit and prediv bit
diff --git a/src/cpu/samsung/exynos5420/clock.c b/src/cpu/samsung/exynos5420/clock.c
index b8e27ff5f0..82b1813d5e 100644
--- a/src/cpu/samsung/exynos5420/clock.c
+++ b/src/cpu/samsung/exynos5420/clock.c
@@ -151,6 +151,50 @@ unsigned long get_pll_clk(int pllreg)
 	return fout;
 }
 
+enum peripheral_clock_select {
+	PERIPH_SRC_CPLL = 1,
+	PERIPH_SRC_DPLL = 2,
+	PERIPH_SRC_MPLL = 3,
+	PERIPH_SRC_SPLL = 4,
+	PERIPH_SRC_IPLL = 5,
+	PERIPH_SRC_EPLL = 6,
+	PERIPH_SRC_RPLL = 7,
+};
+
+static int clock_select_to_pll(enum peripheral_clock_select sel)
+{
+	int pll;
+
+	switch (sel) {
+	case PERIPH_SRC_CPLL:
+		pll = CPLL;
+		break;
+	case PERIPH_SRC_DPLL:
+		pll = DPLL;
+		break;
+	case PERIPH_SRC_MPLL:
+		pll = MPLL;
+		break;
+	case PERIPH_SRC_SPLL:
+		pll = SPLL;
+		break;
+	case PERIPH_SRC_IPLL:
+		pll = IPLL;
+		break;
+	case PERIPH_SRC_EPLL:
+		pll = EPLL;
+		break;
+	case PERIPH_SRC_RPLL:
+		pll = RPLL;
+		break;
+	default:
+		pll = -1;
+		break;
+	}
+
+	return pll;
+}
+
 unsigned long clock_get_periph_rate(enum periph_id peripheral)
 {
 	struct clk_bit_info *bit_info = &clk_bit_info[peripheral];
@@ -206,17 +250,14 @@ unsigned long clock_get_periph_rate(enum periph_id peripheral)
 
 	src = (src >> bit_info->src_bit) & 0xf;
 
-	switch (src) {
-	case EXYNOS_SRC_MPLL:
-		sclk = get_pll_clk(MPLL);
-		break;
-	case EXYNOS_SRC_EPLL:
-		sclk = get_pll_clk(EPLL);
-		break;
-	default:
-		return 0;
+	src = clock_select_to_pll(src);
+	if (src < 0) {
+		printk(BIOS_DEBUG, "%s: cannot determine source PLL", __func__);
+		return -1;
 	}
 
+	sclk = get_pll_clk(src);
+
 	/* Ratio clock division for this peripheral */
 	sub_div = (div >> bit_info->div_bit) & 0xf;
 	sub_clk = sclk / (sub_div + 1);