michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: nrf: clean up DK board buttons in DTS

Browse source 
Our boards generally follow the following devicetree conventions:

- buttons are defined in the node with path /buttons
- alias sw0 is button 0, sw1 is button 1, and so on

Not all boards follow the convention, though. Align the oddballs for
consistency. This is useful for writing helper libraries that depend
on these conventions. Add a comment describing the odd situation for
nRF9160 DK while we are here.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2021-12-10 16:27:03 -08:00 • committed by Christopher Friedt
commit d565aa2e8a
3 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.dts
View file

@ -42,7 +42,7 @@
};
};
gpio_keys {
buttons {
compatible = "gpio-keys";
button0: button_0 {
label = "Push button switch 0";

2
boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.dts
View file

@ -44,7 +44,7 @@
};
};
gpio_keys {
buttons {
compatible = "gpio-keys";
button0: button_0 {
label = "Push button switch 0";

33
boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts
View file

@ -42,23 +42,30 @@
};
buttons {
/*
* Unlike most DK boards, we do not actually have 4 buttons
* on nRF9160 DK. Instead, we have 2 buttons and 2 switches.
* Treat the switches as buttons anyway, for convenience.
* This makes life easier for software that wants to deal with
* the usual "4 buttons per DK board" convention.
*/
compatible = "gpio-keys";
button0: button_0 {
gpios = <&gpio0 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Switch 1";
};
button1: button_1 {
gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Switch 2";
};
button2: button_2 {
gpios = <&gpio0 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button 1";
};
button3: button_3 {
button1: button_1 {
gpios = <&gpio0 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button 2";
};
button2: button_2 {
gpios = <&gpio0 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Switch 1";
};
button3: button_3 {
gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Switch 2";
};
};
interface_to_nrf52840: gpio-interface {
@ -134,10 +141,10 @@
led2 = &led2;
led3 = &led3;
pwm-led0 = &pwm_led0;
sw0 = &button2;
sw1 = &button3;
sw2 = &button0;
sw3 = &button1;
sw0 = &button0;
sw1 = &button1;
sw2 = &button2;
sw3 = &button3;
bootloader-led0 = &led0;
};
};