diff --git a/configs/avr32dev1/src/avr32_buttons.c b/configs/avr32dev1/src/avr32_buttons.c
index 427a19d8352..4514a800a5e 100644
--- a/configs/avr32dev1/src/avr32_buttons.c
+++ b/configs/avr32dev1/src/avr32_buttons.c
@@ -120,7 +120,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions in the board.h header file for the meaning of each bit in
  *   the returned value.
  *
diff --git a/configs/clicker2-stm32/src/stm32_buttons.c b/configs/clicker2-stm32/src/stm32_buttons.c
index 922007dcf6d..00a571c817b 100644
--- a/configs/clicker2-stm32/src/stm32_buttons.c
+++ b/configs/clicker2-stm32/src/stm32_buttons.c
@@ -110,7 +110,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/cloudctrl/src/stm32_buttons.c b/configs/cloudctrl/src/stm32_buttons.c
index 6603ce1d078..574e6a15817 100644
--- a/configs/cloudctrl/src/stm32_buttons.c
+++ b/configs/cloudctrl/src/stm32_buttons.c
@@ -145,7 +145,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to  collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the
+ *   32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *   of each bit.
  *
diff --git a/configs/dk-tm4c129x/src/tm4c_buttons.c b/configs/dk-tm4c129x/src/tm4c_buttons.c
index 7ef91a768be..7a85cda8e84 100644
--- a/configs/dk-tm4c129x/src/tm4c_buttons.c
+++ b/configs/dk-tm4c129x/src/tm4c_buttons.c
@@ -137,7 +137,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/fire-stm32v2/src/stm32_buttons.c b/configs/fire-stm32v2/src/stm32_buttons.c
index 5c041230f98..d1fcbda1833 100644
--- a/configs/fire-stm32v2/src/stm32_buttons.c
+++ b/configs/fire-stm32v2/src/stm32_buttons.c
@@ -121,7 +121,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the
+ *   32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *   of each bit.
  *
diff --git a/configs/freedom-k64f/src/k64_buttons.c b/configs/freedom-k64f/src/k64_buttons.c
index d6f6ea44d6d..53caa760b83 100644
--- a/configs/freedom-k64f/src/k64_buttons.c
+++ b/configs/freedom-k64f/src/k64_buttons.c
@@ -120,7 +120,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may
  *   be called to collect the state of all buttons.  board_buttons() returns
- *   an 8-bit bit set with each bit associated with a button.  See the
+ *   an 32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *   of each bit.
  *
diff --git a/configs/freedom-k66f/src/k66_buttons.c b/configs/freedom-k66f/src/k66_buttons.c
index ce63345c856..b186d40b412 100644
--- a/configs/freedom-k66f/src/k66_buttons.c
+++ b/configs/freedom-k66f/src/k66_buttons.c
@@ -124,7 +124,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may
  *   be called to collect the state of all buttons.  board_buttons() returns
- *   an 8-bit bit set with each bit associated with a button.  See the
+ *   an 32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *   of each bit.
  *
diff --git a/configs/hymini-stm32v/src/stm32_buttons.c b/configs/hymini-stm32v/src/stm32_buttons.c
index 757f159af74..4dac6fc8f41 100644
--- a/configs/hymini-stm32v/src/stm32_buttons.c
+++ b/configs/hymini-stm32v/src/stm32_buttons.c
@@ -120,7 +120,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the
+ *   32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *  of each bit.
  *
diff --git a/configs/kwikstik-k40/src/k40_buttons.c b/configs/kwikstik-k40/src/k40_buttons.c
index 35f673d0ea0..c66c2d858cf 100644
--- a/configs/kwikstik-k40/src/k40_buttons.c
+++ b/configs/kwikstik-k40/src/k40_buttons.c
@@ -92,7 +92,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the
+ *   32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
  *   of each bit.
  *
