Skip to content

rp2xxx: Fix Adafruit boards #960

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

Open
Grazfather wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Open

rp2xxx: Fix Adafruit boards #960

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
1 change: 1 addition & 0 deletions port/raspberrypi/rp2xxx/src/boards/adafruit_feather_rp2350.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub const xosc_freq = 12_000_000;
pub const xosc_startup_delay_multiplier = 64;

const microzig = @import("microzig");
const hal = microzig.hal;
Expand Down
1 change: 1 addition & 0 deletions port/raspberrypi/rp2xxx/src/boards/adafruit_metro_rp2350.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub const xosc_freq = 12_000_000;
pub const xosc_startup_delay_multiplier = 64;

pub const has_rp2350b = true; // Uses RP2350B chip with extra I/O pins

Expand Down
6 changes: 5 additions & 1 deletion port/raspberrypi/rp2xxx/src/hal/clocks/common.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ pub const xosc_freq = microzig.board.xosc_freq;
pub const rosc_freq = 6_500_000;

pub const xosc = struct {
const startup_delay_multiplier: comptime_int = if (@hasDecl(microzig.board, "xosc_startup_delay_multiplier"))
microzig.board.xosc_startup_delay_multiplier
else
1;
const startup_delay_ms = 1;

const startup_delay_value = xosc_freq * startup_delay_ms / 1000 / 256;
const startup_delay_value = xosc_freq * startup_delay_ms / 1000 / 256 * startup_delay_multiplier;
comptime {
assert(startup_delay_value < (1 << 13));
}
Expand Down
Loading