From ef19be9d278e460bacb179e1767056e050a1f7d2 Mon Sep 17 00:00:00 2001 From: zhiayang Date: Sun, 1 Oct 2023 02:49:23 -0400 Subject: [PATCH] feat(boards): Preliminary update for mikoto board definition --- app/boards/arm/mikoto/Kconfig | 6 +- app/boards/arm/mikoto/Kconfig.board | 4 +- app/boards/arm/mikoto/Kconfig.defconfig | 4 +- ...tsi => arduino_pro_micro_pins_5_20_0.dtsi} | 0 .../mikoto/arduino_pro_micro_pins_6_1_0.dtsi | 59 +++++++++++++++++++ .../arm/mikoto/{mikoto_520.dts => mikoto.dts} | 4 +- .../mikoto/{mikoto_520.yaml => mikoto.yaml} | 4 +- .../{mikoto_520.zmk.yml => mikoto.zmk.yml} | 4 +- ...inctrl.dtsi => mikoto_5_20_0-pinctrl.dtsi} | 0 app/boards/arm/mikoto/mikoto_5_20_0.overlay | 7 +++ app/boards/arm/mikoto/mikoto_6_1_0.overlay | 7 +++ app/boards/arm/mikoto/mikoto_7_1_0.overlay | 7 +++ ...{mikoto_520_defconfig => mikoto_defconfig} | 3 +- app/boards/arm/mikoto/pinmux.c | 2 +- app/boards/arm/mikoto/revision.cmake | 6 ++ 15 files changed, 101 insertions(+), 16 deletions(-) rename app/boards/arm/mikoto/{arduino_pro_micro_pins.dtsi => arduino_pro_micro_pins_5_20_0.dtsi} (100%) create mode 100644 app/boards/arm/mikoto/arduino_pro_micro_pins_6_1_0.dtsi rename app/boards/arm/mikoto/{mikoto_520.dts => mikoto.dts} (96%) rename app/boards/arm/mikoto/{mikoto_520.yaml => mikoto.yaml} (78%) rename app/boards/arm/mikoto/{mikoto_520.zmk.yml => mikoto.zmk.yml} (79%) rename app/boards/arm/mikoto/{mikoto_520-pinctrl.dtsi => mikoto_5_20_0-pinctrl.dtsi} (100%) create mode 100644 app/boards/arm/mikoto/mikoto_5_20_0.overlay create mode 100644 app/boards/arm/mikoto/mikoto_6_1_0.overlay create mode 100644 app/boards/arm/mikoto/mikoto_7_1_0.overlay rename app/boards/arm/mikoto/{mikoto_520_defconfig => mikoto_defconfig} (93%) create mode 100644 app/boards/arm/mikoto/revision.cmake diff --git a/app/boards/arm/mikoto/Kconfig b/app/boards/arm/mikoto/Kconfig index 71ec9411..d267c80e 100644 --- a/app/boards/arm/mikoto/Kconfig +++ b/app/boards/arm/mikoto/Kconfig @@ -2,11 +2,11 @@ config BOARD_ENABLE_DCDC bool "Enable DCDC mode" select SOC_DCDC_NRF52X default y - depends on (BOARD_MIKOTO_520) + depends on (BOARD_MIKOTO) choice BOARD_MIKOTO_CHARGER_CURRENT prompt "Charge current to supply to attached batteries" - depends on (BOARD_MIKOTO_520) + depends on (BOARD_MIKOTO) config BOARD_MIKOTO_CHARGER_CURRENT_40MA bool "40mA charge current, for battery capacity 40mAh or higher" @@ -26,4 +26,4 @@ config BOARD_MIKOTO_CHARGER_CURRENT_350MA config BOARD_MIKOTO_CHARGER_CURRENT_NONE bool "Disable charge current" -endchoice \ No newline at end of file +endchoice diff --git a/app/boards/arm/mikoto/Kconfig.board b/app/boards/arm/mikoto/Kconfig.board index a872fa1f..b51dce8a 100644 --- a/app/boards/arm/mikoto/Kconfig.board +++ b/app/boards/arm/mikoto/Kconfig.board @@ -3,6 +3,6 @@ # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -config BOARD_MIKOTO_520 - bool "mikoto_520" +config BOARD_MIKOTO + bool "mikoto" depends on SOC_NRF52840_QIAA diff --git a/app/boards/arm/mikoto/Kconfig.defconfig b/app/boards/arm/mikoto/Kconfig.defconfig index 5702c6de..0710f6fd 100644 --- a/app/boards/arm/mikoto/Kconfig.defconfig +++ b/app/boards/arm/mikoto/Kconfig.defconfig @@ -3,7 +3,7 @@ # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -if BOARD_MIKOTO_520 +if BOARD_MIKOTO config BOARD default "mikoto" @@ -25,4 +25,4 @@ choice BOARD_MIKOTO_CHARGER_CURRENT default BOARD_MIKOTO_CHARGER_CURRENT_100MA endchoice -endif # BOARD_MIKOTO_520 +endif # BOARD_MIKOTO diff --git a/app/boards/arm/mikoto/arduino_pro_micro_pins.dtsi b/app/boards/arm/mikoto/arduino_pro_micro_pins_5_20_0.dtsi similarity index 100% rename from app/boards/arm/mikoto/arduino_pro_micro_pins.dtsi rename to app/boards/arm/mikoto/arduino_pro_micro_pins_5_20_0.dtsi diff --git a/app/boards/arm/mikoto/arduino_pro_micro_pins_6_1_0.dtsi b/app/boards/arm/mikoto/arduino_pro_micro_pins_6_1_0.dtsi new file mode 100644 index 00000000..79d8b155 --- /dev/null +++ b/app/boards/arm/mikoto/arduino_pro_micro_pins_6_1_0.dtsi @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + +/ { + pro_micro: connector { + compatible = "arduino-pro-micro"; + #gpio-cells = <2>; + gpio-map-mask = <0xffffffff 0xffffffc0>; + gpio-map-pass-thru = <0 0x3f>; + gpio-map + = <0 0 &gpio0 4 0> /* D0 */ + , <1 0 &gpio0 8 0> /* D1 */ + , <2 0 &gpio0 17 0> /* D2 */ + , <3 0 &gpio0 20 0> /* D3 */ + , <4 0 &gpio0 22 0> /* D4/A6 */ + , <5 0 &gpio0 24 0> /* D5 */ + , <6 0 &gpio1 8 0> /* D6/A7 */ + , <7 0 &gpio1 2 0> /* D7 */ + , <8 0 &gpio1 4 0> /* D8/A8 */ + , <9 0 &gpio1 6 0> /* D9/A9 */ + , <10 0 &gpio0 9 0> /* D10/A10 */ + , <16 0 &gpio0 10 0> /* D16 */ + , <14 0 &gpio1 13 0> /* D14 */ + , <15 0 &gpio0 2 0> /* D15 */ + , <18 0 &gpio0 29 0> /* D18/A0 */ + , <19 0 &gpio0 31 0> /* D19/A1 */ + , <20 0 &gpio0 25 0> /* D20/A2 */ + , <21 0 &gpio0 11 0> /* D21/A3 */ + ; + }; + + pro_micro_a: connector_a { + compatible = "arduino-pro-micro"; + #gpio-cells = <2>; + gpio-map-mask = <0xffffffff 0xffffffc0>; + gpio-map-pass-thru = <0 0x3f>; + gpio-map + = <0 0 &gpio0 29 0> /* D18/A0 */ + , <1 0 &gpio0 31 0> /* D19/A1 */ + , <2 0 &gpio0 25 0> /* D20/A2 */ + , <3 0 &gpio0 11 0> /* D21/A3 */ + , <6 0 &gpio0 22 0> /* D4/A6 */ + , <7 0 &gpio1 8 0> /* D6/A7 */ + , <8 0 &gpio1 4 0> /* D8/A8 */ + , <9 0 &gpio1 6 0> /* D9/A9 */ + , <10 0 &gpio0 9 0> /* D10/A10 */ + ; + }; +}; + + +pro_micro_d: &pro_micro {}; +pro_micro_i2c: &i2c0 {}; +pro_micro_spi: &spi0 {}; +pro_micro_serial: &uart0 {}; diff --git a/app/boards/arm/mikoto/mikoto_520.dts b/app/boards/arm/mikoto/mikoto.dts similarity index 96% rename from app/boards/arm/mikoto/mikoto_520.dts rename to app/boards/arm/mikoto/mikoto.dts index 05ec72df..c4109aee 100644 --- a/app/boards/arm/mikoto/mikoto_520.dts +++ b/app/boards/arm/mikoto/mikoto.dts @@ -6,8 +6,8 @@ /dts-v1/; #include -#include "arduino_pro_micro_pins.dtsi" -#include "mikoto_520-pinctrl.dtsi" +#include "arduino_pro_micro_pins_5_20_0.dtsi" +#include "mikoto_5_20_0-pinctrl.dtsi" / { model = "mikoto"; diff --git a/app/boards/arm/mikoto/mikoto_520.yaml b/app/boards/arm/mikoto/mikoto.yaml similarity index 78% rename from app/boards/arm/mikoto/mikoto_520.yaml rename to app/boards/arm/mikoto/mikoto.yaml index 8d9f49ae..7410471e 100644 --- a/app/boards/arm/mikoto/mikoto_520.yaml +++ b/app/boards/arm/mikoto/mikoto.yaml @@ -1,5 +1,5 @@ -identifier: mikoto_520 -name: mikoto_520 +identifier: mikoto +name: mikoto type: mcu arch: arm toolchain: diff --git a/app/boards/arm/mikoto/mikoto_520.zmk.yml b/app/boards/arm/mikoto/mikoto.zmk.yml similarity index 79% rename from app/boards/arm/mikoto/mikoto_520.zmk.yml rename to app/boards/arm/mikoto/mikoto.zmk.yml index 91dcc9e0..1b6f2d1b 100644 --- a/app/boards/arm/mikoto/mikoto_520.zmk.yml +++ b/app/boards/arm/mikoto/mikoto.zmk.yml @@ -1,6 +1,6 @@ file_format: "1" -id: mikoto_520 -name: Mikoto 5.20 +id: mikoto +name: Mikoto type: board arch: arm outputs: diff --git a/app/boards/arm/mikoto/mikoto_520-pinctrl.dtsi b/app/boards/arm/mikoto/mikoto_5_20_0-pinctrl.dtsi similarity index 100% rename from app/boards/arm/mikoto/mikoto_520-pinctrl.dtsi rename to app/boards/arm/mikoto/mikoto_5_20_0-pinctrl.dtsi diff --git a/app/boards/arm/mikoto/mikoto_5_20_0.overlay b/app/boards/arm/mikoto/mikoto_5_20_0.overlay new file mode 100644 index 00000000..0e4f10f7 --- /dev/null +++ b/app/boards/arm/mikoto/mikoto_5_20_0.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include "arduino_pro_micro_pins_5_20_0.dtsi" diff --git a/app/boards/arm/mikoto/mikoto_6_1_0.overlay b/app/boards/arm/mikoto/mikoto_6_1_0.overlay new file mode 100644 index 00000000..b8fea295 --- /dev/null +++ b/app/boards/arm/mikoto/mikoto_6_1_0.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include "arduino_pro_micro_pins_6_1_0.dtsi" diff --git a/app/boards/arm/mikoto/mikoto_7_1_0.overlay b/app/boards/arm/mikoto/mikoto_7_1_0.overlay new file mode 100644 index 00000000..b8fea295 --- /dev/null +++ b/app/boards/arm/mikoto/mikoto_7_1_0.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include "arduino_pro_micro_pins_6_1_0.dtsi" diff --git a/app/boards/arm/mikoto/mikoto_520_defconfig b/app/boards/arm/mikoto/mikoto_defconfig similarity index 93% rename from app/boards/arm/mikoto/mikoto_520_defconfig rename to app/boards/arm/mikoto/mikoto_defconfig index 354fa56a..4b3bc7d9 100644 --- a/app/boards/arm/mikoto/mikoto_520_defconfig +++ b/app/boards/arm/mikoto/mikoto_defconfig @@ -2,11 +2,10 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_MIKOTO_520=y +CONFIG_BOARD_MIKOTO=y # Enable MPU CONFIG_ARM_MPU=y - CONFIG_PINCTRL=y # enable GPIO diff --git a/app/boards/arm/mikoto/pinmux.c b/app/boards/arm/mikoto/pinmux.c index c34c2dc8..a3901424 100644 --- a/app/boards/arm/mikoto/pinmux.c +++ b/app/boards/arm/mikoto/pinmux.c @@ -13,7 +13,7 @@ static int pinmux_mikoto_init(void) { -#if CONFIG_BOARD_MIKOTO_520 +#if CONFIG_BOARD_MIKOTO const struct device *p0 = DEVICE_DT_GET(DT_NODELABEL(gpio0)); const struct device *p1 = DEVICE_DT_GET(DT_NODELABEL(gpio1)); #if CONFIG_BOARD_MIKOTO_CHARGER_CURRENT_40MA diff --git a/app/boards/arm/mikoto/revision.cmake b/app/boards/arm/mikoto/revision.cmake new file mode 100644 index 00000000..8635d452 --- /dev/null +++ b/app/boards/arm/mikoto/revision.cmake @@ -0,0 +1,6 @@ +board_check_revision(FORMAT MAJOR.MINOR.PATCH + VALID_REVISIONS + 5.20.0 # first public release + 6.1.0 6.3.0 # incompatible pinout change from v5+ + 7.1.0 # addition of MAX17048; compatible pinout with v6+ +)