Merge "windcharger: replace all instances of "gfwc" with "gfmn""
diff --git a/board/atheros/board953x/board953x.c b/board/atheros/board953x/board953x.c
index d6bb382..c71362d 100755
--- a/board/atheros/board953x/board953x.c
+++ b/board/atheros/board953x/board953x.c
@@ -93,18 +93,29 @@
 	udelay(10);
 }
 
-#define GFMN_GPIO_RESET (1 << 13)
-#define GFMN_GPIO_LEDB (1 << 11)
-#define GFMN_GPIO_LEDR (1 << 16)
+#define GFMN_GPIO_HW_REV  (1 << 4)
+#define GFMN_GPIO_LEDB    (1 << 11)
+#define GFMN_GPIO_POE_DIS (1 << 12)
+#define GFMN_GPIO_RESET   (1 << 13)
+#define GFMN_GPIO_LEDR    (1 << 16)
 
 void ath_gpio_config(void)
 {
-	/* GPIO4 configured in cpu/mips/start.S */
+	/* GPIO4 configured in cpu/mips/start.S. We can remove that code when the
+	   original DVT boards are gone.
+
+	              Pre-DVT2       DVT2 and later
+	      GPIO4  |POE_DISABLE    HWREV
+	      GPIO12 |HWREV          POE_DISABLE
+	*/
 
 	ath_reg_rmw_set(GPIO_OE_ADDRESS, GFMN_GPIO_RESET);
 
-	ath_reg_rmw_set(GPIO_OE_ADDRESS, GFMN_GPIO_LEDB | GFMN_GPIO_LEDR);
-	ath_reg_rmw_clear(GPIO_OE_ADDRESS, GFMN_GPIO_LEDB);
+	ath_reg_rmw_clear(GPIO_OE_ADDRESS, GFMN_GPIO_POE_DIS);
+	ath_reg_rmw_clear(GPIO_OUT_ADDRESS, GFMN_GPIO_POE_DIS);
+
+	ath_reg_rmw_clear(GPIO_OE_ADDRESS, GFMN_GPIO_LEDB | GFMN_GPIO_LEDR);
+	ath_reg_rmw_clear(GPIO_OUT_ADDRESS, GFMN_GPIO_LEDB);
 	ath_reg_rmw_set(GPIO_OUT_ADDRESS, GFMN_GPIO_LEDR);
 }