Merge pull request #8234 from TomoYamanaka/modify_LPTicker

Cruz Monrreal · web-flow · commit 285de88331ff · 2018-10-12T07:43:37.000-05:00
Renesas : Modify LPTicker driver
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/PeripheralPins.c b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/PeripheralPins.c
@@ -246,10 +246,11 @@ const PinMap PinMap_PWM[] = {
     {P7_9  , PWM_TIOC1A, 6},
     {P9_2  , PWM_TIOC1A, 5}, /* for 208QFP */
     {P2_7  , PWM_TIOC1A, 3},
-    {P5_14 , PWM_TIOC2A, 4},
-    {P7_0  , PWM_TIOC2A, 5},
-    {P9_4  , PWM_TIOC2A, 5}, /* for 208QFP */
-    {P2_6  , PWM_TIOC2A, 3},
+    {P6_7  , PWM_TIOC3A, 5},
+    {P2_5  , PWM_TIOC3A, 3},
+    {P3_11 , PWM_TIOC3A, 3},
+    {P6_9  , PWM_TIOC3C, 5},
+    {P3_12 , PWM_TIOC3C, 3},
     {P5_8  , PWM_TIOC4A, 3},
     {P2_4  , PWM_TIOC4A, 3},
     {P5_10 , PWM_TIOC4C, 3},
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/device/os_tick_ostm.c b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/device/os_tick_ostm.c
@@ -194,7 +194,7 @@ uint32_t OS_Tick_GetOverflow (void)
 
 // Get Cortex-A9 OS Timer interrupt number
 IRQn_ID_t mbed_get_a9_tick_irqn(){
-  return OSTMI0TINT_IRQn;
+  return OSTM_IRQn;
 }
 #endif
 
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/mbed_drv_cfg.h b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/mbed_drv_cfg.h
@@ -34,7 +34,7 @@
 
 #define RENESAS_RZ_A1_P0_CLK   CM1_RENESAS_RZ_A1_P0_CLK
 
-#define LP_TICKER_MTU2_CH      3
+#define LP_TICKER_MTU2_CH      2
 
 /* flash (W25Q64JV) */
 #define FLASH_BASE                 (0x18000000UL) /**< Flash Base Address */
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_RZ_A1H/device/os_tick_ostm.c b/targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_RZ_A1H/device/os_tick_ostm.c
@@ -195,7 +195,7 @@ uint32_t OS_Tick_GetOverflow (void)
 
 // Get Cortex-A9 OS Timer interrupt number
 IRQn_ID_t mbed_get_a9_tick_irqn(){
-  return OSTMI0TINT_IRQn;
+  return OSTM_IRQn;
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ uint32_t OS_Tick_GetOverflow (void)`
`194`	`194`
`195`	`195`	`// Get Cortex-A9 OS Timer interrupt number`
`196`	`196`	`IRQn_ID_t mbed_get_a9_tick_irqn(){`
`197`		`- return OSTMI0TINT_IRQn;`
	`197`	`+ return OSTM_IRQn;`
`198`	`198`	`}`
`199`	`199`	`#endif`
`200`	`200`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ uint32_t OS_Tick_GetOverflow (void)`
`195`	`195`
`196`	`196`	`// Get Cortex-A9 OS Timer interrupt number`
`197`	`197`	`IRQn_ID_t mbed_get_a9_tick_irqn(){`
`198`		`- return OSTMI0TINT_IRQn;`
	`198`	`+ return OSTM_IRQn;`
`199`	`199`	`}`
`200`	`200`	`#endif`
`201`	`201`