Skip to content

Commit 2854115

Browse files
bjarki-andreasencfriedt
authored andcommitted
soc: nrf54h: remove deprecated gpd (global power domain) driver
Remove the deprecated GPD (Global Power Domain) driver. Signed-off-by: Bjarki Arge Andreasen <[email protected]>
1 parent 2b0d1ae commit 2854115

File tree

10 files changed

+6
-502
lines changed

10 files changed

+6
-502
lines changed

drivers/spi/spi_nrfx_spis.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_PM_DEVICE_SYSTEM_MANAGED));
3434
* - HAL design (requirement of drv_inst_idx in nrfx_spis_t)
3535
* - Name-based HAL IRQ handlers, e.g. nrfx_spis_0_irq_handler
3636
*/
37-
#define SPIS_NODE(idx) COND_CODE_1(SPIS_IS_FAST(idx), (spis##idx), (spi##idx))
37+
#define SPIS_NODE(idx) \
38+
COND_CODE_1(DT_NODE_EXISTS(DT_NODELABEL(spis##idx)), (spis##idx), (spi##idx))
3839
#define SPIS(idx) DT_NODELABEL(SPIS_NODE(idx))
3940
#define SPIS_PROP(idx, prop) DT_PROP(SPIS(idx), prop)
4041
#define SPIS_HAS_PROP(idx, prop) DT_NODE_HAS_PROP(SPIS(idx), prop)
42+
#define SPIS_IS_FAST(idx) NRF_DT_IS_FAST(SPIS(idx))
4143

4244
#define SPIS_PINS_CROSS_DOMAIN(unused, prefix, idx, _) \
4345
COND_CODE_1(DT_NODE_HAS_STATUS_OKAY(SPIS(prefix##idx)), \
@@ -595,7 +597,7 @@ static int spi_nrfx_init(const struct device *dev)
595597
!(DT_GPIO_FLAGS(SPIS(idx), wake_gpios) & GPIO_ACTIVE_LOW),\
596598
"WAKE line must be configured as active high"); \
597599
PM_DEVICE_DT_DEFINE(SPIS(idx), spi_nrfx_pm_action, \
598-
COND_CODE_1(NRF_DT_IS_FAST(SPIS(idx)), (0), \
600+
COND_CODE_1(SPIS_IS_FAST(idx), (0), \
599601
(PM_DEVICE_ISR_SAFE))); \
600602
SPI_DEVICE_DT_DEFINE(SPIS(idx), \
601603
spi_nrfx_init, \

dts/bindings/power/nordic,nrf-gpd.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

dts/vendor/nordic/nrf54h20.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@
170170

171171
fll16m: fll16m {
172172
compatible = "nordic,nrf-fll16m";
173-
clock-names = "hfxo", "lfxo";
173+
status = "disabled";
174174
#clock-cells = <0>;
175175
clock-frequency = <DT_FREQ_M(16)>;
176176
open-loop-accuracy-ppm = <20000>;
177177
open-loop-startup-time-us = <200>; /* To be measured */
178178
clocks = <&hfxo>, <&lfxo>;
179-
status = "disabled";
179+
clock-names = "hfxo", "lfxo";
180180
};
181181

182182
hsfll120: hsfll120 {

include/zephyr/dt-bindings/power/nordic-nrf-gpd.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

soc/nordic/common/pinctrl_soc.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
#include <zephyr/devicetree.h>
1616
#include <zephyr/dt-bindings/pinctrl/nrf-pinctrl.h>
17-
#include <zephyr/dt-bindings/power/nordic-nrf-gpd.h>
1817
#include <zephyr/types.h>
1918

2019
#ifdef __cplusplus
@@ -56,16 +55,6 @@ typedef uint32_t pinctrl_soc_pin_t;
5655
(), NRF_GET_FUN(DT_PROP_BY_IDX(node_id, prop, idx))) \
5756
0)), (0))
5857

59-
/**
60-
* @brief Utility macro to get the GPD_FAST_ACTIVE1 flag
61-
*
62-
* @param p_node_id Parent node identifier.
63-
*/
64-
#define Z_GET_GPD_FAST_ACTIVE1(p_node_id) \
65-
COND_CODE_1(DT_NODE_HAS_PROP(p_node_id, power_domains), \
66-
((DT_PHA(p_node_id, power_domains, id) == \
67-
NRF_GPD_FAST_ACTIVE1) << NRF_GPD_FAST_ACTIVE1_POS), (0))
68-
6958
/**
7059
* @brief Utility macro to initialize each pin.
7160
*
@@ -109,14 +98,6 @@ typedef uint32_t pinctrl_soc_pin_t;
10998
#define NRF_GET_CLOCKPIN_ENABLE(pincfg) \
11099
(((pincfg) >> NRF_CLOCKPIN_ENABLE_POS) & NRF_CLOCKPIN_ENABLE_MSK)
111100

112-
/**
113-
* @brief Utility macro to obtain GPD_FAST_ACTIVE1 flag
114-
*
115-
* @param pincfg Pin configuration bit field.
116-
*/
117-
#define NRF_GET_GPD_FAST_ACTIVE1(pincfg) \
118-
(((pincfg) >> NRF_GPD_FAST_ACTIVE1_POS) & NRF_GPD_FAST_ACTIVE1_MSK)
119-
120101
/**
121102
* @brief Utility macro to obtain pin inversion flag.
122103
*

soc/nordic/nrf54h/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ zephyr_include_directories(.)
1717
zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
1818

1919
add_subdirectory(bicr)
20-
add_subdirectory(gpd)

soc/nordic/nrf54h/gpd/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

soc/nordic/nrf54h/gpd/Kconfig

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)