diff --git a/configs/launchxl-tms57004/src/tms570_buttons.c b/configs/launchxl-tms57004/src/tms570_buttons.c
index 3ee9e0eb31d..d84de8f63a4 100644
--- a/configs/launchxl-tms57004/src/tms570_buttons.c
+++ b/configs/launchxl-tms57004/src/tms570_buttons.c
@@ -154,7 +154,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/nucleo-144/src/stm32_buttons.c b/configs/nucleo-144/src/stm32_buttons.c
index 5d47aa30bd9..a8783b4e20c 100644
--- a/configs/nucleo-144/src/stm32_buttons.c
+++ b/configs/nucleo-144/src/stm32_buttons.c
@@ -92,7 +92,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/nucleo-f303re/src/stm32_buttons.c b/configs/nucleo-f303re/src/stm32_buttons.c
index 8ae6081f489..e40db64c282 100644
--- a/configs/nucleo-f303re/src/stm32_buttons.c
+++ b/configs/nucleo-f303re/src/stm32_buttons.c
@@ -83,7 +83,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit unsigned integer with each bit associated with a button.  See the
+ *   32-bit unsigned integer with each bit associated with a button.  See the
  *   BUTTON_*_BIT definitions in board.h for the meaning of each bit.
  *
  ****************************************************************************/
diff --git a/configs/nucleo-f4x1re/src/stm32_buttons.c b/configs/nucleo-f4x1re/src/stm32_buttons.c
index 30fd294fc59..fe18b0b2163 100644
--- a/configs/nucleo-f4x1re/src/stm32_buttons.c
+++ b/configs/nucleo-f4x1re/src/stm32_buttons.c
@@ -98,7 +98,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/nucleo-l476rg/src/stm32_buttons.c b/configs/nucleo-l476rg/src/stm32_buttons.c
index 55f99e8192b..456795c304e 100644
--- a/configs/nucleo-l476rg/src/stm32_buttons.c
+++ b/configs/nucleo-l476rg/src/stm32_buttons.c
@@ -98,7 +98,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c b/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c
index 9637b125550..2863a332c18 100644
--- a/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c
+++ b/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c
@@ -120,7 +120,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/olimex-stm32-e407/src/stm32_buttons.c b/configs/olimex-stm32-e407/src/stm32_buttons.c
index c57c54f42df..e52d296079b 100644
--- a/configs/olimex-stm32-e407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-e407/src/stm32_buttons.c
@@ -121,7 +121,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON_*_BIT
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
  *   board_button_irq() may be called to register an interrupt handler that
diff --git a/configs/olimex-stm32-h405/src/stm32_buttons.c b/configs/olimex-stm32-h405/src/stm32_buttons.c
index e7bd98cf23e..abcac85c801 100644
--- a/configs/olimex-stm32-h405/src/stm32_buttons.c
+++ b/configs/olimex-stm32-h405/src/stm32_buttons.c
@@ -120,7 +120,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/olimex-stm32-h407/src/stm32_buttons.c b/configs/olimex-stm32-h407/src/stm32_buttons.c
index 976157d1170..1155069e5ef 100644
--- a/configs/olimex-stm32-h407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-h407/src/stm32_buttons.c
@@ -121,7 +121,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON_*_BIT
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
  *   board_button_irq() may be called to register an interrupt handler that
diff --git a/configs/olimex-stm32-p207/src/stm32_buttons.c b/configs/olimex-stm32-p207/src/stm32_buttons.c
index 9400b7456c0..bde278810b0 100644
--- a/configs/olimex-stm32-p207/src/stm32_buttons.c
+++ b/configs/olimex-stm32-p207/src/stm32_buttons.c
@@ -156,7 +156,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/olimex-stm32-p407/src/stm32_buttons.c b/configs/olimex-stm32-p407/src/stm32_buttons.c
index 3d98c9eab7f..a7bf89714df 100644
--- a/configs/olimex-stm32-p407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-p407/src/stm32_buttons.c
@@ -158,7 +158,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/olimexino-stm32/src/stm32_buttons.c b/configs/olimexino-stm32/src/stm32_buttons.c
index cc6ea25509c..092383cadeb 100644
--- a/configs/olimexino-stm32/src/stm32_buttons.c
+++ b/configs/olimexino-stm32/src/stm32_buttons.c
@@ -63,7 +63,7 @@
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.
+ *   32-bit bit set with each bit associated with a button.
  *   See the BUTTON_*_BIT definitions in board.h for the meaning of each bit.
  *
  *   board_button_irq() may be called to register an interrupt handler that
