Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with Zephyr upstream v4.0.99 (ongoing v4.1 development) #289

Merged
merged 10 commits into from
Dec 29, 2024
Merged
2 changes: 1 addition & 1 deletion boards/cytron/maker_rp2040/cytron_rp2040.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

#include <mem.h>
#include <rpi_pico/rp2040.dtsi>
#include <raspberrypi/rpi_pico/rp2040.dtsi>
#include <zephyr/dt-bindings/regulator/rpi_pico.h>

#include "cytron_rp2040-pinctrl.dtsi"
Expand Down
4 changes: 0 additions & 4 deletions boards/extensions/Kconfig.mimxrt1060_evkb

This file was deleted.

9 changes: 4 additions & 5 deletions boards/extensions/mimxrt1060_evk/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@

config USB_SELF_POWERED
default y
depends on USB_DEVICE_STACK && (BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB)
depends on USB_DEVICE_STACK && BOARD_MIMXRT1060_EVK

config USB_MAX_POWER
default 0 if BOARD_MIMXRT1060_EVK # 0mA (self powered)
default 0 if BOARD_MIMXRT1060_EVKB # 0mA (self powered)
depends on USB_DEVICE_STACK && (BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB)
depends on USB_DEVICE_STACK && BOARD_MIMXRT1060_EVK

# Workaround for not being able to have commas in macro arguments
DT_CHOSEN_Z_CONSOLE := zephyr,console
Expand All @@ -21,7 +20,7 @@ DT_COMPAT_NXP_USB := nxp,ehci
DT_CHOSEN_CONSOLE_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_CONSOLE))
DT_CHOSEN_CONSOLE_PARENT := $(dt_node_parent,$(DT_CHOSEN_CONSOLE_NODE))

if (BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB) && \
if BOARD_MIMXRT1060_EVK && \
$(dt_chosen_enabled,$(DT_CHOSEN_Z_CONSOLE)) && \
$(dt_compat_on_bus,$(DT_COMPAT_Z_CDC_ACM_UART),usb) && \
$(dt_node_has_compat,$(DT_CHOSEN_CONSOLE_PARENT),$(DT_COMPAT_NXP_USB))
Expand Down Expand Up @@ -70,5 +69,5 @@ endif # zephyr,cdc-acm-uart
#

config MASS_STORAGE_DISK_NAME
default "NAND" if (BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB)
default "NAND" if BOARD_MIMXRT1060_EVK
depends on USB_DEVICE_STACK && USB_MASS_STORAGE
4 changes: 2 additions & 2 deletions boards/extensions/mimxrt1060_evk/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ List of extensions

* - .. rubric:: NXP MIMXRT1060-EVKB

* - .. literalinclude:: ../mimxrt1060_evkb.overlay
:caption: mimxrt1060_evkb.overlay
* - .. literalinclude:: ../mimxrt1060_evk_mimxrt1062_qspi_B.overlay
:caption: mimxrt1060_evk_mimxrt1062_qspi_B.overlay
:language: DTS
:encoding: ISO-8859-1
:emphasize-lines: 3,6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 TiaC Systems
* Copyright (c) 2023-2024 TiaC Systems
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/*
* Copyright (c) 2023-2024 TiaC Systems
* SPDX-License-Identifier: Apache-2.0
*/

#include "mimxrt1060_evk.dtsi"
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include "mimxrt1060_evk.dtsi"

/* FLEXPWM not routed to LED on this EVK revision, thus why board DTS
* disables &flexpwm2_pwm3 but neither related &pwmleds node nor alias. */

Expand Down
2 changes: 1 addition & 1 deletion boards/jsed/picoboy/picoboy.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <mem.h>
#include <freq.h>
#include <rpi_pico/rp2040.dtsi>
#include <raspberrypi/rpi_pico/rp2040.dtsi>
#include <zephyr/dt-bindings/regulator/rpi_pico.h>

