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.

Sign up for GitHub

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

dts: arm: rpi_pico: remove #define from dts #81196

Merged
merged 1 commit into from
Nov 20, 2024
Merged

dts: arm: rpi_pico: remove #define from dts #81196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dts/arm/rpi_pico/override.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*/
/*
* File intentionally left blank. Will be used when there is no other
* higher-priority override.dtsi file in use.
*/
10 changes: 9 additions & 1 deletion dts/arm/rpi_pico/rp2040.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,17 @@
#include <zephyr/dt-bindings/clock/rpi_pico_clock.h>
#include <zephyr/dt-bindings/i2c/i2c.h>
#include <zephyr/dt-bindings/regulator/rpi_pico.h>
#include <zephyr/dt-bindings/reset/rpi_pico_reset.h>
#include <mem.h>

#include "rpi_pico_common.dtsi"
#include <arm/rpi_pico/override.dtsi>
/*
* This value can be overridden at the board level or in an application specific
* override.dtsi file.
*/
#ifndef RPI_PICO_DEFAULT_IRQ_PRIORITY
#define RPI_PICO_DEFAULT_IRQ_PRIORITY 3
#endif

/ {
aliases {
Expand Down
4 changes: 0 additions & 4 deletions dts/arm/rpi_pico/rpi_pico_common.dtsi → ...zephyr/dt-bindings/reset/rpi_pico_reset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
* SPDX-License-Identifier: Apache-2.0
*/

#ifndef RPI_PICO_DEFAULT_IRQ_PRIORITY
#define RPI_PICO_DEFAULT_IRQ_PRIORITY 3
#endif

#define RPI_PICO_RESETS_RESET_ADC 0
#define RPI_PICO_RESETS_RESET_BUSCTRL 1
#define RPI_PICO_RESETS_RESET_DMA 2
Expand All @@ -33,3 +29,3 @@
#define RPI_PICO_RESETS_RESET_UART0 22
#define RPI_PICO_RESETS_RESET_UART1 23
#define RPI_PICO_RESETS_RESET_USBCTRL 24
Loading