Merge remote-tracking branch 'upstream/main' into underglow/state-persistence

4 files changed, 27 insertions, 32 deletions

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/planck/planck_rev6_defconfig b/app/boards/arm/planck/planck_rev6_defconfig
index a440ff1..e34ce00 100644
--- a/app/boards/arm/planck/planck_rev6_defconfig
+++ b/app/boards/arm/planck/planck_rev6_defconfig
@@ -20,9 +20,6 @@ CONFIG_CLOCK_STM32_HSE_CLOCK=8000000
 CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
 # use HSE as PLL input
 CONFIG_CLOCK_STM32_PLL_SRC_HSE=y
-# however, the board does not have an external oscillator, so just use
-# the 8MHz clock signal coming from integrated STLink
-CONFIG_CLOCK_STM32_HSE_BYPASS=y
 # produce 72MHz clock at PLL output
 CONFIG_CLOCK_STM32_PLL_PREDIV=1
 CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9