Merge pull request #7421 from codeauroraforum/Fix_MXRT_GPIO_API

Cruz Monrreal · web-flow · commit 39a7e5c48fa6 · 2018-07-06T11:18:33.000-05:00
MIMXRT1050_EVK: Move clock enable after check of pin
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/gpio_api.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/gpio_api.c
@@ -33,12 +33,12 @@ void gpio_init(gpio_t *obj, PinName pin)
 {
     clock_ip_name_t gpio_clocks[] = GPIO_CLOCKS;
 
-    CLOCK_EnableClock(gpio_clocks[pin >> GPIO_PORT_SHIFT]);
-
     obj->pin = pin;
     if (pin == (PinName)NC)
         return;
 
+    CLOCK_EnableClock(gpio_clocks[pin >> GPIO_PORT_SHIFT]);
+
     pin_function(pin, GPIO_MUX_PORT);
 }
 
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/gpio_irq_api.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/gpio_irq_api.c
@@ -156,7 +156,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             break;
     }
 
-    int_index = 2 * obj->port;;
+    int_index = 2 * obj->port;
     if (obj->pin > 15) {
         int_index -= 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ void gpio_init(gpio_t *obj, PinName pin)`
`33`	`33`	`{`
`34`	`34`	`clock_ip_name_t gpio_clocks[] = GPIO_CLOCKS;`
`35`	`35`
`36`		`- CLOCK_EnableClock(gpio_clocks[pin >> GPIO_PORT_SHIFT]);`
`37`		`-`
`38`	`36`	`obj->pin = pin;`
`39`	`37`	`if (pin == (PinName)NC)`
`40`	`38`	`return;`
`41`	`39`
	`40`	`+ CLOCK_EnableClock(gpio_clocks[pin >> GPIO_PORT_SHIFT]);`
	`41`	`+`
`42`	`42`	`pin_function(pin, GPIO_MUX_PORT);`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`156`	`156`	`break;`
`157`	`157`	`}`
`158`	`158`
`159`		`- int_index = 2 * obj->port;;`
	`159`	`+ int_index = 2 * obj->port;`
`160`	`160`	`if (obj->pin > 15) {`
`161`	`161`	`int_index -= 1;`
`162`	`162`	`}`