From e7d06b317373433baee4c6412697e0cd261f62d2 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Fri, 23 Dec 2016 14:59:03 +0530 Subject: toradex: colibri_vf: Fix suspend to mem We rely on u-boot to patch up the "fsl,vf610-ddrmc" node to have the fsl,has-cke-reset-pulls property without which the Vybrid PM code does not enable suspend to mem option. If Toradex config block option is enabled, patch up the device tree for the same. Signed-off-by: Sanchayan Maity Signed-off-by: Stefan Agner --- board/toradex/colibri_vf/colibri_vf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 72ca0b1040..535d1a16d4 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -27,6 +27,7 @@ #include #include #include "../common/tdx-common.h" +#include "../common/tdx-cfg-block.h" DECLARE_GLOBAL_DATA_PTR; @@ -589,6 +590,15 @@ int ft_board_setup(void *blob, bd_t *bd) puts(" Updating MTD partitions...\n"); fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); #endif +#ifdef CONFIG_TDX_CFG_BLOCK + /* + * Colibri VFxx modules V1.2 and later have pull-up/down which allows + * to put the DDR3 memory into self-refresh mode. + */ + if (tdx_hw_tag.ver_major > 1 || tdx_hw_tag.ver_minor >= 2) + do_fixup_by_compat(blob, "fsl,vf610-ddrmc", + "fsl,has-cke-reset-pulls", NULL, 0, 1); +#endif #ifdef CONFIG_FSL_DCU_FB ret = fsl_dcu_fixedfb_setup(blob); if (ret) -- cgit v1.2.3