From 2056384ba3821acd82168b18814515bf6d0fb3c4 Mon Sep 17 00:00:00 2001
From: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
Date: Tue, 29 Oct 2024 12:45:49 +0100
Subject: [PATCH] [nrf fromlist] samples: sensor: qdec: change pins used for
 qdec nrf54h20dk

Change pins that are used for qdec nrf54h20dk to align with shield
(loopbacks) used in internal CI. This change is needed to start
qdec driver power management testing.

Upstream PR #: 80562

Signed-off-by: Piotr Krzyzanowski <piotr.krzyzanowski@nordicsemi.no>
(cherry picked from commit 06d6b00c41b1ce0cd9e3ffc3d53958e4b5dc052b)
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 14 +++++---------
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 18 +++++++-----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index c4f6fc7876a..654e778af97 100644
--- a/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/sensor/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -13,10 +13,10 @@
 	encoder-emulate {
 		compatible = "gpio-leds";
 		phase_a: phase_a {
-			gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
 		};
 		phase_b: phase_b {
-			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
@@ -24,17 +24,13 @@
 &pinctrl {
 	qdec_pinctrl: qdec_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
-				<NRF_PSEL(QDEC_B, 1, 2)>;
+			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
+				<NRF_PSEL(QDEC_B, 2, 10)>;
 		};
 	};
 };
 
-&gpio1 {
-	status = "okay";
-};
-
-&gpio7 {
+&gpio2 {
 	status = "okay";
 };
 
diff --git a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 0e552906a00..7e6da5a3458 100644
--- a/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/boards/nrf/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -13,10 +13,10 @@
 	encoder-emulate {
 		compatible = "gpio-leds";
 		phase_a: phase_a {
-			gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
 		};
 		phase_b: phase_b {
-			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
@@ -24,25 +24,21 @@
 &pinctrl {
 	qdec_pinctrl: qdec_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
-				<NRF_PSEL(QDEC_B, 1, 2)>;
+			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
+				<NRF_PSEL(QDEC_B, 2, 10)>;
 		};
 	};
 
 	qdec_sleep_pinctrl: qdec_sleep_pinctrl {
 		group1 {
-			psels = <NRF_PSEL(QDEC_A, 1, 0)>,
-				<NRF_PSEL(QDEC_B, 1, 2)>;
+			psels = <NRF_PSEL(QDEC_A, 2, 8)>,
+				<NRF_PSEL(QDEC_B, 2, 10)>;
 			low-power-enable;
 		};
 	};
 };
 
-&gpio1 {
-	status = "okay";
-};
-
-&gpio7 {
+&gpio2 {
 	status = "okay";
 };