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

arm/rp2040,rp2350: Allow configuring XOSC startup delay, and set similarly to pico-sdk #15598

Merged
merged 3 commits into from
Jan 18, 2025
Merged

arm/rp2040,rp2350: Allow configuring XOSC startup delay, and set similarly to pico-sdk #15598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
396787e
arm/rp2040,rp2350: Use `BOARD_XOSC_FREQ` for calculating startup delay
ids1024 Jan 16, 2025
70e7911
arm/rp2040,rp2350: Allow configuring XOSC startup delay
ids1024 Jan 18, 2025
64271a4
rp2040: Set `BOARD_XOSC_STARTUPDELAY` for Adafruit, Seeed XIAO
ids1024 Jan 18, 2025
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
4 changes: 3 additions & 1 deletion arch/arm/src/rp2040/rp2040_xosc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ void rp2040_xosc_init(void)

/* Set xosc startup delay */

uint32_t startup_delay = (((12 * MHZ) / 1000) + 128) / 256;
uint32_t startup_delay = ((BOARD_XOSC_FREQ / 1000) *
BOARD_XOSC_STARTUPDELAY + 255) / 256;
ASSERT(startup_delay < 1 << 13);
putreg32(startup_delay, RP2040_XOSC_STARTUP);

/* Set the enable bit now that we have set freq range and startup delay */
Expand Down
4 changes: 3 additions & 1 deletion arch/arm/src/rp23xx/rp23xx_xosc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ void rp23xx_xosc_init(void)

/* Set xosc startup delay */

uint32_t startup_delay = (((12 * MHZ) / 1000) + 128) / 256;
uint32_t startup_delay = ((BOARD_XOSC_FREQ / 1000) *
BOARD_XOSC_STARTUPDELAY + 255) / 256;
ASSERT(startup_delay < 1 << 13);
putreg32(startup_delay, RP23XX_XOSC_STARTUP);

/* Set the enable bit now that we have set freq range and startup delay */
Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/adafruit-feather-rp2040/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 64
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/adafruit-kb2040/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 64
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/adafruit-qt-py-rp2040/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 64
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/pimoroni-tiny2040/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 1
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/raspberrypi-pico-w/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 1
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/raspberrypi-pico/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 1
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/seeed-xiao-rp2040/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 64
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/w5500-evb-pico/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 1
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/waveshare-rp2040-lcd-1.28/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 1
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp2040/waveshare-rp2040-zero/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 1
#define BOARD_PLL_SYS_FREQ (125 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp23xx/pimoroni-pico-2-plus/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 1
#define BOARD_PLL_SYS_FREQ (150 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
1 change: 1 addition & 0 deletions boards/arm/rp23xx/raspberrypi-pico-2/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#define MHZ 1000000

#define BOARD_XOSC_FREQ (12 * MHZ)
#define BOARD_XOSC_STARTUPDELAY 1
#define BOARD_PLL_SYS_FREQ (150 * MHZ)
#define BOARD_PLL_USB_FREQ (48 * MHZ)

Expand Down
Loading