sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

mpc85xx/t104xrdb: convert deep sleep to generic board interface 

A new interface is introduced to support generic board structure.
Converts it to use new interface.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
This commit is contained in:
Tang Yuantian 2014-11-21 11:17:16 +08:00 committed by York Sun
parent 9c7c86f431
commit 0023352855
4 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
board/freescale/t104xrdb/ddr.c
View File

@ -11,6 +11,7 @@
#include <fsl_ddr_sdram.h> #include <fsl_ddr_sdram.h>
#include <fsl_ddr_dimm_params.h> #include <fsl_ddr_dimm_params.h>
#include <asm/fsl_law.h> #include <asm/fsl_law.h>
#include <asm/mpc85xx_gpio.h>
#include "ddr.h" #include "ddr.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -109,6 +110,19 @@ found:
popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm); popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm);
} }
#if defined(CONFIG_DEEP_SLEEP)
void board_mem_sleep_setup(void)
{
void __iomem *cpld_base = (void *)CONFIG_SYS_CPLD_BASE;
/* does not provide HW signals for power management */
clrbits_8(cpld_base + 0x17, 0x40);
/* Disable MCKE isolation */
gpio_set_value(2, 0);
udelay(1);
}
#endif
phys_size_t initdram(int board_type) phys_size_t initdram(int board_type)
{ {
phys_size_t dram_size; phys_size_t dram_size;
@ -124,5 +138,10 @@ phys_size_t initdram(int board_type)
#else #else
dram_size = fsl_ddr_sdram_size(); dram_size = fsl_ddr_sdram_size();
#endif #endif
#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD)
fsl_dp_resume();
#endif
return dram_size; return dram_size;
} }

19
board/freescale/t104xrdb/spl.c
View File

@ -11,7 +11,7 @@
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
#include <spi_flash.h> #include <spi_flash.h>
#include <asm/mpc85xx_gpio.h> #include "../common/sleep.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -64,8 +64,8 @@ void board_init_f(ulong bootflag)
#ifdef CONFIG_DEEP_SLEEP #ifdef CONFIG_DEEP_SLEEP
/* disable the console if boot from deep sleep */ /* disable the console if boot from deep sleep */
if (in_be32(&gur->scrtsr[0]) & (1 << 3)) if (is_warm_boot())
gd->flags |= GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE; fsl_dp_disable_console();
#endif #endif
/* compiler optimization barrier needed for GCC >= 3.4 */ /* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("" : : : "memory"); __asm__ __volatile__("" : : : "memory");
@ -132,16 +132,3 @@ void board_init_r(gd_t *gd, ulong dest_addr)
nand_boot(); nand_boot();
#endif #endif
} }
#ifdef CONFIG_DEEP_SLEEP
void board_mem_sleep_setup(void)
{
void __iomem *cpld_base = (void *)CONFIG_SYS_CPLD_BASE;
/* does not provide HW signals for power management */
clrbits_8(cpld_base + 0x17, 0x40);
/* Disable MCKE isolation */
gpio_set_value(2, 0);
udelay(1);
}
#endif

24
board/freescale/t104xrdb/t104xrdb.c
View File

@ -17,8 +17,7 @@
#include <asm/fsl_portals.h> #include <asm/fsl_portals.h>
#include <asm/fsl_liodn.h> #include <asm/fsl_liodn.h>
#include <fm_eth.h> #include <fm_eth.h>
#include <asm/mpc85xx_gpio.h> #include "../common/sleep.h"
#include "t104xrdb.h" #include "t104xrdb.h"
#include "cpld.h" #include "cpld.h"
@ -44,6 +43,16 @@ int checkboard(void)
return 0; return 0;
} }
int board_early_init_f(void)
{
#if defined(CONFIG_DEEP_SLEEP)
if (is_warm_boot())
fsl_dp_disable_console();
#endif
return 0;
}
int board_early_init_r(void) int board_early_init_r(void)
{ {
#ifdef CONFIG_SYS_FLASH_BASE #ifdef CONFIG_SYS_FLASH_BASE
@ -113,14 +122,3 @@ int ft_board_setup(void *blob, bd_t *bd)
return 0; return 0;
} }
#ifdef CONFIG_DEEP_SLEEP
void board_mem_sleep_setup(void)
{
/* does not provide HW signals for power management */
CPLD_WRITE(misc_ctl_status, (CPLD_READ(misc_ctl_status) & ~0x40));
/* Disable MCKE isolation */
gpio_set_value(2, 0);
udelay(1);
}
#endif

3
include/configs/T104xRDB.h
View File

@ -104,7 +104,10 @@
/* support deep sleep */ /* support deep sleep */
#define CONFIG_DEEP_SLEEP #define CONFIG_DEEP_SLEEP
#if defined(CONFIG_DEEP_SLEEP)
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SILENT_CONSOLE #define CONFIG_SILENT_CONSOLE
#endif
#ifndef CONFIG_SYS_TEXT_BASE #ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xeff40000 #define CONFIG_SYS_TEXT_BASE 0xeff40000