diff --git a/boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120-pinctrl.dtsi b/boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120-pinctrl.dtsi index f9cd55542ec..589d75c817b 100644 --- a/boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120-pinctrl.dtsi +++ b/boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120-pinctrl.dtsi @@ -30,12 +30,12 @@ /omit-if-no-ref/ uart30_default: uart30_default { group1 { psels = , - ; + ; }; group2 { psels = , - ; + ; bias-pull-up; }; }; @@ -44,8 +44,8 @@ group1 { psels = , , - , - ; + , + ; low-power-enable; }; }; diff --git a/dts/common/nordic/nrf7120_enga.dtsi b/dts/common/nordic/nrf7120_enga.dtsi index 09673d7789f..364e19bd144 100644 --- a/dts/common/nordic/nrf7120_enga.dtsi +++ b/dts/common/nordic/nrf7120_enga.dtsi @@ -643,7 +643,7 @@ gpio-controller; #gpio-cells = <2>; port = <1>; - ngpios = <20>; + ngpios = <16>; gpiote-instance = <&gpiote20>; status = "disabled"; }; @@ -654,7 +654,7 @@ gpio-controller; #gpio-cells = <2>; port = <3>; - ngpios = <13>; + ngpios = <12>; gpiote-instance = <&gpiote20>; status = "disabled"; }; @@ -831,7 +831,7 @@ gpio-controller; #gpio-cells = <2>; port = <0>; - ngpios = <10>; + ngpios = <13>; gpiote-instance = <&gpiote30>; status = "disabled"; }; diff --git a/samples/zephyr/drivers/i2c/rtio_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/samples/zephyr/drivers/i2c/rtio_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 3035cc168c2..e2cde1e64c8 100644 --- a/samples/zephyr/drivers/i2c/rtio_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/samples/zephyr/drivers/i2c/rtio_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -6,7 +6,7 @@ /* * SDA = P1.8 and P1.9 - * SCL = P1.14 and P1.15 + * SCL = P1.2 and P1.3 */ / { @@ -20,7 +20,7 @@ i2c21_default: i2c21_default { group1 { psels = , - ; + ; bias-pull-up; }; }; @@ -28,7 +28,7 @@ i2c21_sleep: i2c21_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -36,7 +36,7 @@ i2c22_default: i2c22_default { group1 { psels = , - ; + ; bias-pull-up; }; }; @@ -44,7 +44,7 @@ i2c22_sleep: i2c22_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; diff --git a/tests/drivers/gpio/gpio_nfct/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/drivers/gpio/gpio_nfct/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 3c666009ff1..46e4da08639 100644 --- a/tests/drivers/gpio/gpio_nfct/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/drivers/gpio/gpio_nfct/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -6,18 +6,18 @@ / { /* Test requirements: - * P1.00 shorted with P1.01; - * P1.02 shorted with P1.03. - * (NFC pins are P1.01 and P1.02) + * P0.00 shorted with P0.03; + * P0.12 shorted with P0.04. + * (NFC pins are P0.03 and P0.04) */ test_gpios { compatible = "gpio-leds"; out_gpios: out_gpios { - gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>, <&gpio1 2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>, <&gpio0 12 GPIO_ACTIVE_HIGH>; }; in_gpios: in_gpios { - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>, <&gpio1 3 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>, <&gpio0 4 GPIO_ACTIVE_HIGH>; }; }; }; @@ -30,6 +30,6 @@ status = "okay"; }; -&gpio1 { +&gpio0 { status = "okay"; }; diff --git a/tests/zephyr/boards/nrf/i2c/i2c_slave/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/boards/nrf/i2c/i2c_slave/boards/nrf7120pdk_nrf7120_cpuapp.overlay index e6aaec1a86a..a592761249e 100644 --- a/tests/zephyr/boards/nrf/i2c/i2c_slave/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/boards/nrf/i2c/i2c_slave/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -8,14 +8,14 @@ i2c21_default_alt: i2c21_default_alt { group1 { psels = , - ; + ; }; }; i2c21_sleep_alt: i2c21_sleep_alt { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -26,7 +26,7 @@ * to configure pins for TWIS with pinctrl. */ psels = , - ; + ; bias-pull-up; }; }; @@ -34,7 +34,7 @@ i2c22_sleep_alt: i2c22_sleep_alt { group1 { psels = , - ; + ; low-power-enable; }; }; diff --git a/tests/zephyr/boards/nrf/qdec/boards/nrf7120pdk_nrf7120_common.dtsi b/tests/zephyr/boards/nrf/qdec/boards/nrf7120pdk_nrf7120_common.dtsi index 1ebe3169eae..91aeb58ff5e 100644 --- a/tests/zephyr/boards/nrf/qdec/boards/nrf7120pdk_nrf7120_common.dtsi +++ b/tests/zephyr/boards/nrf/qdec/boards/nrf7120pdk_nrf7120_common.dtsi @@ -7,8 +7,8 @@ /* Required loopbacks * P1.11 <-> P1.12 * P1.13 <-> P1.15 - * P1.2 <-> P1.3 - * P1.4 <-> P2.5 + * P1.02 <-> P1.3 + * P1.00 <-> P1.14 */ / { @@ -24,7 +24,7 @@ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; }; phase_b1: phase_b1 { - gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; }; }; @@ -60,14 +60,14 @@ qdec_21_pinctrl: qdec_21_pinctrl { group1 { psels = , - ; + ; }; }; qdec_21_sleep_pinctrl: qdec_21_sleep_pinctrl { group1 { psels = , - ; + ; low-power-enable; }; }; diff --git a/tests/zephyr/drivers/i2c/i2c_nrfx_twim/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/i2c/i2c_nrfx_twim/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 0a155c60195..5407e071518 100644 --- a/tests/zephyr/drivers/i2c/i2c_nrfx_twim/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/i2c/i2c_nrfx_twim/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -6,7 +6,7 @@ /* * SDA = P1.8 and P1.9 - * SCL = P1.14 and P1.15 + * SCL = P1.2 and P1.3 */ / { @@ -20,7 +20,7 @@ i2c21_default: i2c21_default { group1 { psels = , - ; + ; bias-pull-up; }; }; @@ -28,7 +28,7 @@ i2c21_sleep: i2c21_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -36,7 +36,7 @@ i2c22_default: i2c22_default { group1 { psels = , - ; + ; bias-pull-up; }; }; @@ -44,7 +44,7 @@ i2c22_sleep: i2c22_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; diff --git a/tests/zephyr/drivers/i2c/i2c_target_api/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/i2c/i2c_target_api/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 83b7ecf43ac..5027cf02204 100644 --- a/tests/zephyr/drivers/i2c/i2c_target_api/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/i2c/i2c_target_api/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -1,13 +1,13 @@ /* * SDA = P1.8 and P1.9 - * SCL = P1.14 and P1.15 + * SCL = P1.2 and P1.3 */ &pinctrl { i2c21_default: i2c21_default { group1 { psels = , - ; + ; bias-pull-up; }; }; @@ -15,7 +15,7 @@ i2c21_sleep: i2c21_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -23,7 +23,7 @@ i2c22_default: i2c22_default { group1 { psels = , - ; + ; bias-pull-up; }; }; @@ -31,7 +31,7 @@ i2c22_sleep: i2c22_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; diff --git a/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 5dea09cb1e7..85633930b6e 100644 --- a/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/spi/spi_controller_peripheral/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -27,7 +27,7 @@ psels = , , , - ; + ; }; }; @@ -36,7 +36,7 @@ psels = , , , - ; + ; low-power-enable; }; }; @@ -52,7 +52,7 @@ pinctrl-1 = <&spi22_sleep_alt>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; - cs-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + cs-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; diff --git a/tests/zephyr/drivers/spi/spi_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/spi/spi_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay index ba6bbc58add..0665e07b24d 100644 --- a/tests/zephyr/drivers/spi/spi_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/spi/spi_loopback/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -6,15 +6,15 @@ /* * Test requires following loopback: - * P1.4 - P1.5 + * P1.11 - P1.12 */ &pinctrl { spi20_default: spi20_default { group1 { psels = , - , - ; + , + ; low-power-enable; }; }; @@ -22,8 +22,8 @@ spi20_sleep: spi20_sleep { group1 { psels = , - , - ; + , + ; low-power-enable; }; }; diff --git a/tests/zephyr/drivers/uart/uart_async_api/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/uart/uart_async_api/boards/nrf7120pdk_nrf7120_cpuapp.overlay index cf425f2d292..20dbf11339b 100644 --- a/tests/zephyr/drivers/uart/uart_async_api/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/uart/uart_async_api/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -7,15 +7,15 @@ &pinctrl { uart21_default_alt: uart21_default_alt { group1 { - psels = , - ; + psels = , + ; }; }; uart21_sleep_alt: uart21_sleep_alt { group1 { - psels = , - ; + psels = , + ; low-power-enable; }; }; diff --git a/tests/zephyr/drivers/uart/uart_elementary/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/uart/uart_elementary/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 9e000f53099..fc26bdafc3f 100644 --- a/tests/zephyr/drivers/uart/uart_elementary/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/uart/uart_elementary/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -7,8 +7,8 @@ &pinctrl { uart21_default: uart21_default { group1 { - psels = , - , + psels = , + , , ; }; @@ -16,8 +16,8 @@ uart21_sleep: uart21_sleep { group1 { - psels = , - , + psels = , + , , ; low-power-enable; diff --git a/tests/zephyr/drivers/uart/uart_elementary/boards/nrf7120pdk_nrf7120_cpuapp_dual_uart.overlay b/tests/zephyr/drivers/uart/uart_elementary/boards/nrf7120pdk_nrf7120_cpuapp_dual_uart.overlay index 0e410fd3214..9099ef29406 100644 --- a/tests/zephyr/drivers/uart/uart_elementary/boards/nrf7120pdk_nrf7120_cpuapp_dual_uart.overlay +++ b/tests/zephyr/drivers/uart/uart_elementary/boards/nrf7120pdk_nrf7120_cpuapp_dual_uart.overlay @@ -7,7 +7,7 @@ &pinctrl { uart21_default: uart21_default { group1 { - psels = , + psels = , ; bias-pull-up; }; @@ -15,7 +15,7 @@ uart21_sleep: uart21_sleep { group1 { - psels = , + psels = , ; low-power-enable; }; @@ -24,7 +24,7 @@ uart22_default: uart22_default { group1 { psels = , - ; + ; bias-pull-up; }; }; @@ -32,7 +32,7 @@ uart22_sleep: uart22_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; diff --git a/tests/zephyr/drivers/uart/uart_errors/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/uart/uart_errors/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 05cbb25c971..0f56ec825d8 100644 --- a/tests/zephyr/drivers/uart/uart_errors/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/uart/uart_errors/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -8,14 +8,14 @@ uart21_default: uart21_default { group1 { psels = , - ; + ; }; }; uart21_sleep: uart21_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; @@ -23,7 +23,7 @@ uart22_default: uart22_default { group1 { psels = - ; + ; bias-pull-up; }; group2 { @@ -34,7 +34,7 @@ uart22_sleep: uart22_sleep { group1 { psels = , - ; + ; low-power-enable; }; }; diff --git a/tests/zephyr/drivers/uart/uart_mix_fifo_poll/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/uart/uart_mix_fifo_poll/boards/nrf7120pdk_nrf7120_cpuapp.overlay index 16a9a2702e2..3c8d4b62af2 100644 --- a/tests/zephyr/drivers/uart/uart_mix_fifo_poll/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/uart/uart_mix_fifo_poll/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -7,19 +7,19 @@ &pinctrl { uart21_default: uart21_default { group1 { - psels = , - , - , - ; + psels = , + , + , + ; }; }; uart21_sleep: uart21_sleep { group1 { - psels = , - , - , - ; + psels = , + , + , + ; low-power-enable; }; }; diff --git a/tests/zephyr/drivers/uart/uart_pm/boards/nrf7120pdk_nrf7120_cpuapp.overlay b/tests/zephyr/drivers/uart/uart_pm/boards/nrf7120pdk_nrf7120_cpuapp.overlay index e7f84d0411c..89f72b1eb9f 100644 --- a/tests/zephyr/drivers/uart/uart_pm/boards/nrf7120pdk_nrf7120_cpuapp.overlay +++ b/tests/zephyr/drivers/uart/uart_pm/boards/nrf7120pdk_nrf7120_cpuapp.overlay @@ -7,15 +7,15 @@ &pinctrl { uart21_default: uart21_default { group1 { - psels = , - ; + psels = , + ; }; }; uart21_sleep: uart21_sleep { group1 { - psels = , - ; + psels = , + ; low-power-enable; }; };