Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update GPIO API to support flags used by Linux DT bindings #16648

Merged
merged 12 commits into from
Sep 18, 2019
Merged

Update GPIO API to support flags used by Linux DT bindings #16648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7c76d25
api: gpio: Align GPIO dt-bindings flags with Linux DTS
mnkp Jan 22, 2019
23a3bfd
gpio: add new functions to set/get pin/port values
mnkp May 31, 2019
bc2a539
gpio: add gpio_pin_interrupt_configure function
mnkp Jun 30, 2019
ae7c8cf
gpio: use named types to distinguish pin sets from pin values
pabigot Aug 26, 2019
3dcea2e
tests: add gpio_api_1pin testcase
mnkp Sep 3, 2019
b005e3e
drivers: gpio_gecko: update to use new GPIO API
mnkp Jan 28, 2019
0bd12fb
drivers: gpio_sam: update to use new GPIO API
mnkp Jan 29, 2019
ff873b8
drivers: gpio_nrfx: update to use new GPIO API
mnkp Aug 5, 2019
8b4e7e4
drivers: gpio_mcux: update to use new GPIO API
mnkp Aug 8, 2019
b1a3ead
samples: blinky: update to use new GPIO API
mnkp Jan 28, 2019
09298e4
samples: button: update to use new GPIO API
mnkp Jun 3, 2019
db88003
ci: bump number of minions to see if this builds
galak Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .shippable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ env:
global:
- ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.10.3
- ZEPHYR_TOOLCHAIN_VARIANT=zephyr
- MATRIX_BUILDS="5"
- MATRIX_BUILDS="10"
matrix:
- MATRIX_BUILD="1"
- MATRIX_BUILD="2"
- MATRIX_BUILD="3"
- MATRIX_BUILD="4"
- MATRIX_BUILD="5"
- MATRIX_BUILD="6"
- MATRIX_BUILD="7"
- MATRIX_BUILD="8"
- MATRIX_BUILD="9"
- MATRIX_BUILD="10"

build:
cache: false
Expand Down
3 changes: 1 addition & 2 deletions boards/arm/efm32hg_slstk3400a/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ static int efm32hg_slstk3400a_init(struct device *dev)
return -ENODEV;
}

gpio_pin_configure(bce_dev, BC_ENABLE_GPIO_PIN, GPIO_DIR_OUT);
gpio_pin_write(bce_dev, BC_ENABLE_GPIO_PIN, 1);
gpio_pin_configure(bce_dev, BC_ENABLE_GPIO_PIN, GPIO_OUTPUT_HIGH);

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/efm32hg_slstk3400a/efm32hg_slstk3400a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
compatible = "gpio-keys";
button0: button_0 {
/* gpio flags need validation */
gpios = <&gpioc 9 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpioc 9 GPIO_ACTIVE_LOW>;
label = "User Push Button 0";
};
button1: button_1 {
/* gpio flags need validation */
gpios = <&gpioc 10 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpioc 10 GPIO_ACTIVE_LOW>;
label = "User Push Button 1";
};
};
Expand Down
3 changes: 1 addition & 2 deletions boards/arm/efm32pg_stk3402a/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ static int efm32pg_stk3402a_init(struct device *dev)
return -ENODEV;
}

gpio_pin_configure(bce_dev, BC_ENABLE_GPIO_PIN, GPIO_DIR_OUT);
gpio_pin_write(bce_dev, BC_ENABLE_GPIO_PIN, 1);
gpio_pin_configure(bce_dev, BC_ENABLE_GPIO_PIN, GPIO_OUTPUT_HIGH);

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/efm32pg_stk3402a/efm32pg_stk3402a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
compatible = "gpio-keys";
button0: button_0 {
/* gpio flags need validation */
gpios = <&gpiof 6 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpiof 6 GPIO_ACTIVE_LOW>;
label = "User Push Button 0";
};
button1: button_1 {
/* gpio flags need validation */
gpios = <&gpiof 7 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpiof 7 GPIO_ACTIVE_LOW>;
label = "User Push Button 1";
};
};
Expand Down
3 changes: 1 addition & 2 deletions boards/arm/efm32wg_stk3800/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ static int efm32wg_stk3800_init(struct device *dev)
return -ENODEV;
}

gpio_pin_configure(bce_dev, BC_ENABLE_GPIO_PIN, GPIO_DIR_OUT);
gpio_pin_write(bce_dev, BC_ENABLE_GPIO_PIN, 1);
gpio_pin_configure(bce_dev, BC_ENABLE_GPIO_PIN, GPIO_OUTPUT_HIGH);

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/efm32wg_stk3800/efm32wg_stk3800.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
compatible = "gpio-keys";
button0: button_0 {
/* gpio flags need validation */
gpios = <&gpiob 9 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpiob 9 GPIO_ACTIVE_LOW>;
label = "User Push Button 0";
};
button1: button_1 {
/* gpio flags need validation */
gpios = <&gpiob 19 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpiob 19 GPIO_ACTIVE_LOW>;
label = "User Push Button 1";
};
};
Expand Down
3 changes: 1 addition & 2 deletions boards/arm/efr32_slwstk6061a/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ static int efr32_slwstk6061a_init(struct device *dev)
return -ENODEV;
}

