commit eeb7d6a238f42c5c87892f9849cea00725f6d2d5
author Naveen Krishna Chatradhi <ch.naveen@samsung.com> Fri Apr 05 15:21:39 2013 -0700
committer Minkyu Kang <mk7.kang@samsung.com> Thu Jun 13 17:53:37 2013 +0900
tree 9bca0fd93b80a1557ce9c7d8f02e4112800e9190
parent 1149ca005a548aff8e65d44634d31db965ed66bd

power: exynos-tmu: use the mux_addr bit fields in tmu_control register

This patch implements the mux_addr bit fields defined in tmu_control
register (used for debugging purpose)

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Reviewed-by: Vadim Bendebury <vbendeb@google.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

drivers/power/exynos-tmu.c

diff --git a/drivers/power/exynos-tmu.c b/drivers/power/exynos-tmu.c
index 6d74bc7..9a093a5 100644
--- a/drivers/power/exynos-tmu.c
+++ b/drivers/power/exynos-tmu.c
@@ -79,6 +79,8 @@
 struct tmu_info {
 	/* base Address for the TMU */
 	struct exynos5_tmu_reg *tmu_base;
+	/* mux Address for the TMU */
+	int tmu_mux;
 	/* pre-defined values for calibration and thresholds */
 	struct tmu_data data;
 	/* value required for triminfo_25 calibration */
@@ -204,6 +206,13 @@
 	}
 	info->tmu_base = (struct exynos5_tmu_reg *)addr;
 
+	/* Optional field. */
+	info->tmu_mux = fdtdec_get_int(blob,
+				node, "samsung,mux", -1);
+	/* Take default value as per the user manual b(110) */
+	if (info->tmu_mux == -1)
+		info->tmu_mux = 0x6;
+
 	info->data.ts.min_val = fdtdec_get_int(blob,
 				node, "samsung,min-temp", -1);
 	error |= (info->data.ts.min_val == -1);
@@ -307,7 +316,7 @@
 
 	/* TMU core enable */
 	con = readl(&reg->tmu_control);
-	con |= THERM_TRIP_EN | CORE_EN;
+	con |= THERM_TRIP_EN | CORE_EN | (info->tmu_mux << 20);
 
 	writel(con, &reg->tmu_control);