Skip to content

Commit 4127ed4

Browse files
[nrf fromlist] dts: vendor: nordic: nrf54h: remove gpio-pad-groups
The gpio pad groups are redundant if pin retention is handled per pin, and the quirky cross domain feature is managed by the application. Remove it entirely. Upstream PR #: 97452 Signed-off-by: Bjarki Arge Andreasen <[email protected]>
1 parent 40fa08e commit 4127ed4

File tree

8 files changed

+0
-224
lines changed

8 files changed

+0
-224
lines changed

drivers/power_domain/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_INTEL_ADSP power_domain_intel_a
99
zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_NXP_SCU power_domain_nxp_scu.c)
1010
zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_NRFS_GDPWR power_domain_nrfs_gdpwr.c)
1111
zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_NRFS_SWEXT power_domain_nrfs_swext.c)
12-
zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_NRF_GPIO_PAD_GROUP power_domain_nrf_gpio_pad_group.c)
1312
zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_SOC_PM_STATE power_domain_soc_state_change.c)
1413
zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_TISCI power_domain_tisci.c)
1514
zephyr_library_sources_ifdef(CONFIG_POWER_DOMAIN_SILABS_SIWX91X power_domain_silabs_siwx91x.c)

drivers/power_domain/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ endif #POWER_DOMAIN_TISCI
125125

126126
rsource "Kconfig.nrfs_gdpwr"
127127
rsource "Kconfig.nrfs_swext"
128-
rsource "Kconfig.nrf_gpio_pad_group"
129128
rsource "Kconfig.silabs_siwx91x"
130129

131130
endif

drivers/power_domain/Kconfig.nrf_gpio_pad_group

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

drivers/power_domain/power_domain_nrf_gpio_pad_group.c

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

dts/arm/nordic/nrf54h20_cpuapp.dtsi

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -95,27 +95,3 @@ wdt011: &cpuapp_wdt011 {};
9595
&gdpwr_slow_main {
9696
status = "okay";
9797
};
98-
99-
&gpio_pad_group0 {
100-
status = "okay";
101-
};
102-
103-
&gpio_pad_group1 {
104-
status = "okay";
105-
};
106-
107-
&gpio_pad_group2 {
108-
status = "okay";
109-
};
110-
111-
&gpio_pad_group6 {
112-
status = "okay";
113-
};
114-
115-
&gpio_pad_group7 {
116-
status = "okay";
117-
};
118-
119-
&gpio_pad_group9 {
120-
status = "okay";
121-
};

dts/arm/nordic/nrf54h20_cpurad.dtsi

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,27 +136,3 @@ wdt011: &cpurad_wdt011 {};
136136
&gdpwr_slow_main {
137137
status = "okay";
138138
};
139-
140-
&gpio_pad_group0 {
141-
status = "okay";
142-
};
143-
144-
&gpio_pad_group1 {
145-
status = "okay";
146-
};
147-
148-
&gpio_pad_group2 {
149-
status = "okay";
150-
};
151-
152-
&gpio_pad_group6 {
153-
status = "okay";
154-
};
155-
156-
&gpio_pad_group7 {
157-
status = "okay";
158-
};
159-
160-
&gpio_pad_group9 {
161-
status = "okay";
162-
};

dts/bindings/gpio/nordic,nrf-gpio-pad-group.yaml

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

dts/vendor/nordic/nrf54h20.dtsi

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -836,13 +836,6 @@
836836
ngpios = <12>;
837837
port = <0>;
838838
zephyr,pm-device-runtime-auto;
839-
840-
gpio_pad_group0: pad-group {
841-
compatible = "nordic,nrf-gpio-pad-group";
842-
retain-mask = <0xFFF>;
843-
zephyr,pm-device-runtime-auto;
844-
status = "disabled";
845-
};
846839
};
847840

848841
gpio1: gpio@938200 {
@@ -855,13 +848,6 @@
855848
ngpios = <12>;
856849
port = <1>;
857850
zephyr,pm-device-runtime-auto;
858-
859-
gpio_pad_group1: pad-group {
860-
compatible = "nordic,nrf-gpio-pad-group";
861-
retain-mask = <0xFFF>;
862-
zephyr,pm-device-runtime-auto;
863-
status = "disabled";
864-
};
865851
};
866852

867853
gpio2: gpio@938400 {
@@ -874,13 +860,6 @@
874860
ngpios = <12>;
875861
port = <2>;
876862
zephyr,pm-device-runtime-auto;
877-
878-
gpio_pad_group2: pad-group {
879-
compatible = "nordic,nrf-gpio-pad-group";
880-
retain-mask = <0xFFF>;
881-
zephyr,pm-device-runtime-auto;
882-
status = "disabled";
883-
};
884863
};
885864

886865
gpio6: gpio@938c00 {
@@ -892,13 +871,6 @@
892871
ngpios = <14>;
893872
port = <6>;
894873
zephyr,pm-device-runtime-auto;
895-
896-
gpio_pad_group6: pad-group {
897-
compatible = "nordic,nrf-gpio-pad-group";
898-
retain-mask = <0x3FFF>;
899-
zephyr,pm-device-runtime-auto;
900-
status = "disabled";
901-
};
902874
};
903875

904876
gpio7: gpio@938e00 {
@@ -910,13 +882,6 @@
910882
ngpios = <8>;
911883
port = <7>;
912884
zephyr,pm-device-runtime-auto;
913-
914-
gpio_pad_group7: pad-group {
915-
compatible = "nordic,nrf-gpio-pad-group";
916-
retain-mask = <0xFF>;
917-
zephyr,pm-device-runtime-auto;
918-
status = "disabled";
919-
};
920885
};
921886

922887
gpio9: gpio@939200 {
@@ -929,13 +894,6 @@
929894
ngpios = <6>;
930895
port = <9>;
931896
zephyr,pm-device-runtime-auto;
932-
933-
gpio_pad_group9: pad-group {
934-
compatible = "nordic,nrf-gpio-pad-group";
935-
retain-mask = <0x3F>;
936-
zephyr,pm-device-runtime-auto;
937-
status = "disabled";
938-
};
939897
};
940898

941899
dppic131: dppic@981000 {

0 commit comments

Comments
 (0)