diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/bds/board.c | 2 | ||||
| -rw-r--r-- | board/bds/board.h | 5 | ||||
| -rw-r--r-- | board/link/board.c | 2 | ||||
| -rw-r--r-- | board/link/board.h | 3 | ||||
| -rw-r--r-- | board/mccroskey/board.h | 2 | ||||
| -rw-r--r-- | board/slippy/board.c | 2 | ||||
| -rw-r--r-- | board/slippy/board.h | 3 | ||||
| -rw-r--r-- | board/snow/board.h | 2 | ||||
| -rw-r--r-- | board/spring/board.h | 2 |
9 files changed, 14 insertions, 9 deletions
diff --git a/board/bds/board.c b/board/bds/board.c index 92372437a5..d0808f4f37 100644 --- a/board/bds/board.c +++ b/board/bds/board.c @@ -43,6 +43,6 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"RECOVERYn", LM4_GPIO_D, (1<<1), GPIO_PULL_UP, NULL}, {"DEBUG_LED", LM4_GPIO_A, (1<<7), GPIO_OUT_LOW, NULL}, /* Unimplemented signals which we need to emulate for now */ - GPIO_SIGNAL_NOT_IMPLEMENTED("WRITE_PROTECT"), + GPIO_SIGNAL_NOT_IMPLEMENTED("WP"), GPIO_SIGNAL_NOT_IMPLEMENTED("ENTERING_RW"), }; diff --git a/board/bds/board.h b/board/bds/board.h index 770269a9b4..0abb267637 100644 --- a/board/bds/board.h +++ b/board/bds/board.h @@ -21,6 +21,9 @@ #define CONFIG_EOPTION #define CONFIG_PSTORE +/* Write protect is active high */ +#define CONFIG_WP_ACTIVE_HIGH + #ifndef __ASSEMBLER__ enum adc_channel @@ -46,7 +49,7 @@ enum gpio_signal { GPIO_DEBUG_LED, /* Debug LED */ /* Signals which aren't implemented on BDS but we'll emulate anyway, to * make it more convenient to debug other code. */ - GPIO_WRITE_PROTECT, /* Write protect input */ + GPIO_WP, /* Write protect input */ GPIO_ENTERING_RW, /* EC entering RW code */ /* Number of GPIOs; not an actual GPIO */ diff --git a/board/link/board.c b/board/link/board.c index e5eca5a79a..e3cb7522ad 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -73,7 +73,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { switch_interrupt}, {"USB1_STATUS_L", LM4_GPIO_E, (1<<7), 0, NULL}, {"USB2_STATUS_L", LM4_GPIO_E, (1<<1), 0, NULL}, - {"WRITE_PROTECT", LM4_GPIO_J, (1<<4), GPIO_INT_BOTH, + {"WP", LM4_GPIO_J, (1<<4), GPIO_INT_BOTH, switch_interrupt}, /* Outputs; all unasserted by default except for reset signals */ {"CPU_PROCHOT", LM4_GPIO_F, (1<<2), GPIO_OUT_LOW, NULL}, diff --git a/board/link/board.h b/board/link/board.h index b391fbaab6..4623d684ad 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -39,6 +39,7 @@ #define CONFIG_TEMP_SENSOR #define CONFIG_TMP006 #define CONFIG_USB_PORT_POWER_SMART +#define CONFIG_WP_ACTIVE_HIGH #ifndef __ASSEMBLER__ @@ -128,7 +129,7 @@ enum gpio_signal { GPIO_RECOVERY_L, /* Recovery signal from servo */ GPIO_USB1_STATUS_L, /* USB charger port 1 status output */ GPIO_USB2_STATUS_L, /* USB charger port 2 status output */ - GPIO_WRITE_PROTECT, /* Write protect input */ + GPIO_WP, /* Write protect input */ /* Outputs */ GPIO_CPU_PROCHOT, /* Force CPU to think it's overheated */ GPIO_ENABLE_1_5V_DDR, /* Enable +1.5V_DDR supply */ diff --git a/board/mccroskey/board.h b/board/mccroskey/board.h index 8620f73e87..a290ddc691 100644 --- a/board/mccroskey/board.h +++ b/board/mccroskey/board.h @@ -85,7 +85,7 @@ enum gpio_signal { GPIO_KB_OUT12, GPIO_USB_VBUS_CTRL, GPIO_HUB_RESET, - GPIO_WRITE_PROTECTn, + GPIO_WP_L, /* FIXME: this will be an alt. function GPIO, so remove it from here */ GPIO_BL_PWM, diff --git a/board/slippy/board.c b/board/slippy/board.c index 55f1d4a8d8..0bea0d102f 100644 --- a/board/slippy/board.c +++ b/board/slippy/board.c @@ -56,7 +56,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { x86_power_interrupt}, {"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH, switch_interrupt}, - {"WRITE_PROTECT", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, + {"WP", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, switch_interrupt}, /* Other inputs */ diff --git a/board/slippy/board.h b/board/slippy/board.h index 883d6fcb7f..53a6c3a672 100644 --- a/board/slippy/board.h +++ b/board/slippy/board.h @@ -33,6 +33,7 @@ #define CONFIG_PWM_FAN #define CONFIG_TEMP_SENSOR #define CONFIG_USB_PORT_POWER_DUMB +#define CONFIG_WP_ACTIVE_HIGH #ifndef __ASSEMBLER__ @@ -80,7 +81,7 @@ enum gpio_signal { GPIO_VCORE_PGOOD, /* Power good on core VR */ GPIO_PCH_EDP_VDD_EN, /* PCH wants EDP enabled */ GPIO_RECOVERY_L, /* Recovery signal from servo */ - GPIO_WRITE_PROTECT, /* Write protect input */ + GPIO_WP, /* Write protect input */ /* Other inputs */ GPIO_FAN_ALERT_L, /* From thermal sensor */ diff --git a/board/snow/board.h b/board/snow/board.h index 517509abcb..83b7a3c65d 100644 --- a/board/snow/board.h +++ b/board/snow/board.h @@ -76,7 +76,7 @@ enum gpio_signal { GPIO_CHARGER_INT, GPIO_LID_OPEN, /* LID switch detection */ GPIO_SUSPEND_L, /* AP suspend/resume state */ - GPIO_WRITE_PROTECTn, /* Write protection pin (low active) */ + GPIO_WP_L, /* Write protection pin (low active) */ /* Keyboard inputs */ GPIO_KB_IN00, GPIO_KB_IN01, diff --git a/board/spring/board.h b/board/spring/board.h index 44256b4e21..3c342db10a 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -86,7 +86,7 @@ enum gpio_signal { GPIO_CHARGER_INT, GPIO_LID_OPEN, /* LID switch detection */ GPIO_SUSPEND_L, /* AP suspend/resume state */ - GPIO_WRITE_PROTECTn, /* Write protection pin (low active) */ + GPIO_WP_L, /* Write protection pin (low active) */ /* Keyboard inputs */ GPIO_KB_IN00, GPIO_KB_IN01, |