LPC546XX: Fix deepsleep implementation

mmahadevan108 · mmahadevan108 · commit 9a1e7497807d · 2018-04-10T08:16:41.000-05:00
Add a check to return to 220MHz on LPC54628

Signed-off-by: Mahesh Mahadevan &lt;mahesh.mahadevan@nxp.com&gt;
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC/sleep.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC/sleep.c
@@ -26,8 +26,8 @@ void hal_sleep(void)
 
 void hal_deepsleep(void)
 {
-    LPC_CLOCK_INTERNAL_IRC();
+    LPC_CLOCK_INTERNAL_IRC;
     /* Enter Deep Sleep mode */
     POWER_EnterDeepSleep(APP_EXCLUDE_FROM_DEEPSLEEP);
-    LPC_CLOCK_RUN();
+    LPC_CLOCK_RUN;
 }
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/device.h b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/device.h
@@ -25,8 +25,9 @@
      SYSCON_PDRUNCFG_PDEN_SRAM0_MASK | SYSCON_PDRUNCFG_PDEN_SRAM1_2_3_MASK)
 
 /* Defines used by the sleep code */
-#define LPC_CLOCK_INTERNAL_IRC BOARD_BootClockFRO12M
-#define LPC_CLOCK_RUN          BOARD_BootClockFROHF48M
+#define LPC_CLOCK_INTERNAL_IRC BOARD_BootClockFRO12M()
+#define LPC_CLOCK_RUN          ((SYSCON->DEVICE_ID0 == 0xFFF54628) ? \
+                                 BOARD_BootClockPLL220M() : BOARD_BootClockFROHF48M())
 
 #define DEVICE_ID_LENGTH       24
 
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/device.h b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/device.h
@@ -25,8 +25,9 @@
      SYSCON_PDRUNCFG_PDEN_SRAM0_MASK | SYSCON_PDRUNCFG_PDEN_SRAM1_2_3_MASK)
 
 /* Defines used by the sleep code */
-#define LPC_CLOCK_INTERNAL_IRC BOARD_BootClockFRO12M
-#define LPC_CLOCK_RUN          BOARD_BootClockFROHF48M
+#define LPC_CLOCK_INTERNAL_IRC BOARD_BootClockFRO12M()
+#define LPC_CLOCK_RUN          ((SYSCON->DEVICE_ID0 == 0xFFF54628) ? \
+                                 BOARD_BootClockPLL220M() : BOARD_BootClockFROHF48M())
 
 #define DEVICE_ID_LENGTH       24
 

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ void hal_sleep(void)`
`26`	`26`
`27`	`27`	`void hal_deepsleep(void)`
`28`	`28`	`{`
`29`		`- LPC_CLOCK_INTERNAL_IRC();`
	`29`	`+ LPC_CLOCK_INTERNAL_IRC;`
`30`	`30`	`/* Enter Deep Sleep mode */`
`31`	`31`	`POWER_EnterDeepSleep(APP_EXCLUDE_FROM_DEEPSLEEP);`
`32`		`- LPC_CLOCK_RUN();`
	`32`	`+ LPC_CLOCK_RUN;`
`33`	`33`	`}`