Merge pull request #8486 from NXPmicro/Update_LPC546XX_Core_Freq

Cruz Monrreal · web-flow · commit 93c5573b4d5d · 2018-10-22T11:43:13.000-05:00
LPC54608: Raise the core freq on LPC54608 targets
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
@@ -27,7 +27,7 @@
 /* Defines used by the sleep code */
 #define LPC_CLOCK_INTERNAL_IRC BOARD_BootClockFRO12M()
 #define LPC_CLOCK_RUN          ((SYSCON->DEVICE_ID0 == 0xFFF54628) ? \
-                                 BOARD_BootClockPLL220M() : BOARD_BootClockFROHF48M())
+                                 BOARD_BootClockPLL220M() : BOARD_BootClockPLL180M())
 
 #define DEVICE_ID_LENGTH       24
 
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/mbed_overrides.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_FF_LPC546XX/mbed_overrides.c
@@ -41,10 +41,12 @@
 void mbed_sdk_init()
 {
     if (SYSCON->DEVICE_ID0 == 0xFFF54628) {
+        BOARD_BootClockFROHF96M(); /* Boot up FROHF96M for SPIFI to use*/
         /* LPC54628 runs at a higher core speed */
         BOARD_BootClockPLL220M();
     } else {
-        BOARD_BootClockFROHF48M();
+        BOARD_BootClockFROHF96M(); /* Boot up FROHF96M for SPIFI to use*/
+        BOARD_BootClockPLL180M();
     }
 }
 
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
@@ -27,7 +27,7 @@
 /* Defines used by the sleep code */
 #define LPC_CLOCK_INTERNAL_IRC BOARD_BootClockFRO12M()
 #define LPC_CLOCK_RUN          ((SYSCON->DEVICE_ID0 == 0xFFF54628) ? \
-                                 BOARD_BootClockPLL220M() : BOARD_BootClockFROHF48M())
+                                 BOARD_BootClockPLL220M() : BOARD_BootClockPLL180M())
 
 #define DEVICE_ID_LENGTH       24
 
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c
@@ -57,10 +57,12 @@ uint32_t FLASHIAP_ReadUid(uint32_t *addr)
 void mbed_sdk_init()
 {
     if (SYSCON->DEVICE_ID0 == 0xFFF54628) {
+        BOARD_BootClockFROHF96M(); /* Boot up FROHF96M for SPIFI to use*/
         /* LPC54628 runs at a higher core speed */
         BOARD_BootClockPLL220M();
     } else {
-        BOARD_BootClockFROHF48M();
+        BOARD_BootClockFROHF96M(); /* Boot up FROHF96M for SPIFI to use*/
+        BOARD_BootClockPLL180M();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,12 @@`
`41`	`41`	`void mbed_sdk_init()`
`42`	`42`	`{`
`43`	`43`	`if (SYSCON->DEVICE_ID0 == 0xFFF54628) {`
	`44`	`+ BOARD_BootClockFROHF96M(); /* Boot up FROHF96M for SPIFI to use*/`
`44`	`45`	`/* LPC54628 runs at a higher core speed */`
`45`	`46`	`BOARD_BootClockPLL220M();`
`46`	`47`	`} else {`
`47`		`- BOARD_BootClockFROHF48M();`
	`48`	`+ BOARD_BootClockFROHF96M(); /* Boot up FROHF96M for SPIFI to use*/`
	`49`	`+ BOARD_BootClockPLL180M();`
`48`	`50`	`}`
`49`	`51`	`}`
`50`	`52`
Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,12 @@ uint32_t FLASHIAP_ReadUid(uint32_t *addr)`
`57`	`57`	`void mbed_sdk_init()`
`58`	`58`	`{`
`59`	`59`	`if (SYSCON->DEVICE_ID0 == 0xFFF54628) {`
	`60`	`+ BOARD_BootClockFROHF96M(); /* Boot up FROHF96M for SPIFI to use*/`
`60`	`61`	`/* LPC54628 runs at a higher core speed */`
`61`	`62`	`BOARD_BootClockPLL220M();`
`62`	`63`	`} else {`
`63`		`- BOARD_BootClockFROHF48M();`
	`64`	`+ BOARD_BootClockFROHF96M(); /* Boot up FROHF96M for SPIFI to use*/`
	`65`	`+ BOARD_BootClockPLL180M();`
`64`	`66`	`}`
`65`	`67`	`}`
`66`	`68`