gpio_pin_configure(bce_dev, BC_ENABLE_GPIO_PIN, GPIO_DIR_OUT);
gpio_pin_write(bce_dev, BC_ENABLE_GPIO_PIN, 1);
gpio_pin_configure(bce_dev, BC_ENABLE_GPIO_PIN, GPIO_OUTPUT_HIGH);

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/efr32_slwstk6061a/efr32_slwstk6061a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
compatible = "gpio-keys";
button0: button_0 {
/* gpio flags need validation */
gpios = <&gpiof 6 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpiof 6 GPIO_ACTIVE_LOW>;
label = "User Push Button 0";
};
button1: button_1 {
/* gpio flags need validation */
gpios = <&gpiof 7 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpiof 7 GPIO_ACTIVE_LOW>;
label = "User Push Button 1";
};
};
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/efr32mg_sltb004a/efr32mg_sltb004a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
compatible = "gpio-keys";
button0: button_0 {
/* gpio flags need validation */
gpios = <&gpiod 14 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpiod 14 GPIO_ACTIVE_LOW>;
label = "User Push Button 0";
};
button1: button_1 {
/* gpio flags need validation */
gpios = <&gpiod 15 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpiod 15 GPIO_ACTIVE_LOW>;
label = "User Push Button 1";
};
};
Expand Down
10 changes: 5 additions & 5 deletions boards/arm/frdm_k64f/frdm_k64f.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
leds {
compatible = "gpio-leds";
red_led: led_0 {
gpios = <&gpiob 22 0>;
gpios = <&gpiob 22 GPIO_ACTIVE_LOW>;
label = "User LD1";
};
green_led: led_1 {
gpios = <&gpioe 26 0>;
gpios = <&gpioe 26 GPIO_ACTIVE_LOW>;
label = "User LD2";
};
blue_led: led_2 {
gpios = <&gpiob 21 0>;
gpios = <&gpiob 21 GPIO_ACTIVE_LOW>;
label = "User LD3";
};
};
Expand All @@ -68,11 +68,11 @@
compatible = "gpio-keys";
user_button_2: button_0 {
label = "User SW2";
gpios = <&gpioc 6 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpioc 6 GPIO_ACTIVE_LOW>;
};
user_button_3: button_1 {
label = "User SW3";
gpios = <&gpioa 4 (GPIO_INT_ACTIVE_LOW | GPIO_PUD_PULL_UP)>;
gpios = <&gpioa 4 GPIO_ACTIVE_LOW>;
};
};

