diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-07-16 08:51:30 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-07-16 08:51:30 +0200 |
| commit | dab5e3469d294a4e1ffed8407d296a78e02cc01f (patch) | |
| tree | c6378034591210b3142ca3add806d52c6ea22b3b /arch/arm/include/asm/arch-exynos/power.h | |
| parent | 14a1613140519a8d0a88e6054c302a8cb3e067a5 (diff) | |
| parent | 524123a70761110c5cf3ccc5f52f6d4da071b959 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Conflicts:
boards.cfg
Diffstat (limited to 'arch/arm/include/asm/arch-exynos/power.h')
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/power.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-exynos/power.h b/arch/arm/include/asm/arch-exynos/power.h index c9609a23f5..4f2447b3f8 100644 --- a/arch/arm/include/asm/arch-exynos/power.h +++ b/arch/arm/include/asm/arch-exynos/power.h @@ -906,8 +906,8 @@ struct exynos5420_power { unsigned int sysip_dat3; unsigned char res11[0xe0]; unsigned int pmu_spare0; - unsigned int pmu_spare1; - unsigned int pmu_spare2; + unsigned int pmu_spare1; /* Store PHY0_CON4 for read leveling */ + unsigned int pmu_spare2; /* Store PHY1_CON4 for read leveling */ unsigned int pmu_spare3; unsigned char res12[0x4]; unsigned int cg_status0; @@ -1726,4 +1726,5 @@ uint32_t get_reset_status(void); /* Read the resume function and call it */ void power_exit_wakeup(void); + #endif |