Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-03 17:38:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rockchip: remove no needed code for rk3399

Browse source 
We have do something for clocks gate.

Fox example as the below:
susped:
clk_gate_con_save();
clk_gate_con_disable();

resume:
clk_gate_con_restore();
--

SO, add the plls_suspend_prepare() and plls_resume_finish() are not
necessary to S2R, that will save S2R time if remove them.

BRANCH=none
BUG=chrome-os-partner:58870,chrome-os-partner:55934
TEST=build kevin, two dogfooders with suspend_stress_test
passing 3000 cycles and still going on.

Change-Id: Icfbabc0b3ea8d2b5108d4f3de99a803b6d459669
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
This commit is contained in:
Caesar Wang 2016-10-25 17:14:40 -07:00
parent a14e091621
commit 06077161e9
3 changed files with 0 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plat/rockchip/rk3399/drivers/pmu/pmu.c
View file

@ -1150,7 +1150,6 @@ static int sys_pwr_domain_suspend(void)
* Disabling PLLs/PWM/DVFS is approaching WFI which is * Disabling PLLs/PWM/DVFS is approaching WFI which is
* the last steps in suspend. * the last steps in suspend.
*/ */
plls_suspend_prepare();
disable_dvfs_plls(); disable_dvfs_plls();
disable_pwms(); disable_pwms();
disable_nodvfs_plls(); disable_nodvfs_plls();
@ -1173,7 +1172,6 @@ static int sys_pwr_domain_resume(void)
/* PWM regulators take time to come up; give 300us to be safe. */ /* PWM regulators take time to come up; give 300us to be safe. */
udelay(300); udelay(300);
enable_dvfs_plls(); enable_dvfs_plls();
plls_resume_finish();
secure_watchdog_restore(); secure_watchdog_restore();

51
plat/rockchip/rk3399/drivers/soc/soc.c
View file

@ -214,20 +214,6 @@ void secure_watchdog_restore(void)
WMSK_BIT(PCLK_WDT_CM0_GATE_SHIFT)); WMSK_BIT(PCLK_WDT_CM0_GATE_SHIFT));
} }
static void pll_suspend_prepare(uint32_t pll_id)
{
int i;
if (pll_id == PPLL_ID)
for (i = 0; i < PLL_CON_COUNT; i++)
slp_data.plls_con[pll_id][i] =
mmio_read_32(PMUCRU_BASE + PMUCRU_PPLL_CON(i));
else
for (i = 0; i < PLL_CON_COUNT; i++)
slp_data.plls_con[pll_id][i] =
mmio_read_32(CRU_BASE + CRU_PLL_CON(pll_id, i));
}
static void set_pll_slow_mode(uint32_t pll_id) static void set_pll_slow_mode(uint32_t pll_id)
{ {
if (pll_id == PPLL_ID) if (pll_id == PPLL_ID)
@ -361,23 +347,6 @@ void restore_dpll(void)
restore_pll(DPLL_ID, slp_data.plls_con[DPLL_ID]); restore_pll(DPLL_ID, slp_data.plls_con[DPLL_ID]);
} }
void plls_suspend_prepare(void)
{
uint32_t i, pll_id;
for (pll_id = ALPLL_ID; pll_id < END_PLL_ID; pll_id++)
pll_suspend_prepare(pll_id);
for (i = 0; i < CRU_CLKSEL_COUNT; i++)
slp_data.cru_clksel_con[i] =
mmio_read_32(CRU_BASE + CRU_CLKSEL_CON(i));
for (i = 0; i < PMUCRU_CLKSEL_CONUT; i++)
slp_data.pmucru_clksel_con[i] =
mmio_read_32(PMUCRU_BASE +
PMUCRU_CLKSEL_OFFSET + i * REG_SIZE);
}
void clk_gate_con_save(void) void clk_gate_con_save(void)
{ {
uint32_t i = 0; uint32_t i = 0;
@ -431,26 +400,6 @@ static void _pll_resume(uint32_t pll_id)
set_pll_normal_mode(pll_id); set_pll_normal_mode(pll_id);
} }
void plls_resume_finish(void)
{
int i;
for (i = 0; i < CRU_CLKSEL_COUNT; i++) {
/* CRU_CLKSEL_CON96~107 the high 16-bit isb't write_mask */
if (i > 95)
mmio_write_32((CRU_BASE + CRU_CLKSEL_CON(i)),
slp_data.cru_clksel_con[i]);
else
mmio_write_32((CRU_BASE + CRU_CLKSEL_CON(i)),
REG_SOC_WMSK |
slp_data.cru_clksel_con[i]);
}
for (i = 0; i < PMUCRU_CLKSEL_CONUT; i++)
mmio_write_32((PMUCRU_BASE +
PMUCRU_CLKSEL_OFFSET + i * REG_SIZE),
REG_SOC_WMSK | slp_data.pmucru_clksel_con[i]);
}
/** /**
* enable_dvfs_plls - To resume the specific PLLs * enable_dvfs_plls - To resume the specific PLLs
* *

2
plat/rockchip/rk3399/drivers/soc/soc.h
View file

@ -348,10 +348,8 @@ static inline void pmu_sgrf_rst_hld(void)
void __dead2 soc_global_soft_reset(void); void __dead2 soc_global_soft_reset(void);
void secure_watchdog_disable(); void secure_watchdog_disable();
void secure_watchdog_restore(); void secure_watchdog_restore();
void plls_suspend_prepare(void);
void disable_dvfs_plls(void); void disable_dvfs_plls(void);
void disable_nodvfs_plls(void); void disable_nodvfs_plls(void);
void plls_resume_finish(void);
void enable_dvfs_plls(void); void enable_dvfs_plls(void);
void enable_nodvfs_plls(void); void enable_nodvfs_plls(void);
void prepare_abpll_for_ddrctrl(void); void prepare_abpll_for_ddrctrl(void);