Skip to content

[TOPIC-GPIO] Convert actinius_icarus and degu_evk boards to new GPIO API #20798

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

Merged
merged 2 commits into from
Dec 11, 2019
Merged

[TOPIC-GPIO] Convert actinius_icarus and degu_evk boards to new GPIO API #20798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba4adf3
boards: actinius_icarus: Update to use the new GPIO API
anangl Nov 19, 2019
3e273c1
boards: degu_evk: Update to use the new GPIO API
anangl Nov 19, 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
8 changes: 4 additions & 4 deletions boards/arm/actinius_icarus/actinius_icarus_common.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
compatible = "gpio-leds";

red_led: led_0 {
gpios = <&gpio0 10 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
label = "Red LED";
};

green_led: led_1 {
gpios = <&gpio0 11 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
label = "Green LED";
};

blue_led: led_2 {
gpios = <&gpio0 12 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
label = "Blue LED";
};
};
Expand All @@ -38,7 +38,7 @@
compatible = "gpio-keys";

button0: button_0 {
gpios = <&gpio0 5 (GPIO_PUD_PULL_UP | GPIO_INT_ACTIVE_LOW)>;
gpios = <&gpio0 5 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "Push Button 1";
};
};
Expand Down
5 changes: 2 additions & 3 deletions boards/arm/actinius_icarus/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ static void select_sim(void)
return;
}

gpio_pin_configure(port, SIM_SELECT_PIN, GPIO_DIR_OUT);
#ifdef CONFIG_BOARD_SELECT_SIM_EXTERNAL
gpio_pin_write(port, SIM_SELECT_PIN, 0);
gpio_pin_configure(port, SIM_SELECT_PIN, GPIO_OUTPUT_LOW);
LOG_INF("External SIM is selected");
#else
gpio_pin_write(port, SIM_SELECT_PIN, 1);
gpio_pin_configure(port, SIM_SELECT_PIN, GPIO_OUTPUT_HIGH);
LOG_INF("eSIM is selected");
#endif
}
Expand Down
9 changes: 3 additions & 6 deletions boards/arm/degu_evk/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,17 @@ static int board_degu_evk_init(struct device *dev)
* Degu Evaluation Kit has a TPS22916C power switch.
* It is connected to GPIO0_26 so we must enable it.
*/
gpio_pin_configure(gpio0, 26, GPIO_DIR_OUT);
gpio_pin_write(gpio0, 26, 1);
gpio_pin_configure(gpio0, 26, GPIO_OUTPUT_HIGH);

/*
* We must enable GPIO1_2 to use Secure Element.
*/
gpio_pin_configure(gpio1, 2, GPIO_DIR_OUT);
gpio_pin_write(gpio1, 2, 1);
gpio_pin_configure(gpio1, 2, GPIO_OUTPUT_HIGH);

/*
* We must enable GPIO1_6 to read Vin voltage.
*/
gpio_pin_configure(gpio1, 6, GPIO_DIR_OUT);
gpio_pin_write(gpio1, 6, 1);
gpio_pin_configure(gpio1, 6, GPIO_OUTPUT_HIGH);

return 0;
}
Expand Down
14 changes: 7 additions & 7 deletions boards/arm/degu_evk/degu_evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@
leds {
compatible = "gpio-leds";
led0: led_0 {
gpios = <&gpio1 7 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
label = "LED1";
};
led1: led_1 {
gpios = <&gpio1 5 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
label = "LED2";
};
led2: led_2 {
gpios = <&gpio1 3 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
label = "LED3";
};
led3: led_3 {
gpios = <&gpio1 4 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
label = "LED4";
};
};

buttons {
compatible = "gpio-keys";
button0: button_0 {
gpios = <&gpio1 0 GPIO_PUD_PULL_UP>;
gpios = <&gpio1 0 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "SW2";
};
button1: button_1 {
gpios = <&gpio1 1 GPIO_PUD_PULL_UP>;
gpios = <&gpio1 1 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "SW3";
};
button2: button_2 {
gpios = <&gpio1 14 GPIO_PUD_PULL_UP>;
gpios = <&gpio1 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
label = "SW4";
};
};
Expand Down