Skip to content

arch/rp23xx: Fix six register/bit macro name clashes #19535

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

Merged
acassis merged 1 commit into from
Jul 27, 2026
Merged

arch/rp23xx: Fix six register/bit macro name clashes #19535

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
4 changes: 2 additions & 2 deletions arch/arm/src/rp23xx/hardware/rp23xx_busctrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
#define RP23XX_BUSCTRL_BUS_PRIORITY_DMA_R (1 << 8)
#define RP23XX_BUSCTRL_BUS_PRIORITY_PROC1 (1 << 4)
#define RP23XX_BUSCTRL_BUS_PRIORITY_PROC0 (1 << 0)
#define RP23XX_BUSCTRL_BUS_PRIORITY_ACK (1 << 0)
#define RP23XX_BUSCTRL_PERFCTR_EN (1 << 0)
#define RP23XX_BUSCTRL_BUS_PRIORITY_ACK_MASK 0x00000001
#define RP23XX_BUSCTRL_PERFCTR_EN_MASK 0x00000001
#define RP23XX_BUSCTRL_PERFCTR_MASK 0x00ffffff
#define RP23XX_BUSCTRL_PERFSEL_MASK 0x0000007f

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/rp23xx/hardware/rp23xx_pads_qspi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

/* Register bit definitions *************************************************/

#define RP23XX_PADS_QSPI_VOLTAGE_SELECT (1 << 0)
#define RP23XX_PADS_QSPI_VOLTAGE_SELECT_MASK 0x00000001
#define RP23XX_PADS_QSPI_GPIO_QSPI_SCLK_MASK 0x000001ff
#define RP23XX_PADS_QSPI_GPIO_QSPI_SCLK_ISO (1 << 8)
#define RP23XX_PADS_QSPI_GPIO_QSPI_SCLK_OD (1 << 7)
Expand Down
5 changes: 2 additions & 3 deletions arch/arm/src/rp23xx/hardware/rp23xx_powman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@

/* Register bit definitions *************************************************/

#define RP23XX_POWMAN_BADPASSWD (1 << 0)
#define RP23XX_POWMAN_BADPASSWD_MASK 0x00000001

#define RP23XX_POWMAN_VREG_CTRL_RST_N (1 << 15)
#define RP23XX_POWMAN_VREG_CTRL_UNLOCK (1 << 13)
Expand All @@ -183,7 +183,7 @@
#define RP23XX_POWMAN_VREG_LP_EXIT_VSEL_MASK 0x000001f0
#define RP23XX_POWMAN_VREG_LP_EXIT_MODE (1 << 2)
#define RP23XX_POWMAN_VREG_LP_EXIT_HIZ (1 << 1)
#define RP23XX_POWMAN_BOD_CTRL (1 << 12)

#define RP23XX_POWMAN_BOD_CTRL_ISOLATE (1 << 12)

#define RP23XX_POWMAN_BOD_VSEL_MASK 0x000001f0
Expand Down Expand Up @@ -317,7 +317,6 @@
#define RP23XX_POWMAN_PWRUP3_SOURCE_MASK 0x0000003f
#define RP23XX_POWMAN_CURRENT_PWRUP_REQ_MASK 0x0000007f
#define RP23XX_POWMAN_LAST_SWCORE_PWRUP_MASK 0x0000007f
#define RP23XX_POWMAN_DBG_PWRCFG (1 << 0)
#define RP23XX_POWMAN_DBG_PWRCFG_IGNORE (1 << 0)
#define RP23XX_POWMAN_BOOTDIS_MASK 0x00000003
#define RP23XX_POWMAN_BOOTDIS_NEXT (1 << 1)
Expand Down
4 changes: 2 additions & 2 deletions arch/risc-v/src/rp23xx-rv/hardware/rp23xx_busctrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
#define RP23XX_BUSCTRL_BUS_PRIORITY_DMA_R (1 << 8)
#define RP23XX_BUSCTRL_BUS_PRIORITY_PROC1 (1 << 4)
#define RP23XX_BUSCTRL_BUS_PRIORITY_PROC0 (1 << 0)
#define RP23XX_BUSCTRL_BUS_PRIORITY_ACK (1 << 0)
#define RP23XX_BUSCTRL_PERFCTR_EN (1 << 0)
#define RP23XX_BUSCTRL_BUS_PRIORITY_ACK_MASK 0x00000001
#define RP23XX_BUSCTRL_PERFCTR_EN_MASK 0x00000001
#define RP23XX_BUSCTRL_PERFCTR_MASK 0x00ffffff
#define RP23XX_BUSCTRL_PERFSEL_MASK 0x0000007f

Expand Down
2 changes: 1 addition & 1 deletion arch/risc-v/src/rp23xx-rv/hardware/rp23xx_pads_qspi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

/* Register bit definitions *************************************************/

#define RP23XX_PADS_QSPI_VOLTAGE_SELECT (1 << 0)
#define RP23XX_PADS_QSPI_VOLTAGE_SELECT_MASK 0x00000001
#define RP23XX_PADS_QSPI_GPIO_QSPI_SCLK_MASK 0x000001ff
#define RP23XX_PADS_QSPI_GPIO_QSPI_SCLK_ISO (1 << 8)
#define RP23XX_PADS_QSPI_GPIO_QSPI_SCLK_OD (1 << 7)
Expand Down
5 changes: 2 additions & 3 deletions arch/risc-v/src/rp23xx-rv/hardware/rp23xx_powman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@

/* Register bit definitions *************************************************/

#define RP23XX_POWMAN_BADPASSWD (1 << 0)
#define RP23XX_POWMAN_BADPASSWD_MASK 0x00000001

#define RP23XX_POWMAN_VREG_CTRL_RST_N (1 << 15)
#define RP23XX_POWMAN_VREG_CTRL_UNLOCK (1 << 13)
Expand All @@ -183,7 +183,7 @@
#define RP23XX_POWMAN_VREG_LP_EXIT_VSEL_MASK 0x000001f0
#define RP23XX_POWMAN_VREG_LP_EXIT_MODE (1 << 2)
#define RP23XX_POWMAN_VREG_LP_EXIT_HIZ (1 << 1)
#define RP23XX_POWMAN_BOD_CTRL (1 << 12)

#define RP23XX_POWMAN_BOD_CTRL_ISOLATE (1 << 12)

#define RP23XX_POWMAN_BOD_VSEL_MASK 0x000001f0
Expand Down Expand Up @@ -317,7 +317,6 @@
#define RP23XX_POWMAN_PWRUP3_SOURCE_MASK 0x0000003f
#define RP23XX_POWMAN_CURRENT_PWRUP_REQ_MASK 0x0000007f
#define RP23XX_POWMAN_LAST_SWCORE_PWRUP_MASK 0x0000007f
#define RP23XX_POWMAN_DBG_PWRCFG (1 << 0)
#define RP23XX_POWMAN_DBG_PWRCFG_IGNORE (1 << 0)
#define RP23XX_POWMAN_BOOTDIS_MASK 0x00000003
#define RP23XX_POWMAN_BOOTDIS_NEXT (1 << 1)
Expand Down
Loading