drivers: comparator: nordic: Replace analog pin mapping method

Replace the analog pin mapping method with the generic one
from the (LP)COMP driver.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>

Author: jaz1-nordic

drivers/comparator/comparator_nrf_common.h

@@ -9,7 +9,6 @@
 #include <zephyr/drivers/comparator/nrf_comp.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/device.h>
-#include "comparator_nrf_common.h"
 
 #define DT_DRV_COMPAT nordic_nrf_comp
 
@@ -74,10 +73,10 @@ BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_TH_UP(0) < 64);
 #endif
 
 #if NRF_COMP_HAS_AIN_AS_PIN
-BUILD_ASSERT((COMP_NRF_COMP_PSEL_AIN0 == 0));
-BUILD_ASSERT((COMP_NRF_COMP_PSEL_AIN7 == 7));
-BUILD_ASSERT((COMP_NRF_COMP_EXTREFSEL_AIN0 == 0));
-BUILD_ASSERT((COMP_NRF_COMP_EXTREFSEL_AIN7 == 7));
+BUILD_ASSERT((COMP_NRF_COMP_PSEL_AIN0 == NRFX_ANALOG_EXTERNAL_AIN0));
+BUILD_ASSERT((COMP_NRF_COMP_PSEL_AIN7 == NRFX_ANALOG_EXTERNAL_AIN7));
+BUILD_ASSERT((COMP_NRF_COMP_EXTREFSEL_AIN0 == NRFX_ANALOG_EXTERNAL_AIN0));
+BUILD_ASSERT((COMP_NRF_COMP_EXTREFSEL_AIN7 == NRFX_ANALOG_EXTERNAL_AIN7));
 #else
 #ifndef COMP_PSEL_PSEL_AnalogInput4
 BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_PSEL(0) != COMP_NRF_COMP_PSEL_AIN4);
@@ -249,11 +248,12 @@ static int shim_nrf_comp_pm_callback(const struct device *dev, enum pm_device_ac
 static int shim_nrf_comp_psel_to_nrf(enum comp_nrf_comp_psel shim,
 				     nrf_comp_input_t *nrf)
 {
-	if (shim >= ARRAY_SIZE(shim_nrf_comp_ain_map)) {
+	nrfx_error_t err = nrfx_comp_input_convert(shim, nrf);
+
+	if (err != NRFX_SUCCESS) {
 		return -EINVAL;
 	}
 
-	*nrf = shim_nrf_comp_ain_map[(uint32_t)shim];
 	return 0;
 }
 #else
@@ -385,11 +385,12 @@ static int shim_nrf_comp_isource_to_nrf(enum comp_nrf_comp_isource shim,
 static int shim_nrf_comp_extrefsel_to_nrf(enum comp_nrf_comp_extrefsel shim,
 					  nrf_comp_ext_ref_t *nrf)
 {
-	if (shim >= ARRAY_SIZE(shim_nrf_comp_ain_map)) {
+	nrfx_error_t err = nrfx_comp_input_convert(shim, nrf);
+
+	if (err != NRFX_SUCCESS) {
 		return -EINVAL;
 	}
 
-	*nrf = shim_nrf_comp_ain_map[(uint32_t)shim];
 	return 0;
 }
 #else

drivers/comparator/comparator_nrf_comp.c

@@ -9,7 +9,6 @@
 #include <zephyr/drivers/comparator/nrf_lpcomp.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/device.h>
-#include "comparator_nrf_common.h"
 
 #include <string.h>
 
@@ -40,10 +39,10 @@ struct shim_nrf_lpcomp_data {
 };
 
 #if (NRF_LPCOMP_HAS_AIN_AS_PIN)
-BUILD_ASSERT(COMP_NRF_LPCOMP_PSEL_AIN0 == 0);
-BUILD_ASSERT(COMP_NRF_LPCOMP_PSEL_AIN7 == 7);
-BUILD_ASSERT(COMP_NRF_LPCOMP_EXTREFSEL_AIN0 == 0);
-BUILD_ASSERT(COMP_NRF_LPCOMP_EXTREFSEL_AIN1 == 1);
+BUILD_ASSERT(COMP_NRF_LPCOMP_PSEL_AIN0 == NRFX_ANALOG_EXTERNAL_AIN0);
+BUILD_ASSERT(COMP_NRF_LPCOMP_PSEL_AIN7 == NRFX_ANALOG_EXTERNAL_AIN7);
+BUILD_ASSERT(COMP_NRF_LPCOMP_EXTREFSEL_AIN0 == NRFX_ANALOG_EXTERNAL_AIN0);
+BUILD_ASSERT(COMP_NRF_LPCOMP_EXTREFSEL_AIN1 == NRFX_ANALOG_EXTERNAL_AIN1);
 #endif
 
 #if (LPCOMP_REFSEL_RESOLUTION == 8)
@@ -129,11 +128,12 @@ static int shim_nrf_lpcomp_pm_callback(const struct device *dev, enum pm_device_
 static int shim_nrf_lpcomp_psel_to_nrf(enum comp_nrf_lpcomp_psel shim,
 				       nrf_lpcomp_input_t *nrf)
 {
-	if (shim >= ARRAY_SIZE(shim_nrf_comp_ain_map)) {
+	nrfx_error_t err = nrfx_lpcomp_input_convert(shim, nrf);
+
+	if (err != NRFX_SUCCESS) {
 		return -EINVAL;
 	}
 
-	*nrf = shim_nrf_comp_ain_map[(uint32_t)shim];
 	return 0;
 }
 #else
@@ -185,11 +185,12 @@ static int shim_nrf_lpcomp_psel_to_nrf(enum comp_nrf_lpcomp_psel shim,
 static int shim_nrf_lpcomp_extrefsel_to_nrf(enum comp_nrf_lpcomp_extrefsel shim,
 					    nrf_lpcomp_ext_ref_t *nrf)
 {
-	if (shim >= ARRAY_SIZE(shim_nrf_comp_ain_map)) {
+	nrfx_error_t err = nrfx_lpcomp_input_convert(shim, nrf);
+
+	if (err != NRFX_SUCCESS) {
 		return -EINVAL;
 	}
 
-	*nrf = shim_nrf_comp_ain_map[shim];
 	return 0;
 }
 #else