Expand Down
10 changes: 5 additions & 5 deletions boards/arm/frdm_kl25z/frdm_kl25z.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
leds {
compatible = "gpio-leds";
red_led: led_0 {
gpios = <&gpiob 18 0>;
gpios = <&gpiob 18 GPIO_ACTIVE_LOW>;
label = "User LD1";
};
green_led: led_1 {
gpios = <&gpiob 19 0>;
gpios = <&gpiob 19 GPIO_ACTIVE_LOW>;
label = "User LD2";
};
blue_led: led_2 {
gpios = <&gpiod 1 0>;
gpios = <&gpiod 1 GPIO_ACTIVE_LOW>;
label = "User LD3";
};
};
Expand All @@ -52,11 +52,11 @@
compatible = "gpio-keys";
user_button_0: button_0 {
label = "User SW0";
gpios = <&gpioa 16 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpioa 16 GPIO_ACTIVE_LOW>;
};
user_button_1: button_1 {
label = "User SW1";
gpios = <&gpioa 17 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpioa 17 GPIO_ACTIVE_LOW>;
};
};
};
Expand Down
10 changes: 5 additions & 5 deletions boards/arm/frdm_kw41z/frdm_kw41z.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
leds {
compatible = "gpio-leds";
red_led: led_0 {
gpios = <&gpioc 1 0>;
gpios = <&gpioc 1 GPIO_ACTIVE_LOW>;
label = "User LD1";
};
green_led: led_1 {
gpios = <&gpioa 19 0>;
gpios = <&gpioa 19 GPIO_ACTIVE_LOW>;
label = "User LD2";
};
blue_led: led_2 {
gpios = <&gpioa 18 0>;
gpios = <&gpioa 18 GPIO_ACTIVE_LOW>;
label = "User LD3";
};
};
Expand All @@ -54,11 +54,11 @@
compatible = "gpio-keys";
user_button_3: button_0 {
label = "User SW3";
gpios = <&gpioc 4 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpioc 4 GPIO_ACTIVE_LOW>;
};
user_button_4: button_1 {
label = "User SW4";
gpios = <&gpioc 5 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpioc 5 GPIO_ACTIVE_LOW>;
};
};
};
Expand Down
6 changes: 3 additions & 3 deletions boards/arm/hexiwear_k64/hexiwear_k64.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
leds {
compatible = "gpio-leds";
red_led: led_0 {
gpios = <&gpioc 8 0>;
gpios = <&gpioc 8 GPIO_ACTIVE_LOW>;
label = "User LD1";
};
green_led: led_1 {
gpios = <&gpiod 0 0>;
gpios = <&gpiod 0 GPIO_ACTIVE_LOW>;
label = "User LD2";
};
blue_led: led_2 {
gpios = <&gpioc 9 0>;
gpios = <&gpioc 9 GPIO_ACTIVE_LOW>;
label = "User LD3";
};
};
Expand Down
8 changes: 2 additions & 6 deletions boards/arm/nrf51_ble400/nrf51_ble400.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,12 @@
/* Push button switch 0 KEY1 */
compatible = "gpio-keys";
button0: button_0 {
gpios = <&gpio0 16 (GPIO_PUD_PULL_UP |
GPIO_INT_ACTIVE_LOW |
GPIO_INT_EDGE)>;
gpios = <&gpio0 16 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button switch 0";
};
/* Push button switch 1 KEY2 */
button1: button_1 {
gpios = <&gpio0 17 (GPIO_PUD_PULL_UP |
GPIO_INT_ACTIVE_LOW |
GPIO_INT_EDGE)>;
gpios = <&gpio0 17 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button switch 1";
};
};
Expand Down
16 changes: 8 additions & 8 deletions boards/arm/nrf51_pca10028/nrf51_pca10028.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,39 @@
leds {
compatible = "gpio-leds";
led0: led_0 {
gpios = <&gpio0 21 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
label = "Green LED 0";
};
led1: led_1 {
gpios = <&gpio0 22 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
label = "Green LED 1";
};
led2: led_2 {
gpios = <&gpio0 23 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
label = "Green LED 2";
};
led3: led_3 {
gpios = <&gpio0 24 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
label = "Green LED 3";
};
};

buttons {
compatible = "gpio-keys";
button0: button_0 {
gpios = <&gpio0 17 GPIO_PUD_PULL_UP>;
gpios = <&gpio0 17 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button switch 0";
};
button1: button_1 {
gpios = <&gpio0 18 GPIO_PUD_PULL_UP>;
gpios = <&gpio0 18 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button switch 1";
};
button2: button_2 {
gpios = <&gpio0 19 GPIO_PUD_PULL_UP>;
gpios = <&gpio0 19 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button switch 2";
};
button3: button_3 {
gpios = <&gpio0 20 GPIO_PUD_PULL_UP>;
gpios = <&gpio0 20 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push button switch 3";
};
};
Expand Down
6 changes: 3 additions & 3 deletions boards/arm/nrf51_pca10031/nrf51_pca10031.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
leds {
compatible = "gpio-leds";
led0_red: led_0 {
gpios = <&gpio0 21 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
label = "Red LED 0";
};
led0_green: led_1 {
gpios = <&gpio0 22 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
label = "Green LED 0";
};
led0_blue: led_2 {
gpios = <&gpio0 23 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
label = "Blue LED 0";
};
};
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
compatible = "gpio-keys";
button0: button_0 {
/* gpio flags need validation */
gpios = <&gpio0 15 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
label = "Button";
};
};
Expand Down
16 changes: 8 additions & 8 deletions boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
leds {
compatible = "gpio-leds";
led0: led_0 {
gpios = <&gpio0 17 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
label = "Green LED 0";
};
led1: led_1 {
gpios = <&gpio0 18 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
label = "Green LED 1";
};
led2: led_2 {
gpios = <&gpio0 19 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
label = "Green LED 2";
};
led3: led_3 {
gpios = <&gpio0 20 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
label = "Green LED 3";
};
};
Expand All @@ -49,19 +49,19 @@
compatible = "gpio-keys";
button0: button_0 {
label = "Push button switch 0";
gpios = <&gpio0 13 GPIO_PUD_PULL_UP>;
gpios = <&gpio0 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
};
button1: button_1 {
label = "Push button switch 1";
gpios = <&gpio0 14 GPIO_PUD_PULL_UP>;
gpios = <&gpio0 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
};
button2: button_2 {
label = "Push button switch 2";
gpios = <&gpio0 15 GPIO_PUD_PULL_UP>;
gpios = <&gpio0 15 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
};
button3: button_3 {
label = "Push button switch 3";
gpios = <&gpio0 16 GPIO_PUD_PULL_UP>;
gpios = <&gpio0 16 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
};
};

Expand Down
Loading