1 files changed, 12 insertions, 34 deletions

diff --git a/src/cpu/samsung/exynos5250/power.c b/src/cpu/samsung/exynos5250/power.c
index be055e35dd..e873129f64 100644
--- a/src/cpu/samsung/exynos5250/power.c
+++ b/src/cpu/samsung/exynos5250/power.c
@@ -19,75 +19,56 @@
 
 /* Power setup code for EXYNOS5 */
 
-#include <console/console.h>
 #include <arch/io.h>
 #include <arch/hlt.h>
-#include "cpu.h"
+#include <console/console.h>
 #include "power.h"
 
 static void ps_hold_setup(void)
 {
-	struct exynos5_power *power =
-		samsung_get_base_power();
-
 	/* Set PS-Hold high */
-	setbits_le32(&power->ps_hold_ctrl, POWER_PS_HOLD_CONTROL_DATA_HIGH);
+	setbits_le32(&exynos_power->ps_hold_ctrl,
+		     POWER_PS_HOLD_CONTROL_DATA_HIGH);
 }
 
 void power_reset(void)
 {
-	struct exynos5_power *power =
-		samsung_get_base_power();
-
 	/* Clear inform1 so there's no change we think we've got a wake reset */
-	power->inform1 = 0;
+	exynos_power->inform1 = 0;
 
-	setbits_le32(&power->sw_reset, 1);
+	setbits_le32(&exynos_power->sw_reset, 1);
 }
 
 /* This function never returns */
 void power_shutdown(void)
 {
-	struct exynos5_power *power =
-		samsung_get_base_power();
-
-	clrbits_le32(&power->ps_hold_ctrl, POWER_PS_HOLD_CONTROL_DATA_HIGH);
+	clrbits_le32(&exynos_power->ps_hold_ctrl,
+		     POWER_PS_HOLD_CONTROL_DATA_HIGH);
 
 	hlt();
 }
 
 void power_enable_dp_phy(void)
 {
-	struct exynos5_power *power =
-		samsung_get_base_power();
-
-	setbits_le32(&power->dptx_phy_control, DPTX_PHY_ENABLE);
+	setbits_le32(&exynos_power->dptx_phy_control, DPTX_PHY_ENABLE);
 }
 
 void power_enable_hw_thermal_trip(void)
 {
-	struct exynos5_power *power =
-		samsung_get_base_power();
-
 	/* Enable HW thermal trip */
-	setbits_le32(&power->ps_hold_ctrl, POWER_ENABLE_HW_TRIP);
+	setbits_le32(&exynos_power->ps_hold_ctrl, POWER_ENABLE_HW_TRIP);
 }
 
 uint32_t power_read_reset_status(void)
 {
-	struct exynos5_power *power =
-		samsung_get_base_power();
-
-	return power->inform1;
+	return exynos_power->inform1;
 }
 
 void power_exit_wakeup(void)
 {
-	struct exynos5_power *power =
-		samsung_get_base_power();
 	typedef void (*resume_func)(void);
 
-	((resume_func)power->inform0)();
+	((resume_func)exynos_power->inform0)();
 }
 
 int power_init(void)
@@ -98,10 +79,7 @@ int power_init(void)
 
 void power_enable_xclkout(void)
 {
-	struct exynos5_power *power =
-		samsung_get_base_power();
-
 	/* use xxti for xclk out */
-	clrsetbits_le32(&power->pmu_debug, PMU_DEBUG_CLKOUT_SEL_MASK,
+	clrsetbits_le32(&exynos_power->pmu_debug, PMU_DEBUG_CLKOUT_SEL_MASK,
 				PMU_DEBUG_XXTI);
 }