diff --git a/boards/actinius/icarus/actinius_icarus_common.dtsi b/boards/actinius/icarus/actinius_icarus_common.dtsi index ab0839205bffb85..f689b93d23c2713 100644 --- a/boards/actinius/icarus/actinius_icarus_common.dtsi +++ b/boards/actinius/icarus/actinius_icarus_common.dtsi @@ -221,7 +221,7 @@ }; /* Include file with mappings and aliases for feather compatibility */ -#include "feather_connector.dtsi" +#include /* Include partition configuration file */ #include "actinius_icarus_partition_conf.dtsi" diff --git a/boards/actinius/icarus/feather_connector.dtsi b/boards/actinius/icarus/feather_connector.dtsi deleted file mode 100644 index 6d99f051ea43fc2..000000000000000 --- a/boards/actinius/icarus/feather_connector.dtsi +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2020 Actinius - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - feather_header: feather_connector { - compatible = "adafruit-feather-header"; - #gpio-cells = <2>; - gpio-map-mask = <0xffffffff 0xffffffc0>; - gpio-map-pass-thru = <0 0x3f>; - gpio-map = <0 0 &gpio0 14 0>, /* A1 */ - <1 0 &gpio0 15 0>, /* A2 */ - <2 0 &gpio0 16 0>, /* A3 */ - <3 0 &gpio0 17 0>, /* A4 */ - <4 0 &gpio0 18 0>, /* A5 */ - <5 0 &gpio0 19 0>, /* A6 */ - <6 0 &gpio0 20 0>, /* SCK */ - <7 0 &gpio0 21 0>, /* MOSI */ - <8 0 &gpio0 22 0>, /* MISO */ - <9 0 &gpio0 23 0>, /* RX */ - <10 0 &gpio0 24 0>, /* TX */ - /* 11 is VIN */ - <12 0 &gpio0 26 0>, /* SDA */ - <13 0 &gpio0 27 0>, /* SCL */ - <14 0 &gpio0 31 0>, /* 31 */ - <15 0 &gpio0 30 0>, /* 30 */ - <16 0 &gpio0 0 0>, /* 0 */ - <17 0 &gpio0 1 0>, /* 1 */ - <18 0 &gpio0 2 0>, /* 2 */ - <19 0 &gpio0 3 0>, /* 3 */ - <20 0 &gpio0 4 0>; /* 4 */ - }; -}; - -feather_adc: &adc { }; -feather_serial: &uart0 { }; -feather_i2c: &i2c2 { }; -feather_spi: &spi3 { }; - -arduino_adc: &adc { }; -arduino_serial: &uart0 { }; -arduino_i2c: &i2c2 { }; -arduino_spi: &spi3 { }; diff --git a/boards/adafruit/feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts b/boards/adafruit/feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts index 8d98095e703c066..cf5fa444549d0e9 100644 --- a/boards/adafruit/feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts +++ b/boards/adafruit/feather_m0_basic_proto/adafruit_feather_m0_basic_proto.dts @@ -7,8 +7,8 @@ /dts-v1/; #include #include +#include #include "adafruit_feather_m0_basic_proto-pinctrl.dtsi" -#include "feather_connector.dtsi" / { model = "Adafruit Feather M0 Basic Proto"; diff --git a/boards/adafruit/feather_m0_basic_proto/feather_connector.dtsi b/boards/adafruit/feather_m0_basic_proto/feather_connector.dtsi deleted file mode 100644 index 842da758f9bfb31..000000000000000 --- a/boards/adafruit/feather_m0_basic_proto/feather_connector.dtsi +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2020 Richard Osterloh - * Copyright (c) 2020 Jacek Ozimek - * - * SPDX-License-Identifier: Apache-2.0 - */ - -feather_i2c: &sercom3 {}; diff --git a/boards/adafruit/feather_m0_lora/adafruit_feather_m0_lora.dts b/boards/adafruit/feather_m0_lora/adafruit_feather_m0_lora.dts index c69f547622c41fd..efa5c91f78c28a1 100644 --- a/boards/adafruit/feather_m0_lora/adafruit_feather_m0_lora.dts +++ b/boards/adafruit/feather_m0_lora/adafruit_feather_m0_lora.dts @@ -7,8 +7,8 @@ /dts-v1/; #include #include +#include #include "adafruit_feather_m0_lora-pinctrl.dtsi" -#include "feather_connector.dtsi" / { model = "Adafruit Feather M0 LoRa"; diff --git a/boards/adafruit/feather_m0_lora/feather_connector.dtsi b/boards/adafruit/feather_m0_lora/feather_connector.dtsi deleted file mode 100644 index 842da758f9bfb31..000000000000000 --- a/boards/adafruit/feather_m0_lora/feather_connector.dtsi +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2020 Richard Osterloh - * Copyright (c) 2020 Jacek Ozimek - * - * SPDX-License-Identifier: Apache-2.0 - */ - -feather_i2c: &sercom3 {}; diff --git a/boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840_common.dtsi b/boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840_common.dtsi index 6eff846559d7d5b..674eea541ecc63e 100644 --- a/boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840_common.dtsi +++ b/boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840_common.dtsi @@ -7,9 +7,9 @@ /dts-v1/; #include -#include "feather_connector.dtsi" -#include "adafruit_feather_nrf52840-pinctrl.dtsi" +#include #include +#include "adafruit_feather_nrf52840-pinctrl.dtsi" / { diff --git a/boards/adafruit/feather_stm32f405/adafruit_feather_stm32f405.dts b/boards/adafruit/feather_stm32f405/adafruit_feather_stm32f405.dts index 7995e3595930751..39fb3328a6a455b 100644 --- a/boards/adafruit/feather_stm32f405/adafruit_feather_stm32f405.dts +++ b/boards/adafruit/feather_stm32f405/adafruit_feather_stm32f405.dts @@ -7,7 +7,7 @@ /dts-v1/; #include #include -#include "feather_connector.dtsi" +#include / { model = "Adafruit Feather STM32F405 Express"; diff --git a/boards/adafruit/feather_stm32f405/feather_connector.dtsi b/boards/adafruit/feather_stm32f405/feather_connector.dtsi deleted file mode 100644 index bd5f83148df1e44..000000000000000 --- a/boards/adafruit/feather_stm32f405/feather_connector.dtsi +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2020 Richard Osterloh - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - feather_header: connector { - compatible = "adafruit-feather-header"; - #gpio-cells = <2>; - gpio-map-mask = <0xffffffff 0xffffffc0>; - gpio-map-pass-thru = <0 0x3f>; - gpio-map = <0 0 &gpioa 4 0>, /* A0 */ - <1 0 &gpioa 5 0>, /* A1 */ - <2 0 &gpioa 6 0>, /* A2 */ - <3 0 &gpioa 7 0>, /* A3 */ - <4 0 &gpioc 4 0>, /* A4 */ - <5 0 &gpioc 5 0>, /* A5 */ - <6 0 &gpiob 13 0>, /* SCK */ - <7 0 &gpiob 15 0>, /* MOSI */ - <8 0 &gpiob 14 0>, /* MISO */ - <9 0 &gpiob 11 0>, /* RX */ - <10 0 &gpiob 10 0>, /* TX */ - <11 0 &gpioa 8 0>, /* B0 (NC) */ - <12 0 &gpiob 7 0>, /* SDA */ - <13 0 &gpiob 6 0>, /* SCL */ - <14 0 &gpioc 7 0>, /* D5 */ - <15 0 &gpioc 6 0>, /* D6 */ - <16 0 &gpiob 8 0>, /* D9 */ - <17 0 &gpiob 9 0>, /* D10 */ - <18 0 &gpioc 3 0>, /* D11 */ - <19 0 &gpioc 2 0>, /* D12 */ - <20 0 &gpioc 1 0>; /* D13 */ - }; -}; - -feather_serial: &usart3 {}; -feather_i2c: &i2c1 {}; -feather_spi: &spi2 {}; diff --git a/boards/adafruit/nrf52_adafruit_feather/feather_connector.dtsi b/boards/adafruit/nrf52_adafruit_feather/feather_connector.dtsi deleted file mode 100644 index d7c7feb075998b2..000000000000000 --- a/boards/adafruit/nrf52_adafruit_feather/feather_connector.dtsi +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2020 Richard Osterloh - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - feather_header: connector { - compatible = "adafruit-feather-header"; - #gpio-cells = <2>; - gpio-map-mask = <0xffffffff 0xffffffc0>; - gpio-map-pass-thru = <0 0x3f>; - gpio-map = <0 0 &gpio0 2 0>, /* A0 */ - <1 0 &gpio0 3 0>, /* A1 */ - <2 0 &gpio0 4 0>, /* A2 */ - <3 0 &gpio0 5 0>, /* A3 */ - <4 0 &gpio0 28 0>, /* A4 */ - <5 0 &gpio0 29 0>, /* A5 */ - <6 0 &gpio0 12 0>, /* SCK */ - <7 0 &gpio0 13 0>, /* MOSI */ - <8 0 &gpio0 14 0>, /* MISO */ - <9 0 &gpio0 8 0>, /* TXD */ - <10 0 &gpio0 6 0>, /* RXD */ - <11 0 &gpio0 20 0>, /* PIN_DFU */ - <12 0 &gpio0 25 0>, /* SDA */ - <13 0 &gpio0 26 0>, /* SCL */ - <14 0 &gpio0 27 0>, /* P0.27 */ - <15 0 &gpio0 30 0>, /* A6 */ - <16 0 &gpio0 31 0>, /* A7 (VBAT ADC) */ - <17 0 &gpio0 11 0>, /* P0.11 */ - <18 0 &gpio0 7 0>, /* P0.07 */ - <19 0 &gpio0 15 0>, /* P0.15 */ - <20 0 &gpio0 16 0>; /* P0.16 */ - }; -}; - -feather_serial: &uart0 {}; -feather_i2c: &i2c0 {}; diff --git a/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather.dts b/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather.dts index f86b889fe3b6fce..debe1f0bb2abd40 100644 --- a/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather.dts +++ b/boards/adafruit/nrf52_adafruit_feather/nrf52_adafruit_feather.dts @@ -7,7 +7,7 @@ /dts-v1/; #include -#include "feather_connector.dtsi" +#include #include "nrf52_adafruit_feather-pinctrl.dtsi" #include diff --git a/boards/blues/swan_r5/feather_connector.dtsi b/boards/blues/swan_r5/feather_connector.dtsi deleted file mode 100644 index ced429aec5e574a..000000000000000 --- a/boards/blues/swan_r5/feather_connector.dtsi +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2022 Blues Inc. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - feather_header: connector { - compatible = "adafruit-feather-header"; - #gpio-cells = <2>; - gpio-map-mask = <0xffffffff 0xffffffc0>; - gpio-map-pass-thru = <0 0x3f>; - gpio-map = <0 0 &gpioa 3 0>, /* A0 */ - <1 0 &gpioa 1 0>, /* A1 */ - <2 0 &gpioc 3 0>, /* A2 */ - <3 0 &gpioc 1 0>, /* A3 */ - <4 0 &gpioc 4 0>, /* A4 */ - <5 0 &gpioc 5 0>, /* A5 */ - <6 0 &gpioa 5 0>, /* SCK */ - <7 0 &gpioa 7 0>, /* MOSI */ - <8 0 &gpioa 6 0>, /* MISO */ - <9 0 &gpioa 10 0>, /* RX */ - <10 0 &gpioa 9 0>, /* TX */ - <11 0 &gpioe 3 0>, /* D4 */ - <12 0 &gpiob 7 0>, /* SDA */ - <13 0 &gpiob 6 0>, /* SCL */ - <14 0 &gpioe 11 0>, /* D5 */ - <15 0 &gpioe 9 0>, /* D6 */ - <16 0 &gpiod 15 0>, /* D9 */ - <17 0 &gpioa 4 0>, /* D10 */ - <18 0 &gpioa 7 0>, /* D11 */ - <19 0 &gpioa 6 0>, /* D12 */ - <20 0 &gpioa 5 0>; /* D13 */ - }; -}; - -feather_serial: &usart1 {}; -feather_i2c: &i2c1 {}; -feather_spi: &spi1 {}; diff --git a/boards/blues/swan_r5/swan_r5.dts b/boards/blues/swan_r5/swan_r5.dts index 221ca274fdecf94..1ff88b0c2b40c2f 100644 --- a/boards/blues/swan_r5/swan_r5.dts +++ b/boards/blues/swan_r5/swan_r5.dts @@ -7,7 +7,7 @@ /dts-v1/; #include #include -#include "feather_connector.dtsi" +#include #include / { diff --git a/boards/adafruit/feather_nrf52840/feather_connector.dtsi b/dts/common/adafruit/feather_connector.dtsi similarity index 100% rename from boards/adafruit/feather_nrf52840/feather_connector.dtsi rename to dts/common/adafruit/feather_connector.dtsi