Skip to content

[TOPIC-GPIO] gpio: Update mcux lpc driver to use new gpio api #19714

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 12 commits into from
Oct 17, 2019
Merged

[TOPIC-GPIO] gpio: Update mcux lpc driver to use new gpio api #19714

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
63320ca
gpio: Update mcux lpc driver to use new gpio api
agansari Sep 26, 2019
6568ded
dts: NXP LPC gpio updates
agansari Jun 4, 2019
28d7000
boards: lpcxpresso55s69 pinmux macros refactor
agansari May 28, 2019
64346d5
soc: enable PINT device at LPC SoC boot
agansari Aug 8, 2019
82300ad
west.yaml: hal_nxp updated to latest commit
agansari Oct 9, 2019
67f6c37
soc: LPC55xxx clock comment fix
agansari Oct 9, 2019
1fab3c5
tests: gpio_basic_api fix bad message
agansari Oct 9, 2019
2ddfddb
tests: add LPC boards to gpio_basic_api
agansari Oct 9, 2019
3fd9c6d
tests: lpc devices test pins enablement
agansari Oct 9, 2019
7c07aec
soc: define gpio pull-down for LPC54114
agansari Oct 9, 2019
fe7eed3
dts: lpc devices allocate all gpio interrupts
agansari Oct 9, 2019
b5344b5
drivers: gpio_mcux_lpc GPIO interrupts
agansari Oct 9, 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
6 changes: 3 additions & 3 deletions boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
compatible = "gpio-keys";
user_button_1: button_0 {
label = "User SW1";
gpios = <&gpio0 24 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
};
user_button_2: button_1 {
label = "User SW2";
gpios = <&gpio0 31 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
};
user_button_3: button_2 {
label = "User SW3";
gpios = <&gpio0 4 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
};
};
};
Expand Down
1 change: 1 addition & 0 deletions boards/arm/lpcxpresso54114/pinmux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
IOCON_PIO_OPENDRAIN_DI
);
pinmux_pin_set(port0, 4, port0_pin4_config);

#endif

#ifdef CONFIG_GPIO_MCUX_LPC_PORT1
Expand Down
6 changes: 3 additions & 3 deletions boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
compatible = "gpio-keys";
user_button_1: button_0 {
label = "User SW1";
gpios = <&gpio0 5 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
};
user_button_2: button_1 {
label = "User SW2";
gpios = <&gpio1 18 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
};
user_button_3: button_2 {
label = "User SW3";
gpios = <&gpio1 9 GPIO_INT_ACTIVE_LOW>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
};
};
Expand Down
21 changes: 10 additions & 11 deletions boards/arm/lpcxpresso55s69/pinmux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)

#endif

#ifdef CONFIG_GPIO_MCUX_LPC_PORT0
const u32_t port0_pin5_config = (
#ifdef DT_GPIO_KEYS_SW0_GPIO_CONTROLLER
const u32_t sw0_config = (
IOCON_PIO_FUNC0 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
Expand All @@ -58,12 +58,11 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);

pinmux_pin_set(port0, 5, port0_pin5_config);
pinmux_pin_set(port0, DT_ALIAS_SW0_GPIOS_PIN, sw0_config);
#endif

#ifdef CONFIG_GPIO_MCUX_LPC_PORT0
const u32_t port1_pin18_config = (
#ifdef DT_GPIO_KEYS_SW1_GPIO_CONTROLLER
const u32_t sw1_config = (
IOCON_PIO_FUNC0 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
Expand All @@ -72,10 +71,11 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);
pinmux_pin_set(port1, DT_ALIAS_SW1_GPIOS_PIN, sw1_config);
#endif

pinmux_pin_set(port1, 18, port1_pin18_config);

const u32_t port1_pin9_config = (
#ifdef DT_GPIO_KEYS_SW2_GPIO_CONTROLLER
const u32_t sw2_config = (
IOCON_PIO_FUNC0 |
IOCON_PIO_MODE_PULLUP |
IOCON_PIO_INV_DI |
Expand All @@ -84,8 +84,7 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
IOCON_PIO_SLEW_STANDARD |
IOCON_PIO_OPENDRAIN_DI
);

pinmux_pin_set(port1, 9, port1_pin9_config);
pinmux_pin_set(port1, DT_ALIAS_SW2_GPIOS_PIN, sw2_config);
#endif

return 0;
Expand Down
1 change: 1 addition & 0 deletions drivers/gpio/Kconfig.mcux_lpc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
menuconfig GPIO_MCUX_LPC
bool "MCUX LPC GPIO driver"
depends on HAS_MCUX
select HAS_DTS_GPIO
help
Enable the MCUX LPC pinmux driver.

Expand Down
Loading