Skip to content

Commit b008126

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 b7dc47a commit b008126

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
@@ -102,27 +102,3 @@ wdt011: &cpuapp_wdt011 {};
102102
&gdpwr_slow_main {
103103
status = "okay";
104104
};
105-
106-
&gpio_pad_group0 {
107-
status = "okay";
108-
};
109-
110-
&gpio_pad_group1 {
111-
status = "okay";
112-
};
113-
114-
&gpio_pad_group2 {
115-
status = "okay";
116-
};
117-
118-
&gpio_pad_group6 {
119-
status = "okay";
120-
};
121-
122-
&gpio_pad_group7 {
123-
status = "okay";
124-
};
125-
126-
&gpio_pad_group9 {
127-
status = "okay";
128-
};

dts/arm/nordic/nrf54h20_cpurad.dtsi

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -143,27 +143,3 @@ wdt011: &cpurad_wdt011 {};
143143
&gdpwr_slow_main {
144144
status = "okay";
145145
};
146-
147-
&gpio_pad_group0 {
148-
status = "okay";
149-
};
150-
151-
&gpio_pad_group1 {
152-
status = "okay";
153-
};
154-
155-
&gpio_pad_group2 {
156-
status = "okay";
157-
};
158-
159-
&gpio_pad_group6 {
160-
status = "okay";
161-
};
162-
163-
&gpio_pad_group7 {
164-
status = "okay";
165-
};
166-
167-
&gpio_pad_group9 {
168-
status = "okay";
169-
};

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
@@ -908,13 +908,6 @@
908908
ngpios = <12>;
909909
port = <0>;
910910
zephyr,pm-device-runtime-auto;
911-
912-
gpio_pad_group0: pad-group {
913-
compatible = "nordic,nrf-gpio-pad-group";
914-
retain-mask = <0xFFF>;
915-
zephyr,pm-device-runtime-auto;
916-
status = "disabled";
917-
};
918911
};
919912

920913
gpio1: gpio@938200 {
@@ -927,13 +920,6 @@
927920
ngpios = <12>;
928921
port = <1>;
929922
zephyr,pm-device-runtime-auto;
930-
931-
gpio_pad_group1: pad-group {
932-
compatible = "nordic,nrf-gpio-pad-group";
933-
retain-mask = <0xFFF>;
934-
zephyr,pm-device-runtime-auto;
935-
status = "disabled";
936-
};
937923
};
938924

939925
gpio2: gpio@938400 {
@@ -946,13 +932,6 @@
946932
ngpios = <12>;
947933
port = <2>;
948934
zephyr,pm-device-runtime-auto;
949-
950-
gpio_pad_group2: pad-group {
951-
compatible = "nordic,nrf-gpio-pad-group";
952-
retain-mask = <0xFFF>;
953-
zephyr,pm-device-runtime-auto;
954-
status = "disabled";
955-
};
956935
};
957936

958937
gpio6: gpio@938c00 {
@@ -964,13 +943,6 @@
964943
ngpios = <14>;
965944
port = <6>;
966945
zephyr,pm-device-runtime-auto;
967-
968-
gpio_pad_group6: pad-group {
969-
compatible = "nordic,nrf-gpio-pad-group";
970-
retain-mask = <0x3FFF>;
971-
zephyr,pm-device-runtime-auto;
972-
status = "disabled";
973-
};
974946
};
975947

976948
gpio7: gpio@938e00 {
@@ -982,13 +954,6 @@
982954
ngpios = <8>;
983955
port = <7>;
984956
zephyr,pm-device-runtime-auto;
985-
986-
gpio_pad_group7: pad-group {
987-
compatible = "nordic,nrf-gpio-pad-group";
988-
retain-mask = <0xFF>;
989-
zephyr,pm-device-runtime-auto;
990-
status = "disabled";
991-
};
992957
};
993958

994959
gpio9: gpio@939200 {
@@ -1001,13 +966,6 @@
1001966
ngpios = <6>;
1002967
port = <9>;
1003968
zephyr,pm-device-runtime-auto;
1004-
1005-
gpio_pad_group9: pad-group {
1006-
compatible = "nordic,nrf-gpio-pad-group";
1007-
retain-mask = <0x3F>;
1008-
zephyr,pm-device-runtime-auto;
1009-
status = "disabled";
1010-
};
1011969
};
1012970

1013971
dppic131: dppic@981000 {

0 commit comments

Comments
 (0)