@@ -111,63 +111,63 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
111
111
#define NRF_PSEL_TDM (reg , line ) ((NRF_TDM_Type *)reg)->PSEL.line
112
112
#endif
113
113
114
- #define PORT_PD_EXISTS (node_id ) \
114
+ #define PAD_PD_EXISTS (node_id ) \
115
115
COND_CODE_1( \
116
116
DT_NODE_EXISTS(node_id), \
117
117
(DT_NODE_HAS_PROP(node_id, power_domains)), \
118
118
(0) \
119
119
)
120
120
121
- #define PORT_PD_DEV_GET_OR_NULL (node_id ) \
121
+ #define PAD_PD_DEV_GET_OR_NULL (node_id ) \
122
122
COND_CODE_1( \
123
123
DT_NODE_EXISTS(node_id), \
124
124
(DEVICE_DT_GET_OR_NULL(DT_PHANDLE(node_id, power_domains))), \
125
125
(NULL) \
126
126
)
127
127
128
128
#define PORTS_HAVE_PD \
129
- PORT_PD_EXISTS (DT_NODELABEL(gpio0 )) || \
130
- PORT_PD_EXISTS (DT_NODELABEL(gpio1 )) || \
131
- PORT_PD_EXISTS (DT_NODELABEL(gpio2 )) || \
132
- PORT_PD_EXISTS (DT_NODELABEL(gpio3 )) || \
133
- PORT_PD_EXISTS (DT_NODELABEL(gpio4 )) || \
134
- PORT_PD_EXISTS (DT_NODELABEL(gpio5 )) || \
135
- PORT_PD_EXISTS (DT_NODELABEL(gpio6 )) || \
136
- PORT_PD_EXISTS (DT_NODELABEL(gpio7 )) || \
137
- PORT_PD_EXISTS (DT_NODELABEL(gpio8 )) || \
138
- PORT_PD_EXISTS (DT_NODELABEL(gpio9 ))
129
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p0 )) || \
130
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p1 )) || \
131
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p2 )) || \
132
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p3 )) || \
133
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p4 )) || \
134
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p5 )) || \
135
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p6 )) || \
136
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p7 )) || \
137
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p8 )) || \
138
+ PAD_PD_EXISTS (DT_NODELABEL(pad_group_p9 ))
139
139
140
140
#if PORTS_HAVE_PD
141
141
142
- static const struct device * const port_pd_devs [] = {
143
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio0 )),
144
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio1 )),
145
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio2 )),
146
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio3 )),
147
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio4 )),
148
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio5 )),
149
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio6 )),
150
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio7 )),
151
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio8 )),
152
- PORT_PD_DEV_GET_OR_NULL (DT_NODELABEL (gpio9 )),
142
+ static const struct device * const pad_pd_devs [] = {
143
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p0 )),
144
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p1 )),
145
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p2 )),
146
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p3 )),
147
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p4 )),
148
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p5 )),
149
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p6 )),
150
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p7 )),
151
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p8 )),
152
+ PAD_PD_DEV_GET_OR_NULL (DT_NODELABEL (pad_group_p9 )),
153
153
};
154
154
155
- static atomic_t port_pd_masks [ARRAY_SIZE (port_pd_devs )];
155
+ static atomic_t pad_pd_masks [ARRAY_SIZE (pad_pd_devs )];
156
156
157
- static int port_pd_request_pin (uint16_t pin_number )
157
+ static int pad_pd_request_pin (uint16_t pin_number )
158
158
{
159
159
uint8_t port_number = NRF_GET_PORT (pin_number );
160
160
uint16_t port_pin_number = NRF_GET_PORT_PIN (pin_number );
161
- const struct device * port_pd_dev = port_pd_devs [port_number ];
162
- atomic_t * port_pd_mask = & port_pd_masks [port_number ];
161
+ const struct device * pad_pd_dev = pad_pd_devs [port_number ];
162
+ atomic_t * pad_pd_mask = & pad_pd_masks [port_number ];
163
163
164
- if (atomic_test_and_set_bit (port_pd_mask , port_pin_number )) {
164
+ if (atomic_test_and_set_bit (pad_pd_mask , port_pin_number )) {
165
165
/* already requested */
166
166
return 0 ;
167
167
}
168
168
169
- if (pm_device_runtime_get (port_pd_dev )) {
170
- atomic_clear_bit (port_pd_mask , port_pin_number );
169
+ if (pm_device_runtime_get (pad_pd_dev )) {
170
+ atomic_clear_bit (pad_pd_mask , port_pin_number );
171
171
return - EIO ;
172
172
}
173
173
@@ -176,24 +176,24 @@ static int port_pd_request_pin(uint16_t pin_number)
176
176
return 0 ;
177
177
}
178
178
179
- static int port_pd_release_pin (uint16_t pin_number )
179
+ static int pad_pd_release_pin (uint16_t pin_number )
180
180
{
181
181
uint8_t port_number = NRF_GET_PORT (pin_number );
182
182
uint16_t port_pin_number = NRF_GET_PORT_PIN (pin_number );
183
- const struct device * port_pd_dev = port_pd_devs [port_number ];
184
- atomic_t * port_pd_mask = & port_pd_masks [port_number ];
183
+ const struct device * pad_pd_dev = pad_pd_devs [port_number ];
184
+ atomic_t * pad_pd_mask = & pad_pd_masks [port_number ];
185
185
186
- if (!atomic_test_and_clear_bit (port_pd_mask , port_pin_number )) {
186
+ if (!atomic_test_and_clear_bit (pad_pd_mask , port_pin_number )) {
187
187
/* already released */
188
188
return 0 ;
189
189
}
190
190
191
191
/* power domain may become inactive, retain shall be enabled */
192
192
nrf_gpio_pin_retain_enable (pin_number );
193
193
194
- if (pm_device_runtime_put (port_pd_dev )) {
194
+ if (pm_device_runtime_put (pad_pd_dev )) {
195
195
nrf_gpio_pin_retain_disable (pin_number );
196
- atomic_set_bit (port_pd_mask , port_pin_number );
196
+ atomic_set_bit (pad_pd_mask , port_pin_number );
197
197
return - EIO ;
198
198
}
199
199
@@ -202,13 +202,13 @@ static int port_pd_release_pin(uint16_t pin_number)
202
202
203
203
#else
204
204
205
- static int port_pd_request_pin (uint16_t pin_number )
205
+ static int pad_pd_request_pin (uint16_t pin_number )
206
206
{
207
207
ARG_UNUSED (pin_number );
208
208
return 0 ;
209
209
}
210
210
211
- static int port_pd_release_pin (uint16_t pin_number )
211
+ static int pad_pd_release_pin (uint16_t pin_number )
212
212
{
213
213
ARG_UNUSED (pin_number );
214
214
return 0 ;
@@ -590,7 +590,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
590
590
uint32_t pin = psel ;
591
591
592
592
/* enable pin */
593
- port_pd_request_pin (pin );
593
+ pad_pd_request_pin (pin );
594
594
port_pin_clock_set (pin , NRF_GET_CLOCKPIN_ENABLE (pins [i ]));
595
595
596
596
if (write != NO_WRITE ) {
@@ -609,7 +609,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
609
609
610
610
if (NRF_GET_LP (pins [i ]) == NRF_LP_ENABLE ) {
611
611
/* disable pin */
612
- port_pd_release_pin (pin );
612
+ pad_pd_release_pin (pin );
613
613
port_pin_clock_set (pin , false);
614
614
}
615
615
}
0 commit comments