@@ -97,7 +97,7 @@ void board_button_initialize(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.
+ *   32-bit bit set with each bit associated with a button.
  *   See the BUTTON_*_BIT definitions in board.h for the meaning of each bit.
  *
  ****************************************************************************/
diff --git a/configs/pcduino-a10/src/a1x_buttons.c b/configs/pcduino-a10/src/a1x_buttons.c
index c7d10891352..4d4feccc0f9 100644
--- a/configs/pcduino-a10/src/a1x_buttons.c
+++ b/configs/pcduino-a10/src/a1x_buttons.c
@@ -78,7 +78,7 @@ void board_button_initialize(void)
  *
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON* definitions
  *   above for the meaning of each bit in the returned value.
  *
diff --git a/configs/pic32mz-starterkit/src/pic32mz_buttons.c b/configs/pic32mz-starterkit/src/pic32mz_buttons.c
index 206be294c31..639844a953b 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_buttons.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_buttons.c
@@ -140,7 +140,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the
+ *   32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT definitions in board.h for the meaning of each bit.
  *
  *   board_button_irq() may be called to register an interrupt handler that
diff --git a/configs/sam3u-ek/src/sam_buttons.c b/configs/sam3u-ek/src/sam_buttons.c
index 107c7036a66..19a00d97ece 100644
--- a/configs/sam3u-ek/src/sam_buttons.c
+++ b/configs/sam3u-ek/src/sam_buttons.c
@@ -127,7 +127,7 @@ void board_button_initialize(void)
  *
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be called to collect
- *   the state of all buttons.  board_buttons() returns an 8-bit bit set with each bit
+ *   the state of all buttons.  board_buttons() returns an 32-bit bit set with each bit
  *   associated with a button.  See the BUTTON* definitions above for the meaning of
  *   each bit in the returned value.
  *
diff --git a/configs/sam4e-ek/src/sam_buttons.c b/configs/sam4e-ek/src/sam_buttons.c
index 53626290b7b..ed3690782a2 100644
--- a/configs/sam4e-ek/src/sam_buttons.c
+++ b/configs/sam4e-ek/src/sam_buttons.c
@@ -130,7 +130,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/sam4l-xplained/src/sam_buttons.c b/configs/sam4l-xplained/src/sam_buttons.c
index 8d306bb3117..78949a1cde0 100644
--- a/configs/sam4l-xplained/src/sam_buttons.c
+++ b/configs/sam4l-xplained/src/sam_buttons.c
@@ -79,7 +79,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/sam4s-xplained-pro/src/sam_buttons.c b/configs/sam4s-xplained-pro/src/sam_buttons.c
index 3b9b4fe3597..f19f29894ea 100644
--- a/configs/sam4s-xplained-pro/src/sam_buttons.c
+++ b/configs/sam4s-xplained-pro/src/sam_buttons.c
@@ -81,7 +81,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/sam4s-xplained/src/sam_buttons.c b/configs/sam4s-xplained/src/sam_buttons.c
index 314e8e1818a..5b979a1aa95 100644
--- a/configs/sam4s-xplained/src/sam_buttons.c
+++ b/configs/sam4s-xplained/src/sam_buttons.c
@@ -80,7 +80,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/sama5d2-xult/src/sam_buttons.c b/configs/sama5d2-xult/src/sam_buttons.c
index 0939ddaa11d..56548f34804 100644
--- a/configs/sama5d2-xult/src/sam_buttons.c
+++ b/configs/sama5d2-xult/src/sam_buttons.c
@@ -91,7 +91,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/sama5d3-xplained/src/sam_buttons.c b/configs/sama5d3-xplained/src/sam_buttons.c
index 43794b374da..768b7b5db7c 100644
--- a/configs/sama5d3-xplained/src/sam_buttons.c
+++ b/configs/sama5d3-xplained/src/sam_buttons.c
@@ -95,7 +95,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/sama5d3x-ek/src/sam_buttons.c b/configs/sama5d3x-ek/src/sam_buttons.c
index dbdaa310f67..e76fcd2a0ab 100644
--- a/configs/sama5d3x-ek/src/sam_buttons.c
+++ b/configs/sama5d3x-ek/src/sam_buttons.c
@@ -95,7 +95,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/sama5d4-ek/src/sam_buttons.c b/configs/sama5d4-ek/src/sam_buttons.c
index 4ccae619f60..90dff73b160 100644
--- a/configs/sama5d4-ek/src/sam_buttons.c
+++ b/configs/sama5d4-ek/src/sam_buttons.c
@@ -91,7 +91,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/samd20-xplained/src/sam_buttons.c b/configs/samd20-xplained/src/sam_buttons.c
index fc8f14bd0ce..334bf8b4038 100644
--- a/configs/samd20-xplained/src/sam_buttons.c
+++ b/configs/samd20-xplained/src/sam_buttons.c
@@ -79,7 +79,7 @@ void board_button_initialize(void)
  *
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be called to collect
- *   the state of all buttons.  board_buttons() returns an 8-bit bit set with each bit
+ *   the state of all buttons.  board_buttons() returns an 32-bit bit set with each bit
  *   associated with a button.  See the BUTTON* definitions above for the meaning of
  *   each bit in the returned value.
  *
diff --git a/configs/samd21-xplained/src/sam_buttons.c b/configs/samd21-xplained/src/sam_buttons.c
index e4c31aa941e..8e1789d1c9d 100644
--- a/configs/samd21-xplained/src/sam_buttons.c
+++ b/configs/samd21-xplained/src/sam_buttons.c
@@ -79,7 +79,7 @@ void board_button_initialize(void)
  *
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be called to collect
- *   the state of all buttons.  board_buttons() returns an 8-bit bit set with each bit
+ *   the state of all buttons.  board_buttons() returns an 32-bit bit set with each bit
  *   associated with a button.  See the BUTTON* definitions above for the meaning of
  *   each bit in the returned value.
  *
diff --git a/configs/same70-xplained/src/sam_buttons.c b/configs/same70-xplained/src/sam_buttons.c
index 7e66905c8a1..ab7dfeb8cfc 100644
--- a/configs/same70-xplained/src/sam_buttons.c
+++ b/configs/same70-xplained/src/sam_buttons.c
@@ -142,7 +142,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/saml21-xplained/src/sam_buttons.c b/configs/saml21-xplained/src/sam_buttons.c
index 909fa58a7a7..407b24bb4d9 100644
--- a/configs/saml21-xplained/src/sam_buttons.c
+++ b/configs/saml21-xplained/src/sam_buttons.c
@@ -79,7 +79,7 @@ void board_button_initialize(void)
  *
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be called to collect
- *   the state of all buttons.  board_buttons() returns an 8-bit bit set with each bit
+ *   the state of all buttons.  board_buttons() returns an 32-bit bit set with each bit
  *   associated with a button.  See the BUTTON* definitions above for the meaning of
  *   each bit in the returned value.
  *
diff --git a/configs/samv71-xult/src/sam_buttons.c b/configs/samv71-xult/src/sam_buttons.c
index 1a06c840342..adcd280d73f 100644
--- a/configs/samv71-xult/src/sam_buttons.c
+++ b/configs/samv71-xult/src/sam_buttons.c
@@ -158,7 +158,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/shenzhou/src/stm32_buttons.c b/configs/shenzhou/src/stm32_buttons.c
index 139d517956f..57053359b8f 100644
--- a/configs/shenzhou/src/stm32_buttons.c
+++ b/configs/shenzhou/src/stm32_buttons.c
@@ -136,7 +136,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/spark/src/stm32_buttons.c b/configs/spark/src/stm32_buttons.c
index 3ab2f3c8546..3534eeeb6ac 100644
--- a/configs/spark/src/stm32_buttons.c
+++ b/configs/spark/src/stm32_buttons.c
@@ -95,7 +95,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm3210e-eval/src/stm32_buttons.c b/configs/stm3210e-eval/src/stm32_buttons.c
index b9f48228143..f6a8575881f 100644
--- a/configs/stm3210e-eval/src/stm32_buttons.c
+++ b/configs/stm3210e-eval/src/stm32_buttons.c
@@ -148,7 +148,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm3220g-eval/src/stm32_buttons.c b/configs/stm3220g-eval/src/stm32_buttons.c
index 669b460b032..9bec8f3c10b 100644
--- a/configs/stm3220g-eval/src/stm32_buttons.c
+++ b/configs/stm3220g-eval/src/stm32_buttons.c
@@ -136,7 +136,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm3240g-eval/src/stm32_buttons.c b/configs/stm3240g-eval/src/stm32_buttons.c
index 4682ffb1a9f..c543a0b6acb 100644
--- a/configs/stm3240g-eval/src/stm32_buttons.c
+++ b/configs/stm3240g-eval/src/stm32_buttons.c
@@ -144,7 +144,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm32f103-minimum/src/stm32_buttons.c b/configs/stm32f103-minimum/src/stm32_buttons.c
index 6891b3db0a6..154f24225e8 100644
--- a/configs/stm32f103-minimum/src/stm32_buttons.c
+++ b/configs/stm32f103-minimum/src/stm32_buttons.c
@@ -140,7 +140,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns
- *   an 8-bit bit set with each bit associated with a button.  See the
+ *   an 32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT definitions in board.h for the meaning of each bit.
  *
  *   board_button_irq() may be called to register an interrupt handler that
diff --git a/configs/stm32f3discovery/src/stm32_buttons.c b/configs/stm32f3discovery/src/stm32_buttons.c
index a0ecada6a5a..a17912bdbd6 100644
--- a/configs/stm32f3discovery/src/stm32_buttons.c
+++ b/configs/stm32f3discovery/src/stm32_buttons.c
@@ -131,7 +131,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm32f429i-disco/src/stm32_buttons.c b/configs/stm32f429i-disco/src/stm32_buttons.c
index d2e9ba2e095..c5ce618d0c7 100644
--- a/configs/stm32f429i-disco/src/stm32_buttons.c
+++ b/configs/stm32f429i-disco/src/stm32_buttons.c
@@ -131,7 +131,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm32f4discovery/src/stm32_buttons.c b/configs/stm32f4discovery/src/stm32_buttons.c
index 2d86ea80cf7..2b805075e00 100644
--- a/configs/stm32f4discovery/src/stm32_buttons.c
+++ b/configs/stm32f4discovery/src/stm32_buttons.c
@@ -131,7 +131,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm32f746g-disco/src/stm32_buttons.c b/configs/stm32f746g-disco/src/stm32_buttons.c
index b8a46a8dacd..42faf1d90f3 100644
--- a/configs/stm32f746g-disco/src/stm32_buttons.c
+++ b/configs/stm32f746g-disco/src/stm32_buttons.c
@@ -92,7 +92,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm32l476-mdk/src/stm32_buttons.c b/configs/stm32l476-mdk/src/stm32_buttons.c
index 7debe3c5970..58e9079153d 100644
--- a/configs/stm32l476-mdk/src/stm32_buttons.c
+++ b/configs/stm32l476-mdk/src/stm32_buttons.c
@@ -138,7 +138,7 @@ uint32_t board_buttons(void)
  *
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the
+ *   32-bit bit set with each bit associated with a button.  See the
  *   BUTTON_*_BIT definitions in board.h for the meaning of each bit.
  *
  *   board_button_irq() may be called to register an interrupt handler that
diff --git a/configs/stm32l476vg-disco/src/stm32_buttons.c b/configs/stm32l476vg-disco/src/stm32_buttons.c
index f3c4d50c9c5..18b984d2c1f 100644
--- a/configs/stm32l476vg-disco/src/stm32_buttons.c
+++ b/configs/stm32l476vg-disco/src/stm32_buttons.c
@@ -306,7 +306,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm32ldiscovery/src/stm32_buttons.c b/configs/stm32ldiscovery/src/stm32_buttons.c
index f766017d150..d985c9f4d3d 100644
--- a/configs/stm32ldiscovery/src/stm32_buttons.c
+++ b/configs/stm32ldiscovery/src/stm32_buttons.c
@@ -131,7 +131,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/stm32vldiscovery/src/stm32_buttons.c b/configs/stm32vldiscovery/src/stm32_buttons.c
index 9784b19d773..95d9f1590c5 100644
--- a/configs/stm32vldiscovery/src/stm32_buttons.c
+++ b/configs/stm32vldiscovery/src/stm32_buttons.c
@@ -94,7 +94,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/sure-pic32mx/src/pic32mx_buttons.c b/configs/sure-pic32mx/src/pic32mx_buttons.c
index bf5ca03429e..e2ee0ac2195 100644
--- a/configs/sure-pic32mx/src/pic32mx_buttons.c
+++ b/configs/sure-pic32mx/src/pic32mx_buttons.c
@@ -185,7 +185,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/tm4c123g-launchpad/src/tm4c_buttons.c b/configs/tm4c123g-launchpad/src/tm4c_buttons.c
index 96370046f48..24eb21ea04a 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_buttons.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_buttons.c
@@ -113,7 +113,7 @@ void board_button_initialize(void)
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  See the BUTTON*
+ *   32-bit bit set with each bit associated with a button.  See the BUTTON*
  *   definitions above for the meaning of each bit in the returned value.
  *
  ****************************************************************************/
diff --git a/configs/twr-k60n512/src/k60_buttons.c b/configs/twr-k60n512/src/k60_buttons.c
index d9206f2c71a..99bee759102 100644
--- a/configs/twr-k60n512/src/k60_buttons.c
+++ b/configs/twr-k60n512/src/k60_buttons.c
@@ -121,7 +121,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/ubw32/src/pic32_buttons.c b/configs/ubw32/src/pic32_buttons.c
index 69b1deeb442..469167f1379 100644
--- a/configs/ubw32/src/pic32_buttons.c
+++ b/configs/ubw32/src/pic32_buttons.c
@@ -160,7 +160,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT  definitions in
  *   board.h for the meaning of each bit.
  *
diff --git a/configs/viewtool-stm32f107/src/stm32_buttons.c b/configs/viewtool-stm32f107/src/stm32_buttons.c
index 9e39a2d72c4..086a321755a 100644
--- a/configs/viewtool-stm32f107/src/stm32_buttons.c
+++ b/configs/viewtool-stm32f107/src/stm32_buttons.c
@@ -132,7 +132,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/configs/zkit-arm-1769/src/lpc17_buttons.c b/configs/zkit-arm-1769/src/lpc17_buttons.c
index ffa76466861..e93f27734f7 100644
--- a/configs/zkit-arm-1769/src/lpc17_buttons.c
+++ b/configs/zkit-arm-1769/src/lpc17_buttons.c
@@ -142,7 +142,7 @@ uint32_t board_buttons(void)
  *   handlers.
  *
  *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   collect the state of all buttons.  board_buttons() returns an 32-bit bit set
  *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
diff --git a/include/nuttx/board.h b/include/nuttx/board.h
index 310a973c341..c00d09ce3c2 100644
--- a/include/nuttx/board.h
+++ b/include/nuttx/board.h
@@ -581,7 +581,7 @@ void board_button_initialize(void);
  * Description:
  *   After board_button_initialize() has been called, board_buttons() may be
  *   called to collect the state of all buttons.  board_buttons() returns an
- *   8-bit bit set with each bit associated with a button.  A bit set to
+ *   32-bit bit set with each bit associated with a button.  A bit set to
  *   "1" means that the button is depressed; a bit set to "0" means that
  *   the button is released.  The correspondence of the each button bit
  *   and physical buttons is board-specific.