#include "picoboy-pinctrl.dtsi"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 TiaC Systems
* Copyright (c) 2023-2024 TiaC Systems
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 TiaC Systems
* Copyright (c) 2023-2024 TiaC Systems
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 TiaC Systems
* Copyright (c) 2023-2024 TiaC Systems
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 TiaC Systems
* Copyright (c) 2023-2024 TiaC Systems
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 TiaC Systems
* Copyright (c) 2023-2024 TiaC Systems
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 TiaC Systems
* Copyright (c) 2023-2024 TiaC Systems
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down
4 changes: 2 additions & 2 deletions boards/shields/grove/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ example:
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v2
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: seeed_grove_base_v2
:goals: flash
:west-args: -p
Expand All @@ -875,7 +875,7 @@ example:
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v1
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: seeed_grove_base_v1
:goals: flash
:west-args: -p
Expand Down
8 changes: 4 additions & 4 deletions boards/shields/grove_btn/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ corresponds to the ordinal number of a signal from the
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v2-grove_btn_d4_inv
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v2 grove_btn_d4_inv"
:goals: flash
:west-args: -p
Expand All @@ -207,7 +207,7 @@ corresponds to the ordinal number of a signal from the
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v1-grove_btn_d4_inv
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v1 grove_btn_d4_inv"
:goals: flash
:west-args: -p
Expand All @@ -222,7 +222,7 @@ corresponds to the ordinal number of a signal from the
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v2-grove_btn_d4
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v2 grove_btn_d4"
:goals: flash
:west-args: -p
Expand All @@ -235,7 +235,7 @@ corresponds to the ordinal number of a signal from the
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v1-grove_btn_d4
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v1 grove_btn_d4"
:goals: flash
:west-args: -p
Expand Down
8 changes: 4 additions & 4 deletions boards/shields/grove_led/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ from the |Laced Grove Signal Interface|. For example:
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v2-grove_led_d5
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v2 grove_led_d5"
:goals: flash
:west-args: -p
Expand All @@ -244,7 +244,7 @@ from the |Laced Grove Signal Interface|. For example:
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v2-grove_pwm_led_d5
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v2 grove_pwm_led_d5"
:goals: flash
:west-args: -p
Expand All @@ -257,7 +257,7 @@ from the |Laced Grove Signal Interface|. For example:
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v1-grove_led_d5
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v1 grove_led_d5"
:goals: flash
:west-args: -p
Expand All @@ -270,7 +270,7 @@ from the |Laced Grove Signal Interface|. For example:
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v1-grove_pwm_led_d5
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v1 grove_pwm_led_d5"
:goals: flash
:west-args: -p
Expand Down
4 changes: 2 additions & 2 deletions boards/shields/grove_sens/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ corresponds to the exact sensor type. For example:
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v2-grove_sens_bme280
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v2 grove_sens_bme280"
:goals: flash
:west-args: -p
Expand All @@ -204,7 +204,7 @@ corresponds to the exact sensor type. For example:
.. zephyr-app-commands::
:app: bridle/samples/helloshell
:build-dir: helloshell-seeed_grove_base_v1-grove_sens_bmp280
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B//qspi
:shield: "seeed_grove_base_v1 grove_sens_bmp280"
:goals: flash
:west-args: -p
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7796s_320x480: st7796s@0 {
compatible = "sitronix,st7796s";
mipi-max-frequency = <DT_FREQ_M(62)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7796s_480x320: st7796s@0 {
compatible = "sitronix,st7796s";
mipi-max-frequency = <DT_FREQ_M(62)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_135x240: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_240x135: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_240x320: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_320x240: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_240x240ls: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_240x240pt: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7735s_160x80: st7735s@0 {
compatible = "sitronix,st7735r";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7735s_80x160: st7735s@0 {
compatible = "sitronix,st7735r";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_135x240: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_240x135: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_240x240ls: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7789v_240x240pt: st7789v@0 {
compatible = "sitronix,st7789v";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7735s_128x128ls: st7735s@0 {
compatible = "sitronix,st7735r";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7735s_128x128pt: st7735s@0 {
compatible = "sitronix,st7735r";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7735s_128x160: st7735s@0 {
compatible = "sitronix,st7735r";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
st7735s_160x128: st7735s@0 {
compatible = "sitronix,st7735r";
mipi-max-frequency = <DT_FREQ_M(20)>;
mipi-mode = <MIPI_DBI_MODE_SPI_4WIRE>;
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
reg = <0>;

status = "disabled";
Expand Down
Loading
Loading