Skip to content

Commit c493a3a

Browse files
authored
fix errors in generated headers/SVD (#2599)
1 parent 3f6f0fc commit c493a3a

File tree

16 files changed

+187
-130
lines changed

16 files changed

+187
-130
lines changed

src/rp2350/hardware_regs/RP2350.svd

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,7 +1759,7 @@ SPDX-License-Identifier: BSD-3-Clause
17591759
<name>CLK_SYS_CTRL</name>
17601760
<addressOffset>0x0000003c</addressOffset>
17611761
<description>Clock control, can be changed on-the-fly (except for auxsrc)</description>
1762-
<resetValue>0x00000000</resetValue>
1762+
<resetValue>0x00000041</resetValue>
17631763
<fields>
17641764
<field>
17651765
<name>AUXSRC</name>
@@ -43232,7 +43232,8 @@ SPDX-License-Identifier: BSD-3-Clause
4323243232
<fields>
4323343233
<field>
4323443234
<name>AUXCTRL</name>
43235-
<description>* Bits 7:2: Reserved
43235+
<description>* Bits 7:3: Reserved
43236+
* Bit 2: Set to mask OTP power analogue power supply detection from resetting OTP controller and PSM
4323643237

4323743238
* Bit 1: When clear, the LPOSC output is XORed into the TRNG ROSC output as an additional, uncorrelated entropy source. When set, this behaviour is disabled.
4323843239

@@ -47936,9 +47937,9 @@ SPDX-License-Identifier: BSD-3-Clause
4793647937
<name>FREQ_RANGE</name>
4793747938
<description>Controls the number of delay stages in the ROSC ring
4793847939
LOW uses stages 0 to 7
47939-
MEDIUM uses stages 2 to 7
47940-
HIGH uses stages 4 to 7
47941-
TOOHIGH uses stages 6 to 7 and should not be used because its frequency exceeds design specifications
47940+
MEDIUM uses stages 0 to 5
47941+
HIGH uses stages 0 to 3
47942+
TOOHIGH uses stages 0 to 1 and should not be used because its frequency exceeds design specifications
4794247943
The clock output will not glitch when changing the range up one step at a time
4794347944
The clock output will glitch when changing the range down
4794447945
Note: the values here are gray coded which is why HIGH comes before TOOHIGH</description>
@@ -47976,7 +47977,7 @@ SPDX-License-Identifier: BSD-3-Clause
4797647977
2 bits set triples drive strength
4797747978
3 bits set quadruples drive strength
4797847979
For frequency randomisation set both DS0_RANDOM=1 &amp; DS1_RANDOM=1</description>
47979-
<resetValue>0x00000000</resetValue>
47980+
<resetValue>0x00000088</resetValue>
4798047981
<fields>
4798147982
<field>
4798247983
<name>PASSWD</name>
@@ -49053,51 +49054,56 @@ SPDX-License-Identifier: BSD-3-Clause
4905349054
bit 0 = SRAM1
4905449055
0 = powered up
4905549056
1 = powered down
49056-
When POWMAN_STATE_REQ is written, the POWMAN_STATE_WAITING flag is set while the Power Manager determines what is required. If an invalid transition is requested the Power Manager will still register the request in POWMAN_STATE_REQ but will also set the POWMAN_BAD_REQ flag. It will then implement the power-up requests and ignore the power down requests. To do nothing would risk entering an unrecoverable lock-up state. Invalid requests are: any combination of power up and power down requests any request that results in swcore boing powered and xip unpowered If the request is to power down the switched-core domain then POWMAN_STATE_WAITING stays active until the processors halt. During this time the POWMAN_STATE_REQ field can be re-written to change or cancel the request. When the power state transition begins the POWMAN_STATE_WAITING_flag is cleared, the POWMAN_STATE_CHANGING flag is set and POWMAN register writes are ignored until the transition completes.</description>
49057+
When POWMAN_STATE_REQ is written, the POWMAN_STATE_WAITING flag is set while the Power Manager determines what is required. If an invalid transition is requested the Power Manager will still register the request in POWMAN_STATE_REQ but will also set the POWMAN_BAD_REQ flag. It will then implement the power-up requests and ignore the power down requests. To do nothing would risk entering an unrecoverable lock-up state. Invalid requests are: any combination of power up and power down requests any request that results in swcore being powered and xip unpowered If the request is to power down the switched-core domain then POWMAN_STATE_WAITING stays active until the processors halt. During this time the POWMAN_STATE_REQ field can be re-written to change or cancel the request. When the power state transition begins the POWMAN_STATE_WAITING_flag is cleared, the POWMAN_STATE_CHANGING flag is set and POWMAN register writes are ignored until the transition completes.</description>
4905749058
<resetValue>0x0000000f</resetValue>
4905849059
<fields>
4905949060
<field>
4906049061
<name>CHANGING</name>
49062+
<description>Indicates a power state change is in progress</description>
4906149063
<bitRange>[13:13]</bitRange>
4906249064
<access>read-only</access>
4906349065
</field>
4906449066
<field>
4906549067
<name>WAITING</name>
49068+
<description>Indicates the power manager has received a state change request and is waiting for other actions to complete before executing it</description>
4906649069
<bitRange>[12:12]</bitRange>
4906749070
<access>read-only</access>
4906849071
</field>
4906949072
<field>
4907049073
<name>BAD_HW_REQ</name>
49071-
<description>Bad hardware initiated state request. Went back to state 0 (i.e. everything powered up)</description>
49074+
<description>Invalid hardware initiated state request, power up requests actioned, power down requests ignored</description>
4907249075
<bitRange>[11:11]</bitRange>
4907349076
<access>read-only</access>
4907449077
</field>
4907549078
<field>
4907649079
<name>BAD_SW_REQ</name>
49077-
<description>Bad software initiated state request. No action taken.</description>
49080+
<description>Invalid software initiated state request ignored</description>
4907849081
<bitRange>[10:10]</bitRange>
4907949082
<access>read-only</access>
4908049083
</field>
4908149084
<field>
4908249085
<name>PWRUP_WHILE_WAITING</name>
49083-
<description>Request ignored because of a pending pwrup request. See current_pwrup_req. Note this blocks powering up AND powering down.</description>
49086+
<description>Indicates that a power state change request was ignored because of a pending power state change request</description>
4908449087
<bitRange>[9:9]</bitRange>
4908549088
<access>read-write</access>
4908649089
<modifiedWriteValues>oneToClear</modifiedWriteValues>
4908749090
</field>
4908849091
<field>
4908949092
<name>REQ_IGNORED</name>
49093+
<description>Indicates that a software state change request was ignored because it clashed with an ongoing hardware or debugger request</description>
4909049094
<bitRange>[8:8]</bitRange>
4909149095
<access>read-write</access>
4909249096
<modifiedWriteValues>oneToClear</modifiedWriteValues>
4909349097
</field>
4909449098
<field>
4909549099
<name>REQ</name>
49100+
<description>This is written by software or hardware to request a new power state</description>
4909649101
<bitRange>[7:4]</bitRange>
4909749102
<access>read-write</access>
4909849103
</field>
4909949104
<field>
4910049105
<name>CURRENT</name>
49106+
<description>Indicates the current power state</description>
4910149107
<bitRange>[3:0]</bitRange>
4910249108
<access>read-only</access>
4910349109
</field>
@@ -77606,7 +77612,7 @@ SPDX-License-Identifier: BSD-3-Clause
7760677612
</field>
7760777613
<field>
7760877614
<name>SUSPENDED</name>
77609-
<description>Bus in suspended state. Valid for device. Device will go into suspend if neither Keep Alive / SOF frames are enabled.</description>
77615+
<description>Bus in suspended state. Valid for device and host. Host and device will go into suspend if neither Keep Alive / SOF frames are enabled.</description>
7761077616
<bitRange>[4:4]</bitRange>
7761177617
<access>read-write</access>
7761277618
<modifiedWriteValues>oneToClear</modifiedWriteValues>

src/rp2350/hardware_regs/include/hardware/regs/clocks.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@
615615
// Description : Clock control, can be changed on-the-fly (except for auxsrc)
616616
#define CLOCKS_CLK_SYS_CTRL_OFFSET _u(0x0000003c)
617617
#define CLOCKS_CLK_SYS_CTRL_BITS _u(0x000000e1)
618-
#define CLOCKS_CLK_SYS_CTRL_RESET _u(0x00000000)
618+
#define CLOCKS_CLK_SYS_CTRL_RESET _u(0x00000041)
619619
// -----------------------------------------------------------------------------
620620
// Field : CLOCKS_CLK_SYS_CTRL_AUXSRC
621621
// Description : Selects the auxiliary clock source, will glitch when switching
@@ -625,7 +625,7 @@
625625
// 0x3 -> xosc_clksrc
626626
// 0x4 -> clksrc_gpin0
627627
// 0x5 -> clksrc_gpin1
628-
#define CLOCKS_CLK_SYS_CTRL_AUXSRC_RESET _u(0x0)
628+
#define CLOCKS_CLK_SYS_CTRL_AUXSRC_RESET _u(0x2)
629629
#define CLOCKS_CLK_SYS_CTRL_AUXSRC_BITS _u(0x000000e0)
630630
#define CLOCKS_CLK_SYS_CTRL_AUXSRC_MSB _u(7)
631631
#define CLOCKS_CLK_SYS_CTRL_AUXSRC_LSB _u(5)
@@ -642,7 +642,7 @@
642642
// fly
643643
// 0x0 -> clk_ref
644644
// 0x1 -> clksrc_clk_sys_aux
645-
#define CLOCKS_CLK_SYS_CTRL_SRC_RESET _u(0x0)
645+
#define CLOCKS_CLK_SYS_CTRL_SRC_RESET _u(0x1)
646646
#define CLOCKS_CLK_SYS_CTRL_SRC_BITS _u(0x00000001)
647647
#define CLOCKS_CLK_SYS_CTRL_SRC_MSB _u(0)
648648
#define CLOCKS_CLK_SYS_CTRL_SRC_LSB _u(0)

src/rp2350/hardware_regs/include/hardware/regs/dreq.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ typedef enum dreq_num_rp2350 {
121121
DREQ_PWM_WRAP7 = 39, ///< Select PWM Counter 7's Wrap Value as DREQ
122122
DREQ_PWM_WRAP8 = 40, ///< Select PWM Counter 8's Wrap Value as DREQ
123123
DREQ_PWM_WRAP9 = 41, ///< Select PWM Counter 9's Wrap Value as DREQ
124-
DREQ_PWM_WRAP10 = 42, ///< Select PWM Counter 0's Wrap Value as DREQ
125-
DREQ_PWM_WRAP11 = 43, ///< Select PWM Counter 1's Wrap Value as DREQ
124+
DREQ_PWM_WRAP10 = 42, ///< Select PWM Counter 10's Wrap Value as DREQ
125+
DREQ_PWM_WRAP11 = 43, ///< Select PWM Counter 11's Wrap Value as DREQ
126126
DREQ_I2C0_TX = 44, ///< Select I2C0's TX FIFO as DREQ
127127
DREQ_I2C0_RX = 45, ///< Select I2C0's RX FIFO as DREQ
128128
DREQ_I2C1_TX = 46, ///< Select I2C1's TX FIFO as DREQ
@@ -135,8 +135,8 @@ typedef enum dreq_num_rp2350 {
135135
DREQ_CORESIGHT = 53, ///< Select CORESIGHT as DREQ
136136
DREQ_SHA256 = 54, ///< Select SHA256 as DREQ
137137
DREQ_DMA_TIMER0 = 59, ///< Select DMA_TIMER0 as DREQ
138-
DREQ_DMA_TIMER1 = 60, ///< Select DMA_TIMER0 as DREQ
139-
DREQ_DMA_TIMER2 = 61, ///< Select DMA_TIMER1 as DREQ
138+
DREQ_DMA_TIMER1 = 60, ///< Select DMA_TIMER1 as DREQ
139+
DREQ_DMA_TIMER2 = 61, ///< Select DMA_TIMER2 as DREQ
140140
DREQ_DMA_TIMER3 = 62, ///< Select DMA_TIMER3 as DREQ
141141
DREQ_FORCE = 63, ///< Select FORCE as DREQ
142142
DREQ_COUNT

src/rp2350/hardware_regs/include/hardware/regs/glitch_detector.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
#define GLITCH_DETECTOR_ARM_VALUE_YES _u(0x0000)
3838
// =============================================================================
3939
// Register : GLITCH_DETECTOR_DISARM
40-
// Description : None
41-
// Forcibly disarm the glitch detectors, if they are armed by OTP.
40+
// Description : Forcibly disarm the glitch detectors, if they are armed by OTP.
4241
// Ignored if ARM is YES.
4342
//
4443
// This register is Secure read/write only.
@@ -142,8 +141,7 @@
142141
#define GLITCH_DETECTOR_SENSITIVITY_DET0_ACCESS "RW"
143142
// =============================================================================
144143
// Register : GLITCH_DETECTOR_LOCK
145-
// Description : None
146-
// Write any nonzero value to disable writes to ARM, DISARM,
144+
// Description : Write any nonzero value to disable writes to ARM, DISARM,
147145
// SENSITIVITY and LOCK. This register is Secure read/write only.
148146
#define GLITCH_DETECTOR_LOCK_OFFSET _u(0x0000000c)
149147
#define GLITCH_DETECTOR_LOCK_BITS _u(0x000000ff)

src/rp2350/hardware_regs/include/hardware/regs/intctrl.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ typedef enum irq_num_rp2350 {
7979
TIMER1_IRQ_1 = 5, ///< Select TIMER1's IRQ 1 output
8080
TIMER1_IRQ_2 = 6, ///< Select TIMER1's IRQ 2 output
8181
TIMER1_IRQ_3 = 7, ///< Select TIMER1's IRQ 3 output
82-
PWM_IRQ_WRAP_0 = 8, ///< Select PWM's IRQ_WRAP 0 output
83-
PWM_IRQ_WRAP_1 = 9, ///< Select PWM's IRQ_WRAP 1 output
82+
PWM_IRQ_WRAP_0 = 8, ///< Select PWM's WRAP_0 IRQ output
83+
PWM_IRQ_WRAP_1 = 9, ///< Select PWM's WRAP_1 IRQ output
8484
DMA_IRQ_0 = 10, ///< Select DMA's IRQ 0 output
8585
DMA_IRQ_1 = 11, ///< Select DMA's IRQ 1 output
8686
DMA_IRQ_2 = 12, ///< Select DMA's IRQ 2 output
@@ -96,27 +96,27 @@ typedef enum irq_num_rp2350 {
9696
IO_IRQ_BANK0_NS = 22, ///< Select IO_BANK0_NS's IRQ output
9797
IO_IRQ_QSPI = 23, ///< Select IO_QSPI's IRQ output
9898
IO_IRQ_QSPI_NS = 24, ///< Select IO_QSPI_NS's IRQ output
99-
SIO_IRQ_FIFO = 25, ///< Select SIO's IRQ_FIFO output
100-
SIO_IRQ_BELL = 26, ///< Select SIO's IRQ_BELL output
101-
SIO_IRQ_FIFO_NS = 27, ///< Select SIO_NS's IRQ_FIFO output
102-
SIO_IRQ_BELL_NS = 28, ///< Select SIO_NS's IRQ_BELL output
103-
SIO_IRQ_MTIMECMP = 29, ///< Select SIO_IRQ_MTIMECMP's IRQ output
99+
SIO_IRQ_FIFO = 25, ///< Select SIO's FIFO IRQ output
100+
SIO_IRQ_BELL = 26, ///< Select SIO's BELL IRQ output
101+
SIO_IRQ_FIFO_NS = 27, ///< Select SIO_NS's FIFO IRQ output
102+
SIO_IRQ_BELL_NS = 28, ///< Select SIO_NS's BELL IRQ output
103+
SIO_IRQ_MTIMECMP = 29, ///< Select SIO's MTIMECMP IRQ output
104104
CLOCKS_IRQ = 30, ///< Select CLOCKS's IRQ output
105105
SPI0_IRQ = 31, ///< Select SPI0's IRQ output
106106
SPI1_IRQ = 32, ///< Select SPI1's IRQ output
107107
UART0_IRQ = 33, ///< Select UART0's IRQ output
108108
UART1_IRQ = 34, ///< Select UART1's IRQ output
109-
ADC_IRQ_FIFO = 35, ///< Select ADC's IRQ_FIFO output
109+
ADC_IRQ_FIFO = 35, ///< Select ADC's FIFO IRQ output
110110
I2C0_IRQ = 36, ///< Select I2C0's IRQ output
111111
I2C1_IRQ = 37, ///< Select I2C1's IRQ output
112112
OTP_IRQ = 38, ///< Select OTP's IRQ output
113113
TRNG_IRQ = 39, ///< Select TRNG's IRQ output
114-
PROC0_IRQ_CTI = 40, ///< Select PROC0's IRQ_CTI output
115-
PROC1_IRQ_CTI = 41, ///< Select PROC1's IRQ_CTI output
114+
PROC0_IRQ_CTI = 40, ///< Select PROC0's CTI IRQ output
115+
PROC1_IRQ_CTI = 41, ///< Select PROC1's CTI IRQ output
116116
PLL_SYS_IRQ = 42, ///< Select PLL_SYS's IRQ output
117117
PLL_USB_IRQ = 43, ///< Select PLL_USB's IRQ output
118-
POWMAN_IRQ_POW = 44, ///< Select POWMAN's IRQ_POW output
119-
POWMAN_IRQ_TIMER = 45, ///< Select POWMAN's IRQ_TIMER output
118+
POWMAN_IRQ_POW = 44, ///< Select POWMAN's POW IRQ output
119+
POWMAN_IRQ_TIMER = 45, ///< Select POWMAN's TIMER IRQ output
120120
SPARE_IRQ_0 = 46, ///< Select SPARE IRQ 0
121121
SPARE_IRQ_1 = 47, ///< Select SPARE IRQ 1
122122
SPARE_IRQ_2 = 48, ///< Select SPARE IRQ 2

src/rp2350/hardware_regs/include/hardware/regs/pio.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,7 @@
461461
// =============================================================================
462462
// Register : PIO_DBG_PADOUT
463463
// Description : Read to sample the pad output values PIO is currently driving
464-
// to the GPIOs. On RP2040 there are 30 GPIOs, so the two most
465-
// significant bits are hardwired to 0.
464+
// to the GPIOs.
466465
#define PIO_DBG_PADOUT_OFFSET _u(0x0000003c)
467466
#define PIO_DBG_PADOUT_BITS _u(0xffffffff)
468467
#define PIO_DBG_PADOUT_RESET _u(0x00000000)
@@ -472,8 +471,7 @@
472471
// =============================================================================
473472
// Register : PIO_DBG_PADOE
474473
// Description : Read to sample the pad output enables (direction) PIO is
475-
// currently driving to the GPIOs. On RP2040 there are 30 GPIOs,
476-
// so the two most significant bits are hardwired to 0.
474+
// currently driving to the GPIOs.
477475
#define PIO_DBG_PADOE_OFFSET _u(0x00000040)
478476
#define PIO_DBG_PADOE_BITS _u(0xffffffff)
479477
#define PIO_DBG_PADOE_RESET _u(0x00000000)

0 commit comments

Comments
 (0)