summaryrefslogtreecommitdiff
path: root/app/boards/arm
diff options
context:
space:
mode:
authorNick <nick.win999@gmail.com>2020-09-19 19:15:05 -0500
committerNick <nick.win999@gmail.com>2020-09-19 19:15:05 -0500
commitda0fb965f6b6a67154e20a3fddda48f5bc392d77 (patch)
treef7f9aa9a45b39bb4d943eb7d2ba6e71d516ab40c /app/boards/arm
parent844f2c76749cbc5ff611d8e69819af82b698089a (diff)
parentc0806d27f1d048db335ecc854eab61b59e23ea7a (diff)
Merge remote-tracking branch 'upstream/main' into bluetooth/battery-reporting
Diffstat (limited to 'app/boards/arm')
-rw-r--r--app/boards/arm/dz60rgb/Kconfig.board2
-rw-r--r--app/boards/arm/dz60rgb/Kconfig.defconfig2
-rw-r--r--app/boards/arm/dz60rgb/dz60rgb_rev1.dts2
-rw-r--r--app/boards/arm/dz60rgb/pinmux.c54
-rw-r--r--app/boards/arm/nrfmicro/Kconfig.board2
-rw-r--r--app/boards/arm/nrfmicro/Kconfig.defconfig2
-rw-r--r--app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi2
-rw-r--r--app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi2
-rw-r--r--app/boards/arm/nrfmicro/nrfmicro_11.dts2
-rw-r--r--app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts2
-rw-r--r--app/boards/arm/nrfmicro/nrfmicro_13.dts2
-rw-r--r--app/boards/arm/nrfmicro/pinmux.c29
-rw-r--r--app/boards/arm/planck/Kconfig.board2
-rw-r--r--app/boards/arm/planck/Kconfig.defconfig2
-rw-r--r--app/boards/arm/planck/pinmux.c52
-rw-r--r--app/boards/arm/proton_c/pinmux.c54
16 files changed, 103 insertions, 110 deletions
diff --git a/app/boards/arm/dz60rgb/Kconfig.board b/app/boards/arm/dz60rgb/Kconfig.board
index a96271f..ec8dad6 100644
--- a/app/boards/arm/dz60rgb/Kconfig.board
+++ b/app/boards/arm/dz60rgb/Kconfig.board
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Nick Winans
+# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
config BOARD_DZ60RGB_REV1
diff --git a/app/boards/arm/dz60rgb/Kconfig.defconfig b/app/boards/arm/dz60rgb/Kconfig.defconfig
index c97a308..779d312 100644
--- a/app/boards/arm/dz60rgb/Kconfig.defconfig
+++ b/app/boards/arm/dz60rgb/Kconfig.defconfig
@@ -1,6 +1,6 @@
# DZ60RGB keyboard configuration
-# Copyright (c) 2020 Nick Winans
+# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
if BOARD_DZ60RGB_REV1
diff --git a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
index dc1b6ea..85c4ca5 100644
--- a/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
+++ b/app/boards/arm/dz60rgb/dz60rgb_rev1.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Nick Winans
+ * Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
diff --git a/app/boards/arm/dz60rgb/pinmux.c b/app/boards/arm/dz60rgb/pinmux.c
index 60e231b..f59a31b 100644
--- a/app/boards/arm/dz60rgb/pinmux.c
+++ b/app/boards/arm/dz60rgb/pinmux.c
@@ -15,55 +15,53 @@
/* pin assignments for STM32F3DISCOVERY board */
static const struct pin_config pinconf[] = {
#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart1), okay) && CONFIG_SERIAL
- {STM32_PIN_PC4, STM32F3_PINMUX_FUNC_PC4_USART1_TX},
- {STM32_PIN_PC5, STM32F3_PINMUX_FUNC_PC5_USART1_RX},
+ {STM32_PIN_PC4, STM32F3_PINMUX_FUNC_PC4_USART1_TX},
+ {STM32_PIN_PC5, STM32F3_PINMUX_FUNC_PC5_USART1_RX},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart2), okay) && CONFIG_SERIAL
- {STM32_PIN_PA2, STM32F3_PINMUX_FUNC_PA2_USART2_TX},
- {STM32_PIN_PA3, STM32F3_PINMUX_FUNC_PA3_USART2_RX},
+ {STM32_PIN_PA2, STM32F3_PINMUX_FUNC_PA2_USART2_TX},
+ {STM32_PIN_PA3, STM32F3_PINMUX_FUNC_PA3_USART2_RX},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
- {STM32_PIN_PB6, STM32F3_PINMUX_FUNC_PB6_I2C1_SCL},
- {STM32_PIN_PB7, STM32F3_PINMUX_FUNC_PB7_I2C1_SDA},
+ {STM32_PIN_PB6, STM32F3_PINMUX_FUNC_PB6_I2C1_SCL},
+ {STM32_PIN_PB7, STM32F3_PINMUX_FUNC_PB7_I2C1_SDA},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay) && CONFIG_I2C
- {STM32_PIN_PA9, STM32F3_PINMUX_FUNC_PA9_I2C2_SCL},
- {STM32_PIN_PA10, STM32F3_PINMUX_FUNC_PA10_I2C2_SDA},
+ {STM32_PIN_PA9, STM32F3_PINMUX_FUNC_PA9_I2C2_SCL},
+ {STM32_PIN_PA10, STM32F3_PINMUX_FUNC_PA10_I2C2_SDA},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay) && CONFIG_SPI
#ifdef CONFIG_SPI_STM32_USE_HW_SS
- {STM32_PIN_PA4, STM32F3_PINMUX_FUNC_PA4_SPI1_NSS},
+ {STM32_PIN_PA4, STM32F3_PINMUX_FUNC_PA4_SPI1_NSS},
#endif /* CONFIG_SPI_STM32_USE_HW_SS */
- {STM32_PIN_PA5, STM32F3_PINMUX_FUNC_PA5_SPI1_SCK},
- {STM32_PIN_PA6, STM32F3_PINMUX_FUNC_PA6_SPI1_MISO},
- {STM32_PIN_PA7, STM32F3_PINMUX_FUNC_PA7_SPI1_MOSI},
+ {STM32_PIN_PA5, STM32F3_PINMUX_FUNC_PA5_SPI1_SCK},
+ {STM32_PIN_PA6, STM32F3_PINMUX_FUNC_PA6_SPI1_MISO},
+ {STM32_PIN_PA7, STM32F3_PINMUX_FUNC_PA7_SPI1_MOSI},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay) && CONFIG_SPI
#ifdef CONFIG_SPI_STM32_USE_HW_SS
- {STM32_PIN_PB12, STM32F3_PINMUX_FUNC_PB12_SPI2_NSS},
+ {STM32_PIN_PB12, STM32F3_PINMUX_FUNC_PB12_SPI2_NSS},
#endif /* CONFIG_SPI_STM32_USE_HW_SS */
- {STM32_PIN_PB13, STM32F3_PINMUX_FUNC_PB13_SPI2_SCK},
- {STM32_PIN_PB14, STM32F3_PINMUX_FUNC_PB14_SPI2_MISO},
- {STM32_PIN_PB15, STM32F3_PINMUX_FUNC_PB15_SPI2_MOSI},
+ {STM32_PIN_PB13, STM32F3_PINMUX_FUNC_PB13_SPI2_SCK},
+ {STM32_PIN_PB14, STM32F3_PINMUX_FUNC_PB14_SPI2_MISO},
+ {STM32_PIN_PB15, STM32F3_PINMUX_FUNC_PB15_SPI2_MOSI},
#endif
#ifdef CONFIG_USB_DC_STM32
- {STM32_PIN_PA11, STM32F3_PINMUX_FUNC_PA11_USB_DM},
- {STM32_PIN_PA12, STM32F3_PINMUX_FUNC_PA12_USB_DP},
-#endif /* CONFIG_USB_DC_STM32 */
+ {STM32_PIN_PA11, STM32F3_PINMUX_FUNC_PA11_USB_DM},
+ {STM32_PIN_PA12, STM32F3_PINMUX_FUNC_PA12_USB_DP},
+#endif /* CONFIG_USB_DC_STM32 */
#if DT_NODE_HAS_STATUS(DT_NODELABEL(can1), okay) && CONFIG_CAN
- {STM32_PIN_PD0, STM32F3_PINMUX_FUNC_PD0_CAN1_RX},
- {STM32_PIN_PD1, STM32F3_PINMUX_FUNC_PD1_CAN1_TX},
+ {STM32_PIN_PD0, STM32F3_PINMUX_FUNC_PD0_CAN1_RX},
+ {STM32_PIN_PD1, STM32F3_PINMUX_FUNC_PD1_CAN1_TX},
#endif
};
-static int pinmux_stm32_init(struct device *port)
-{
- ARG_UNUSED(port);
+static int pinmux_stm32_init(struct device *port) {
+ ARG_UNUSED(port);
- stm32_setup_pins(pinconf, ARRAY_SIZE(pinconf));
+ stm32_setup_pins(pinconf, ARRAY_SIZE(pinconf));
- return 0;
+ return 0;
}
-SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1,
- CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY); \ No newline at end of file
+SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1, CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY); \ No newline at end of file
diff --git a/app/boards/arm/nrfmicro/Kconfig.board b/app/boards/arm/nrfmicro/Kconfig.board
index 177373a..36b2d55 100644
--- a/app/boards/arm/nrfmicro/Kconfig.board
+++ b/app/boards/arm/nrfmicro/Kconfig.board
@@ -1,6 +1,6 @@
# nrfmicro board configuration
-# Copyright (c) 2020 Okke Formsma, joric
+# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
config BOARD_NRFMICRO_11
diff --git a/app/boards/arm/nrfmicro/Kconfig.defconfig b/app/boards/arm/nrfmicro/Kconfig.defconfig
index 9cce5a9..7957b4a 100644
--- a/app/boards/arm/nrfmicro/Kconfig.defconfig
+++ b/app/boards/arm/nrfmicro/Kconfig.defconfig
@@ -1,6 +1,6 @@
# Electronut Labs Papyr board configuration
-# Copyright (c) 2020 Okke Formsma, joric
+# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
if BOARD_NRFMICRO_11 || BOARD_NRFMICRO_11_FLIPPED || BOARD_NRFMICRO_13
diff --git a/app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi b/app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi
index 6cde2b4..558391d 100644
--- a/app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Okke Formsma, joric
+ * Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
diff --git a/app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi b/app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi
index 9bad7f4..68ca266 100644
--- a/app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi
+++ b/app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Okke Formsma, joric
+ * Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11.dts b/app/boards/arm/nrfmicro/nrfmicro_11.dts
index dc07ac8..95bd8ad 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_11.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_11.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Okke Formsma, joric
+ * Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
index 5bf493f..85693a8 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Okke Formsma, joric
+ * Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
diff --git a/app/boards/arm/nrfmicro/nrfmicro_13.dts b/app/boards/arm/nrfmicro/nrfmicro_13.dts
index dc07ac8..95bd8ad 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_13.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_13.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Okke Formsma, joric
+ * Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
diff --git a/app/boards/arm/nrfmicro/pinmux.c b/app/boards/arm/nrfmicro/pinmux.c
index 3792b59..4e330b6 100644
--- a/app/boards/arm/nrfmicro/pinmux.c
+++ b/app/boards/arm/nrfmicro/pinmux.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Okke Formsma, joric
+ * Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
@@ -11,31 +11,30 @@
#include <sys/sys_io.h>
#include <devicetree.h>
-static int pinmux_nrfmicro_init(struct device *port)
-{
- ARG_UNUSED(port);
+static int pinmux_nrfmicro_init(struct device *port) {
+ ARG_UNUSED(port);
- struct device *p1 = device_get_binding("GPIO_1");
+ struct device *p1 = device_get_binding("GPIO_1");
#if CONFIG_BOARD_NRFMICRO_13
- struct device *p0 = device_get_binding("GPIO_0");
- // enable EXT_VCC (use 0 for nRFMicro 1.3, use 1 for nRFMicro 1.1)
- gpio_pin_configure(p1, 9, GPIO_OUTPUT);
- gpio_pin_set(p1, 9, 0);
+ struct device *p0 = device_get_binding("GPIO_0");
+ // enable EXT_VCC (use 0 for nRFMicro 1.3, use 1 for nRFMicro 1.1)
+ gpio_pin_configure(p1, 9, GPIO_OUTPUT);
+ gpio_pin_set(p1, 9, 0);
#if CONFIG_BOARD_NRFMICRO_CHARGER
- gpio_pin_configure(p0, 5, GPIO_OUTPUT);
- gpio_pin_set(p0, 5, 0);
+ gpio_pin_configure(p0, 5, GPIO_OUTPUT);
+ gpio_pin_set(p0, 5, 0);
#else
- gpio_pin_configure(p0, 5, GPIO_INPUT);
+ gpio_pin_configure(p0, 5, GPIO_INPUT);
#endif
#else
// enable EXT_VCC (use 0 for nRFMicro 1.3, use 1 for nRFMicro 1.1)
- gpio_pin_configure(p1, 9, GPIO_OUTPUT);
- gpio_pin_set(p1, 9, 1);
+ gpio_pin_configure(p1, 9, GPIO_OUTPUT);
+ gpio_pin_set(p1, 9, 1);
#endif
- return 0;
+ return 0;
}
SYS_INIT(pinmux_nrfmicro_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
diff --git a/app/boards/arm/planck/Kconfig.board b/app/boards/arm/planck/Kconfig.board
index 0952448..fe15e1a 100644
--- a/app/boards/arm/planck/Kconfig.board
+++ b/app/boards/arm/planck/Kconfig.board
@@ -1,6 +1,6 @@
# Planck V6 board configuration
-# Copyright (c) 2020 Peter Johanson
+# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
config BOARD_PLANCK_REV6
diff --git a/app/boards/arm/planck/Kconfig.defconfig b/app/boards/arm/planck/Kconfig.defconfig
index 93118d4..6f5bf52 100644
--- a/app/boards/arm/planck/Kconfig.defconfig
+++ b/app/boards/arm/planck/Kconfig.defconfig
@@ -1,6 +1,6 @@
# Planck keyboard configuration
-# Copyright (c) 2020 Peter Johanson
+# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
if BOARD_PLANCK_REV6
diff --git a/app/boards/arm/planck/pinmux.c b/app/boards/arm/planck/pinmux.c
index 5df5c90..61cc16a 100644
--- a/app/boards/arm/planck/pinmux.c
+++ b/app/boards/arm/planck/pinmux.c
@@ -15,55 +15,53 @@
/* pin assignments for STM32F3DISCOVERY board */
static const struct pin_config pinconf[] = {
#ifdef CONFIG_UART_1
- {STM32_PIN_PC4, STM32F3_PINMUX_FUNC_PC4_USART1_TX},
- {STM32_PIN_PC5, STM32F3_PINMUX_FUNC_PC5_USART1_RX},
+ {STM32_PIN_PC4, STM32F3_PINMUX_FUNC_PC4_USART1_TX},
+ {STM32_PIN_PC5, STM32F3_PINMUX_FUNC_PC5_USART1_RX},
#endif /* CONFIG_UART_1 */
#ifdef CONFIG_UART_2
- {STM32_PIN_PA2, STM32F3_PINMUX_FUNC_PA2_USART2_TX},
- {STM32_PIN_PA3, STM32F3_PINMUX_FUNC_PA3_USART2_RX},
+ {STM32_PIN_PA2, STM32F3_PINMUX_FUNC_PA2_USART2_TX},
+ {STM32_PIN_PA3, STM32F3_PINMUX_FUNC_PA3_USART2_RX},
#endif /* CONFIG_UART_2 */
#ifdef CONFIG_I2C_1
- {STM32_PIN_PB6, STM32F3_PINMUX_FUNC_PB6_I2C1_SCL},
- {STM32_PIN_PB7, STM32F3_PINMUX_FUNC_PB7_I2C1_SDA},
+ {STM32_PIN_PB6, STM32F3_PINMUX_FUNC_PB6_I2C1_SCL},
+ {STM32_PIN_PB7, STM32F3_PINMUX_FUNC_PB7_I2C1_SDA},
#endif /* CONFIG_I2C_1 */
#ifdef CONFIG_I2C_2
- {STM32_PIN_PA9, STM32F3_PINMUX_FUNC_PA9_I2C2_SCL},
- {STM32_PIN_PA10, STM32F3_PINMUX_FUNC_PA10_I2C2_SDA},
+ {STM32_PIN_PA9, STM32F3_PINMUX_FUNC_PA9_I2C2_SCL},
+ {STM32_PIN_PA10, STM32F3_PINMUX_FUNC_PA10_I2C2_SDA},
#endif /* CONFIG_I2C_2 */
#ifdef CONFIG_SPI_1
#ifdef CONFIG_SPI_STM32_USE_HW_SS
- {STM32_PIN_PA4, STM32F3_PINMUX_FUNC_PA4_SPI1_NSS},
+ {STM32_PIN_PA4, STM32F3_PINMUX_FUNC_PA4_SPI1_NSS},
#endif /* CONFIG_SPI_STM32_USE_HW_SS */
- {STM32_PIN_PA5, STM32F3_PINMUX_FUNC_PA5_SPI1_SCK},
- {STM32_PIN_PA6, STM32F3_PINMUX_FUNC_PA6_SPI1_MISO},
- {STM32_PIN_PA7, STM32F3_PINMUX_FUNC_PA7_SPI1_MOSI},
+ {STM32_PIN_PA5, STM32F3_PINMUX_FUNC_PA5_SPI1_SCK},
+ {STM32_PIN_PA6, STM32F3_PINMUX_FUNC_PA6_SPI1_MISO},
+ {STM32_PIN_PA7, STM32F3_PINMUX_FUNC_PA7_SPI1_MOSI},
#endif /* CONFIG_SPI_1 */
#ifdef CONFIG_SPI_2
#ifdef CONFIG_SPI_STM32_USE_HW_SS
- {STM32_PIN_PB12, STM32F3_PINMUX_FUNC_PB12_SPI2_NSS},
+ {STM32_PIN_PB12, STM32F3_PINMUX_FUNC_PB12_SPI2_NSS},
#endif /* CONFIG_SPI_STM32_USE_HW_SS */
- {STM32_PIN_PB13, STM32F3_PINMUX_FUNC_PB13_SPI2_SCK},
- {STM32_PIN_PB14, STM32F3_PINMUX_FUNC_PB14_SPI2_MISO},
- {STM32_PIN_PB15, STM32F3_PINMUX_FUNC_PB15_SPI2_MOSI},
+ {STM32_PIN_PB13, STM32F3_PINMUX_FUNC_PB13_SPI2_SCK},
+ {STM32_PIN_PB14, STM32F3_PINMUX_FUNC_PB14_SPI2_MISO},
+ {STM32_PIN_PB15, STM32F3_PINMUX_FUNC_PB15_SPI2_MOSI},
#endif /* CONFIG_SPI_2 */
#ifdef CONFIG_USB_DC_STM32
- {STM32_PIN_PA11, STM32F3_PINMUX_FUNC_PA11_USB_DM},
- {STM32_PIN_PA12, STM32F3_PINMUX_FUNC_PA12_USB_DP},
+ {STM32_PIN_PA11, STM32F3_PINMUX_FUNC_PA11_USB_DM},
+ {STM32_PIN_PA12, STM32F3_PINMUX_FUNC_PA12_USB_DP},
#endif /* CONFIG_USB_DC_STM32 */
#ifdef CONFIG_CAN_1
- {STM32_PIN_PD0, STM32F3_PINMUX_FUNC_PD0_CAN1_RX},
- {STM32_PIN_PD1, STM32F3_PINMUX_FUNC_PD1_CAN1_TX},
+ {STM32_PIN_PD0, STM32F3_PINMUX_FUNC_PD0_CAN1_RX},
+ {STM32_PIN_PD1, STM32F3_PINMUX_FUNC_PD1_CAN1_TX},
#endif /* CONFIG_CAN_1 */
};
-static int pinmux_stm32_init(struct device *port)
-{
- ARG_UNUSED(port);
+static int pinmux_stm32_init(struct device *port) {
+ ARG_UNUSED(port);
- stm32_setup_pins(pinconf, ARRAY_SIZE(pinconf));
+ stm32_setup_pins(pinconf, ARRAY_SIZE(pinconf));
- return 0;
+ return 0;
}
-SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1,
- CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY);
+SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1, CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY);
diff --git a/app/boards/arm/proton_c/pinmux.c b/app/boards/arm/proton_c/pinmux.c
index a6aaae0..9ffabd7 100644
--- a/app/boards/arm/proton_c/pinmux.c
+++ b/app/boards/arm/proton_c/pinmux.c
@@ -15,55 +15,53 @@
/* pin assignments for STM32F3DISCOVERY board */
static const struct pin_config pinconf[] = {
#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart1), okay) && CONFIG_SERIAL
- {STM32_PIN_PC4, STM32F3_PINMUX_FUNC_PC4_USART1_TX},
- {STM32_PIN_PC5, STM32F3_PINMUX_FUNC_PC5_USART1_RX},
+ {STM32_PIN_PC4, STM32F3_PINMUX_FUNC_PC4_USART1_TX},
+ {STM32_PIN_PC5, STM32F3_PINMUX_FUNC_PC5_USART1_RX},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart2), okay) && CONFIG_SERIAL
- {STM32_PIN_PA2, STM32F3_PINMUX_FUNC_PA2_USART2_TX},
- {STM32_PIN_PA3, STM32F3_PINMUX_FUNC_PA3_USART2_RX},
+ {STM32_PIN_PA2, STM32F3_PINMUX_FUNC_PA2_USART2_TX},
+ {STM32_PIN_PA3, STM32F3_PINMUX_FUNC_PA3_USART2_RX},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay) && CONFIG_I2C
- {STM32_PIN_PB6, STM32F3_PINMUX_FUNC_PB6_I2C1_SCL},
- {STM32_PIN_PB7, STM32F3_PINMUX_FUNC_PB7_I2C1_SDA},
+ {STM32_PIN_PB6, STM32F3_PINMUX_FUNC_PB6_I2C1_SCL},
+ {STM32_PIN_PB7, STM32F3_PINMUX_FUNC_PB7_I2C1_SDA},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c2), okay) && CONFIG_I2C
- {STM32_PIN_PA9, STM32F3_PINMUX_FUNC_PA9_I2C2_SCL},
- {STM32_PIN_PA10, STM32F3_PINMUX_FUNC_PA10_I2C2_SDA},
+ {STM32_PIN_PA9, STM32F3_PINMUX_FUNC_PA9_I2C2_SCL},
+ {STM32_PIN_PA10, STM32F3_PINMUX_FUNC_PA10_I2C2_SDA},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi1), okay) && CONFIG_SPI
#ifdef CONFIG_SPI_STM32_USE_HW_SS
- {STM32_PIN_PA4, STM32F3_PINMUX_FUNC_PA4_SPI1_NSS},
+ {STM32_PIN_PA4, STM32F3_PINMUX_FUNC_PA4_SPI1_NSS},
#endif /* CONFIG_SPI_STM32_USE_HW_SS */
- {STM32_PIN_PA5, STM32F3_PINMUX_FUNC_PA5_SPI1_SCK},
- {STM32_PIN_PA6, STM32F3_PINMUX_FUNC_PA6_SPI1_MISO},
- {STM32_PIN_PA7, STM32F3_PINMUX_FUNC_PA7_SPI1_MOSI},
+ {STM32_PIN_PA5, STM32F3_PINMUX_FUNC_PA5_SPI1_SCK},
+ {STM32_PIN_PA6, STM32F3_PINMUX_FUNC_PA6_SPI1_MISO},
+ {STM32_PIN_PA7, STM32F3_PINMUX_FUNC_PA7_SPI1_MOSI},
#endif
#if DT_NODE_HAS_STATUS(DT_NODELABEL(spi2), okay) && CONFIG_SPI
#ifdef CONFIG_SPI_STM32_USE_HW_SS
- {STM32_PIN_PB12, STM32F3_PINMUX_FUNC_PB12_SPI2_NSS},
+ {STM32_PIN_PB12, STM32F3_PINMUX_FUNC_PB12_SPI2_NSS},
#endif /* CONFIG_SPI_STM32_USE_HW_SS */
- {STM32_PIN_PB13, STM32F3_PINMUX_FUNC_PB13_SPI2_SCK},
- {STM32_PIN_PB14, STM32F3_PINMUX_FUNC_PB14_SPI2_MISO},
- {STM32_PIN_PB15, STM32F3_PINMUX_FUNC_PB15_SPI2_MOSI},
+ {STM32_PIN_PB13, STM32F3_PINMUX_FUNC_PB13_SPI2_SCK},
+ {STM32_PIN_PB14, STM32F3_PINMUX_FUNC_PB14_SPI2_MISO},
+ {STM32_PIN_PB15, STM32F3_PINMUX_FUNC_PB15_SPI2_MOSI},
#endif
#ifdef CONFIG_USB_DC_STM32
- {STM32_PIN_PA11, STM32F3_PINMUX_FUNC_PA11_USB_DM},
- {STM32_PIN_PA12, STM32F3_PINMUX_FUNC_PA12_USB_DP},
-#endif /* CONFIG_USB_DC_STM32 */
+ {STM32_PIN_PA11, STM32F3_PINMUX_FUNC_PA11_USB_DM},
+ {STM32_PIN_PA12, STM32F3_PINMUX_FUNC_PA12_USB_DP},
+#endif /* CONFIG_USB_DC_STM32 */
#if DT_NODE_HAS_STATUS(DT_NODELABEL(can1), okay) && CONFIG_CAN
- {STM32_PIN_PD0, STM32F3_PINMUX_FUNC_PD0_CAN1_RX},
- {STM32_PIN_PD1, STM32F3_PINMUX_FUNC_PD1_CAN1_TX},
+ {STM32_PIN_PD0, STM32F3_PINMUX_FUNC_PD0_CAN1_RX},
+ {STM32_PIN_PD1, STM32F3_PINMUX_FUNC_PD1_CAN1_TX},
#endif
};
-static int pinmux_stm32_init(struct device *port)
-{
- ARG_UNUSED(port);
+static int pinmux_stm32_init(struct device *port) {
+ ARG_UNUSED(port);
- stm32_setup_pins(pinconf, ARRAY_SIZE(pinconf));
+ stm32_setup_pins(pinconf, ARRAY_SIZE(pinconf));
- return 0;
+ return 0;
}
-SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1,
- CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY);
+SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1, CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY);