Merge "Added GFLT300 support to PON_TX_DIS_L, POW_PWR_EN GPIOs."
diff --git a/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c b/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
index 75804fc..71a4295 100755
--- a/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
+++ b/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
@@ -1615,9 +1615,8 @@
MV_BOARD_GPP_INFO gflt300InfoBoardGppInfo[] = {
/* {{MV_BOARD_GPP_CLASS devClass, MV_U8 gppPinNum}} */
-
- {BOARD_GPP_SYS_LED, 9 , 1},
- {BOARD_GPP_SYS_LED, 10 , 1},
+ {BOARD_GPP_PON_XVR_TX, 21, 1},
+ {BOARD_GPP_PON_XVR_TX_POWER, 37, 0},
};
diff --git a/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h b/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h
index 3b362a2..008b779 100755
--- a/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h
+++ b/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h
@@ -600,12 +600,12 @@
// default all ones-inputs, invert for outputs
#define GFLT300_GPP_OUT_ENA_LOW (~(BIT9 | BIT10 | BIT21))
-#define GFLT300_GPP_OUT_ENA_MID (~(BIT4))
+#define GFLT300_GPP_OUT_ENA_MID (~(BIT5))
// BIT09 turns the LED blue.
// BIT10 turns the LED red.
-#define GFLT300_GPP_OUT_VAL_LOW (BIT9)
-#define GFLT300_GPP_OUT_VAL_MID (BIT4)
+#define GFLT300_GPP_OUT_VAL_LOW (BIT9 | BIT21)
+#define GFLT300_GPP_OUT_VAL_MID (0)
#define GFLT300_GPP_POL_LOW 0x0
#define GFLT300_GPP_POL_MID 0x0
