summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-11-14 14:09:25 -0800
committerStefan Agner <stefan.agner@toradex.com>2016-11-14 14:09:25 -0800
commit4a5389d6a62ecfd44c65bbdf7c8f7cd07b3cf1cf (patch)
tree9d73ec6490939f7bd1c9a294c4f6f50d148b9af3
parent1dd1ebb712a8e0af2d140edf88363ecb73050d25 (diff)
examples/imx7_colibri_m4: synchronize with SDB
Synchronize examples with latest versions from the imx7d_sdb_m4 board. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r--examples/imx7_colibri_m4/demo_apps/low_power_imx7d/common/lpm_mcore.c10
-rw-r--r--examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/hardware_init.c4
-rw-r--r--examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/main.c6
-rw-r--r--examples/imx7_colibri_m4/driver_examples/flexcan/flexcan_network/main.c2
4 files changed, 15 insertions, 7 deletions
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/common/lpm_mcore.c b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/common/lpm_mcore.c
index c9a5084..dd3e27b 100644
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/common/lpm_mcore.c
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/common/lpm_mcore.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Freescale Semiconductor, Inc.
+ * Copyright (c) 2015-2016, Freescale Semiconductor, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
@@ -412,11 +412,15 @@ const char* LPM_MCORE_GetPowerStatusString(void)
}
/*
- * Check if A7 LPM Driver is ready
+ * Check if A7 LPM Driver is ready, an "Once Ready, Always Ready" logic is used
*/
uint32_t LPM_MCORE_CheckPeerReady(void)
{
- return (MU_GetFlags(MUB) & MU_SR_Fn(1));
+ static uint32_t a7_ready = 0;
+ if (!a7_ready) {
+ a7_ready = MU_GetFlags(MUB) & MU_SR_Fn(1);
+ }
+ return a7_ready;
}
/*
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/hardware_init.c b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/hardware_init.c
index d36d4f8..87a693d 100644
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/hardware_init.c
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/hardware_init.c
@@ -56,6 +56,10 @@ void hardware_init(void)
CCM_BASE_PTR->PLL_CTRL[i].PLL_CTRL = ccmClockNeededRun;
}
+
+ /* Enable clock gate for wakeup mix*/
+ CCM_ControlGate(CCM, BOARD_SIM_WAKEUP_CCGR, ccmClockNeededAll);
+
/* initialize debug uart */
dbg_uart_init();
diff --git a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/main.c b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/main.c
index 3c75c46..e53d08b 100644
--- a/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/main.c
+++ b/examples/imx7_colibri_m4/demo_apps/low_power_imx7d/rand_wfi/main.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Freescale Semiconductor, Inc.
+ * Copyright (c) 2015-2016, Freescale Semiconductor, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
@@ -46,8 +46,8 @@
///////////////////////////////////////////////////////////////////////////////
// Macros
///////////////////////////////////////////////////////////////////////////////
-#define PERIOD_MIN 5
-#define PERIOD_MAX 10
+#define PERIOD_MIN 15
+#define PERIOD_MAX 20
////////////////////////////////////////////////////////////////////////////////
// Code
diff --git a/examples/imx7_colibri_m4/driver_examples/flexcan/flexcan_network/main.c b/examples/imx7_colibri_m4/driver_examples/flexcan/flexcan_network/main.c
index 6be1572..2332019 100644
--- a/examples/imx7_colibri_m4/driver_examples/flexcan/flexcan_network/main.c
+++ b/examples/imx7_colibri_m4/driver_examples/flexcan/flexcan_network/main.c
@@ -76,7 +76,7 @@ void init_flexcan(void)
{
flexcan_init_config_t initConfig = {
.timing = timing_table[0],
- .operatingMode = flexCanNormalMode,
+ .operatingMode = flexcanNormalMode,
.maxMsgBufNum = 16
};