summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/boards/arm/planck/CMakeLists.txt2
-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/board.cmake2
-rw-r--r--app/boards/arm/planck/pinmux.c10
-rw-r--r--app/boards/arm/planck/planck_rev6.dts2
-rw-r--r--app/boards/arm/planck/planck_rev6_defconfig2
-rw-r--r--app/boards/shields/petejohanson_handwire/Kconfig.shield2
-rw-r--r--app/drivers/zephyr/dts/bindings/gpio-kscan.yaml32
-rw-r--r--app/drivers/zephyr/kscan_gpio.c2
10 files changed, 29 insertions, 29 deletions
diff --git a/app/boards/arm/planck/CMakeLists.txt b/app/boards/arm/planck/CMakeLists.txt
index f26de66..6a0ec73 100644
--- a/app/boards/arm/planck/CMakeLists.txt
+++ b/app/boards/arm/planck/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
list(APPEND EXTRA_DTC_FLAGS "-qq")
diff --git a/app/boards/arm/planck/Kconfig.board b/app/boards/arm/planck/Kconfig.board
index 280b48f..b744528 100644
--- a/app/boards/arm/planck/Kconfig.board
+++ b/app/boards/arm/planck/Kconfig.board
@@ -1,7 +1,7 @@
# STM32F3DISCOVERY board configuration
# Copyright (c) 2017 I-SENSE group of ICCS
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
config BOARD_STM32F3_DISCO
bool "STM32F3DISCOVERY Development Board"
diff --git a/app/boards/arm/planck/Kconfig.defconfig b/app/boards/arm/planck/Kconfig.defconfig
index 3ccd178..855cf45 100644
--- a/app/boards/arm/planck/Kconfig.defconfig
+++ b/app/boards/arm/planck/Kconfig.defconfig
@@ -1,7 +1,7 @@
# Planck keyboard configuration
# Copyright (c) 2017 I-SENSE group of ICCS
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
if BOARD_PLANCK_REV6
diff --git a/app/boards/arm/planck/board.cmake b/app/boards/arm/planck/board.cmake
index e2bdf48..4843c41 100644
--- a/app/boards/arm/planck/board.cmake
+++ b/app/boards/arm/planck/board.cmake
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
board_runner_args(jlink "--device=STM32F303VC" "--speed=4000")
diff --git a/app/boards/arm/planck/pinmux.c b/app/boards/arm/planck/pinmux.c
index 76bd6d1..5df5c90 100644
--- a/app/boards/arm/planck/pinmux.c
+++ b/app/boards/arm/planck/pinmux.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2017 I-SENSE group of ICCS
*
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: MIT
*/
#include <kernel.h>
@@ -17,11 +17,11 @@ 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},
-#endif /* CONFIG_UART_1 */
+#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},
-#endif /* CONFIG_UART_2 */
+#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},
@@ -49,7 +49,7 @@ static const struct pin_config pinconf[] = {
#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 */
+#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},
@@ -66,4 +66,4 @@ static int pinmux_stm32_init(struct device *port)
}
SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1,
- CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY);
+ CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY);
diff --git a/app/boards/arm/planck/planck_rev6.dts b/app/boards/arm/planck/planck_rev6.dts
index 58de7a4..ef23bfd 100644
--- a/app/boards/arm/planck/planck_rev6.dts
+++ b/app/boards/arm/planck/planck_rev6.dts
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2017 I-SENSE group of ICCS
*
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: MIT
*/
/dts-v1/;
diff --git a/app/boards/arm/planck/planck_rev6_defconfig b/app/boards/arm/planck/planck_rev6_defconfig
index 17330e2..caa9360 100644
--- a/app/boards/arm/planck/planck_rev6_defconfig
+++ b/app/boards/arm/planck/planck_rev6_defconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
CONFIG_SOC_SERIES_STM32F3X=y
CONFIG_SOC_STM32F303XC=y
diff --git a/app/boards/shields/petejohanson_handwire/Kconfig.shield b/app/boards/shields/petejohanson_handwire/Kconfig.shield
index f6e8a3f..defb90a 100644
--- a/app/boards/shields/petejohanson_handwire/Kconfig.shield
+++ b/app/boards/shields/petejohanson_handwire/Kconfig.shield
@@ -1,5 +1,5 @@
# Copyright (c) 2019 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
config SHIELD_PETEJOHANSON_HANDWIRE
def_bool $(shields_list_contains,petejohanson_handwire)
diff --git a/app/drivers/zephyr/dts/bindings/gpio-kscan.yaml b/app/drivers/zephyr/dts/bindings/gpio-kscan.yaml
index 0698c3e..748d3fa 100644
--- a/app/drivers/zephyr/dts/bindings/gpio-kscan.yaml
+++ b/app/drivers/zephyr/dts/bindings/gpio-kscan.yaml
@@ -1,5 +1,5 @@
# Copyright (c) 2020, Pete Johanson
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
description: GPIO keyboard matrix controller
@@ -8,18 +8,18 @@ compatible: "gpio-kscan"
include: kscan.yaml
properties:
- row-gpios:
- type: phandle-array
- required: true
- col-gpios:
- type: phandle-array
- required: true
- debounce-period:
- type: int
- default: 5
- diode-direction:
- type: string
- default: row2col
- enum:
- - row2col
- - col2row
+ row-gpios:
+ type: phandle-array
+ required: true
+ col-gpios:
+ type: phandle-array
+ required: true
+ debounce-period:
+ type: int
+ default: 5
+ diode-direction:
+ type: string
+ default: row2col
+ enum:
+ - row2col
+ - col2row
diff --git a/app/drivers/zephyr/kscan_gpio.c b/app/drivers/zephyr/kscan_gpio.c
index a53e2f9..76606d8 100644
--- a/app/drivers/zephyr/kscan_gpio.c
+++ b/app/drivers/zephyr/kscan_gpio.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
*
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: MIT
*/
#define DT_DRV_COMPAT gpio_kscan