From fe0f3bc557b0a2e5e20a51eaabac08088b9d24c8 Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Wed, 18 Jan 2017 12:23:57 -1000
Subject: [PATCH] PX4FMUV4PRO: moved GPIO defines to
 px4fmu-v4pro/board_config.h

---
 .../boards/px4fmu-v4pro/board_config.h        | 31 ++++++++++++++++++-
 src/drivers/drv_gpio.h                        | 25 ---------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/drivers/boards/px4fmu-v4pro/board_config.h b/src/drivers/boards/px4fmu-v4pro/board_config.h
index 9d9212ddf7..dce1dabfb2 100644
--- a/src/drivers/boards/px4fmu-v4pro/board_config.h
+++ b/src/drivers/boards/px4fmu-v4pro/board_config.h
@@ -326,7 +326,36 @@ __BEGIN_DECLS
 		{GPIO_GPIO4_INPUT,       GPIO_GPIO4_OUTPUT,       0}, \
 		{GPIO_GPIO5_INPUT,       GPIO_GPIO5_OUTPUT,       0}, \
 		{0,                      GPIO_VDD_3V3_SENSORS_EN, 0}, \
-		{GPIO_VDD_BRICK_VALID,   0,                       0}, }
+		{0,                      GPIO_VDD_3V3_PERIPH_EN,  0}, \
+		{GPIO_VDD_BRICK_VALID,   0,                       0}, \
+		{GPIO_VDD_BRICK2_VALID,  0,                       0}, \
+		{GPIO_VBUS_VALID,        0,                       0}, \
+		{GPIO_VDD_5V_RC_OC,      0,                       0}, \
+		{GPIO_VDD_5V_PERIPH_OC,  0,                       0}, }
+
+/*
+ * GPIO numbers.
+ *
+ * There are no alternate functions on this board.
+ */
+#define GPIO_SERVO_1           (1<<0)  /**< servo 1 output */
+#define GPIO_SERVO_2           (1<<1)  /**< servo 2 output */
+#define GPIO_SERVO_3           (1<<2)  /**< servo 3 output */
+#define GPIO_SERVO_4           (1<<3)  /**< servo 4 output */
+#define GPIO_SERVO_5           (1<<4)  /**< servo 5 output */
+#define GPIO_SERVO_6           (1<<5)  /**< servo 6 output */
+
+#define GPIO_3V3_SENSORS_EN    (1<<6)  /**< PE3  - GPIO_VDD_3V3_SENSORS_EN */
+#define GPIO_3V3_PERIPH_EN     (1<<7)  /**< PC5  - GPIO_VDD_3V3_PERIPH_EN  */
+
+#define GPIO_BRICK_VALID       (1<<8)  /**< PB5  - !GPIO_VDD_BRICK_VALID */
+#define GPIO_BRICK2_VALID      (1<<9)  /**< PG5  - !GPIO_VDD_BRICK2_VALID */
+#define GPIO_USB_VBUS_VALID    (1<<10) /**< PC0  - !GPIO_VBUS_VALID */
+
+#define GPIO_5V_RC_OC          (1<<11) /**< PF3  - !GPIO_VDD_5V_RC_OC */
+#define GPIO_5V_PERIPH_OC      (1<<12) /**< PE10 - !GPIO_VDD_5V_PERIPH_OC */
+
+
 
 /* This board provides a DMA pool and APIs */
 
diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h
index 66565de59b..56e73bab6e 100644
--- a/src/drivers/drv_gpio.h
+++ b/src/drivers/drv_gpio.h
@@ -96,30 +96,6 @@
 
 #endif
 
-#if  defined(CONFIG_ARCH_BOARD_PX4FMU_V4PRO)
-/*
- * PX4FMUv4PRO GPIO numbers.
- *
- * There are no alternate functions on this board.
- */
-# define GPIO_SERVO_1           (1<<0)      /**< servo 1 output */
-# define GPIO_SERVO_2           (1<<1)      /**< servo 2 output */
-# define GPIO_SERVO_3           (1<<2)      /**< servo 3 output */
-# define GPIO_SERVO_4           (1<<3)      /**< servo 4 output */
-# define GPIO_SERVO_5           (1<<4)      /**< servo 5 output */
-# define GPIO_SERVO_6           (1<<5)      /**< servo 6 output */
-
-# define GPIO_3V3_SENSORS_EN    (1<<7)      /**< PE3 - VDD_3V3_SENSORS_EN */
-# define GPIO_BRICK_VALID       (1<<8)      /**< PB5 - !VDD_BRICK_VALID */
-
-/**
- * Device paths for things that support the GPIO ioctl protocol.
- */
-# define PX4FMU_DEVICE_PATH	"/dev/px4fmu"
-# define PX4IO_DEVICE_PATH	"/dev/px4io"
-
-#endif
-
 #ifdef CONFIG_ARCH_BOARD_TAP_V1
 /*
  * PX4FMUv3 GPIO numbers.
@@ -192,7 +168,6 @@
 	!defined(CONFIG_ARCH_BOARD_MINDPX_V2)            && \
 	!defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \
 	!defined(CONFIG_ARCH_BOARD_PX4FMU_V1)            && \
-	!defined(CONFIG_ARCH_BOARD_PX4FMU_V4PRO)         && \
 	!defined(CONFIG_ARCH_BOARD_PX4IO_V1)             && \
 	!defined(CONFIG_ARCH_BOARD_PX4IO_V2)             && \
 	!defined(CONFIG_ARCH_BOARD_SITL)                 && \