[nrf fromlist] drivers: nrf: Replace MDK symbols with new _HAS_ defines

drivers/adc/adc_nrfx_saadc.c

@@ -24,14 +24,14 @@
 	     (NRF_SAADC_AIN5 == NRFX_ANALOG_EXTERNAL_AIN5) &&
 	     (NRF_SAADC_AIN6 == NRFX_ANALOG_EXTERNAL_AIN6) &&
 	     (NRF_SAADC_AIN7 == NRFX_ANALOG_EXTERNAL_AIN7) &&
-#if defined(SAADC_CH_PSELP_PSELP_VDDHDIV5)
+#if NRF_SAADC_HAS_INPUT_VDDHDIV5
 	     (NRF_SAADC_VDDHDIV5 == NRFX_ANALOG_INTERNAL_VDDHDIV5) &&
 #endif
-#if defined(SAADC_CH_PSELP_PSELP_VDD)
+#if NRF_SAADC_HAS_INPUT_VDD
 	     (NRF_SAADC_VDD == NRFX_ANALOG_INTERNAL_VDD) &&
 #endif
 	     1,
 	     "Definitions from nrf-saadc.h do not match those from nrfx_analog_common.h");
 
 struct driver_data {
 	struct adc_context ctx;
@@ -117,42 +117,42 @@
 {
 #if NRF_SAADC_HAS_CH_GAIN
 	switch (gain) {
-#if defined(SAADC_CH_CONFIG_GAIN_Gain1_6)
+#if NRF_SAADC_HAS_GAIN_1_6
 	case ADC_GAIN_1_6:
 		ch_cfg->gain = NRF_SAADC_GAIN1_6;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_GAIN_Gain1_5)
+#if NRF_SAADC_HAS_GAIN_1_5
 	case ADC_GAIN_1_5:
 		ch_cfg->gain = NRF_SAADC_GAIN1_5;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_GAIN_Gain1_4) || defined(SAADC_CH_CONFIG_GAIN_Gain2_8)
+#if NRF_SAADC_HAS_GAIN_1_4
 	case ADC_GAIN_1_4:
 		ch_cfg->gain = NRF_SAADC_GAIN1_4;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_GAIN_Gain2_7)
+#if NRF_SAADC_HAS_GAIN_2_7
 	case ADC_GAIN_2_7:
 		ch_cfg->gain = NRF_SAADC_GAIN2_7;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_GAIN_Gain1_3) || defined(SAADC_CH_CONFIG_GAIN_Gain2_6)
+#if NRF_SAADC_HAS_GAIN_1_3
 	case ADC_GAIN_1_3:
 		ch_cfg->gain = NRF_SAADC_GAIN1_3;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_GAIN_Gain2_5)
+#if NRF_SAADC_HAS_GAIN_2_5
 	case ADC_GAIN_2_5:
 		ch_cfg->gain = NRF_SAADC_GAIN2_5;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_GAIN_Gain1_2) || defined(SAADC_CH_CONFIG_GAIN_Gain2_4)
+#if NRF_SAADC_HAS_GAIN_1_2
 	case ADC_GAIN_1_2:
 		ch_cfg->gain = NRF_SAADC_GAIN1_2;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_GAIN_Gain2_3)
+#if NRF_SAADC_HAS_GAIN_2_3
 	case ADC_GAIN_2_3:
 		ch_cfg->gain = NRF_SAADC_GAIN2_3;
 		break;
@@ -163,15 +163,15 @@
 	case ADC_GAIN_2:
 		ch_cfg->gain = NRF_SAADC_GAIN2;
 		break;
-#if defined(SAADC_CH_CONFIG_GAIN_Gain4)
+#if NRF_SAADC_HAS_GAIN_4
 	case ADC_GAIN_4:
 		ch_cfg->gain = NRF_SAADC_GAIN4;
 		break;
 #endif
 	default:
 #else
 	if (gain != ADC_GAIN_1) {
-#endif /* defined(NRF_SAADC_HAS_CH_GAIN) */
+#endif /* NRF_SAADC_HAS_CH_GAIN */
 		LOG_ERR("Selected ADC gain is not valid");
 		return -EINVAL;
 	}
@@ -182,17 +182,17 @@
 static int reference_set(nrf_saadc_channel_config_t *ch_cfg, enum adc_reference reference)
 {
 	switch (reference) {
-#if defined(SAADC_CH_CONFIG_REFSEL_Internal)
+#if NRF_SAADC_HAS_REFERENCE_INTERNAL
 	case ADC_REF_INTERNAL:
 		ch_cfg->reference = NRF_SAADC_REFERENCE_INTERNAL;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_REFSEL_VDD1_4)
+#if NRF_SAADC_HAS_REFERENCE_VDD4
 	case ADC_REF_VDD_1_4:
 		ch_cfg->reference = NRF_SAADC_REFERENCE_VDD4;
 		break;
 #endif
-#if defined(SAADC_CH_CONFIG_REFSEL_External)
+#if NRF_SAADC_HAS_REFERENCE_EXTERNAL
 	case ADC_REF_EXTERNAL0:
 		ch_cfg->reference = NRF_SAADC_REFERENCE_EXTERNAL;
 		break;

drivers/comparator/comparator_nrf_comp.c

@@ -43,20 +43,6 @@
 
 #define SHIM_NRF_COMP_DT_INST_PSEL(inst) DT_INST_PROP(inst, psel)
 
-#if defined(COMP_HYST_HYST_Hyst40mV)
-#define NRF_COMP_HYST_ENABLED NRF_COMP_HYST_40MV
-#elif defined(COMP_HYST_HYST_Hyst50mV)
-#define NRF_COMP_HYST_ENABLED NRF_COMP_HYST_50MV
-#endif
-
-#define NRF_COMP_HYST_DISABLED NRF_COMP_HYST_NO_HYST
-
-#if defined(NRF_COMP_HYST_ENABLED)
-#define NRF_COMP_HAS_HYST 1
-#else
-#define NRF_COMP_HAS_HYST 0
-#endif
-
 struct shim_nrf_comp_data {
 	uint32_t event_mask;
 	bool started;
@@ -78,47 +64,33 @@
 	     (NRF_COMP_AIN5 == NRFX_ANALOG_EXTERNAL_AIN5) &&
 	     (NRF_COMP_AIN6 == NRFX_ANALOG_EXTERNAL_AIN6) &&
 	     (NRF_COMP_AIN7 == NRFX_ANALOG_EXTERNAL_AIN7) &&
-#if defined(COMP_PSEL_PSEL_VddhDiv5)
+#if NRF_COMP_HAS_VDDH_DIV5
 	     (NRF_COMP_AIN_VDDH_DIV5 == NRFX_ANALOG_INTERNAL_VDDHDIV5) &&
 #endif
-#if defined(COMP_PSEL_PSEL_VddDiv2)
+#if NRF_COMP_HAS_VDD_DIV2
 	     (NRF_COMP_AIN_VDD_DIV2 == NRFX_ANALOG_INTERNAL_VDDDIV2) &&
 #endif
 	     1,
 	     "Definitions from nrf-comp.h do not match those from nrfx_analog_common.h");
 
-#ifndef COMP_MODE_SP_Normal
+#if !NRF_COMP_HAS_SP_MODE_NORMAL
 BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_SP_MODE(0) != COMP_NRF_COMP_SP_MODE_NORMAL);
 #endif
 
-#if NRF_COMP_HAS_ISOURCE
-#ifndef COMP_ISOURCE_ISOURCE_Ien2uA5
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_2UA5);
-#endif
-
-#ifndef COMP_ISOURCE_ISOURCE_Ien5uA
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_5UA);
-#endif
-
-#ifndef COMP_ISOURCE_ISOURCE_Ien10uA
-BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_ISOURCE(0) != COMP_NRF_COMP_ISOURCE_10UA);
-#endif
-#endif
-
 #if SHIM_NRF_COMP_DT_INST_MAIN_MODE_IS_SE(0)
-#ifndef COMP_REFSEL_REFSEL_Int1V8
+#if !NRF_COMP_HAS_REF_INT_1V8
 BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_INT_1V8);
 #endif
 
-#ifndef COMP_REFSEL_REFSEL_Int2V4
+#if !NRF_COMP_HAS_REF_INT_2V4
 BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_INT_2V4);
 #endif
 
-#ifndef COMP_REFSEL_REFSEL_AVDDAO1V8
+#if !NRF_COMP_HAS_REF_AVDDAO1V8
 BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_AVDDAO1V8);
 #endif
 
-#ifndef COMP_REFSEL_REFSEL_VDD
+#if !NRF_COMP_HAS_REF_VDD
 BUILD_ASSERT(SHIM_NRF_COMP_DT_INST_REFSEL(0) != COMP_NRF_COMP_REFSEL_VDD);
 #endif
 #endif
@@ -218,7 +190,7 @@
 		*nrf = NRF_COMP_SP_MODE_LOW;
 		break;
 
-#if defined(COMP_MODE_SP_Normal)
+#if NRF_COMP_HAS_SP_MODE_NORMAL
 	case COMP_NRF_COMP_SP_MODE_NORMAL:
 		*nrf = NRF_COMP_SP_MODE_NORMAL;
 		break;
@@ -237,31 +209,21 @@
 
 #if NRF_COMP_HAS_ISOURCE
 static int shim_nrf_comp_isource_to_nrf(enum comp_nrf_comp_isource shim,
-					nrf_isource_t *nrf)
+					nrf_comp_isource_t *nrf)
 {
 	switch (shim) {
 	case COMP_NRF_COMP_ISOURCE_DISABLED:
 		*nrf = NRF_COMP_ISOURCE_OFF;
 		break;
-
-#if defined(COMP_ISOURCE_ISOURCE_Ien2uA5)
 	case COMP_NRF_COMP_ISOURCE_2UA5:
 		*nrf = NRF_COMP_ISOURCE_IEN_2UA5;
 		break;
-#endif
-
-#if defined(COMP_ISOURCE_ISOURCE_Ien5uA)
 	case COMP_NRF_COMP_ISOURCE_5UA:
 		*nrf = NRF_COMP_ISOURCE_IEN_5UA;
 		break;
-#endif
-
-#if defined(COMP_ISOURCE_ISOURCE_Ien10uA)
 	case COMP_NRF_COMP_ISOURCE_10UA:
 		*nrf = NRF_COMP_ISOURCE_IEN_10UA;
 		break;
-#endif
-
 	default:
 		return -EINVAL;
 	}
@@ -278,25 +240,25 @@
 		*nrf = NRF_COMP_REF_INT_1V2;
 		break;
 
-#if defined(COMP_REFSEL_REFSEL_Int1V8)
+#if NRF_COMP_HAS_REF_INT_1V8
 	case COMP_NRF_COMP_REFSEL_INT_1V8:
 		*nrf = NRF_COMP_REF_INT_1V8;
 		break;
 #endif
 
-#if defined(COMP_REFSEL_REFSEL_Int2V4)
+#if NRF_COMP_HAS_REF_INT_2V4
 	case COMP_NRF_COMP_REFSEL_INT_2V4:
 		*nrf = NRF_COMP_REF_INT_2V4;
 		break;
 #endif
 
-#if defined(COMP_REFSEL_REFSEL_AVDDAO1V8)
+#if NRF_COMP_HAS_REF_AVDDAO1V8
 	case COMP_NRF_COMP_REFSEL_AVDDAO1V8:
 		*nrf = NRF_COMP_REF_AVDDAO1V8;
 		break;
 #endif
 
-#if defined(COMP_REFSEL_REFSEL_VDD)
+#if NRF_COMP_HAS_REF_VDD
 	case COMP_NRF_COMP_REFSEL_VDD:
 		*nrf = NRF_COMP_REF_VDD;
 		break;

drivers/i2s/i2s_nrfx.c

@@ -419,8 +419,7 @@ static int i2s_nrfx_configure(const struct device *dev, enum i2s_dir dir,
 	 * the MCK output is used), find a suitable clock configuration for it.
 	 */
 	if (nrfx_cfg.mode == NRF_I2S_MODE_MASTER ||
-	    (nrf_i2s_mck_pin_get(drv_cfg->i2s.p_reg) & I2S_PSEL_MCK_CONNECT_Msk)
-	    == I2S_PSEL_MCK_CONNECT_Connected << I2S_PSEL_MCK_CONNECT_Pos) {
+	    nrf_i2s_mck_pin_connected_check(drv_cfg->i2s.p_reg)) {
 		find_suitable_clock(drv_cfg, &nrfx_cfg, i2s_cfg);
 		/* Unless the PCLK32M source is used with the HFINT oscillator
 		 * (which is always available without any additional actions),

drivers/serial/uart_nrfx_uarte.c

@@ -694,7 +694,7 @@ static int uarte_nrfx_configure(const struct device *dev,
 	struct uarte_nrfx_data *data = dev->data;
 	nrf_uarte_config_t uarte_cfg;
 
-#if defined(UARTE_CONFIG_STOP_Msk)
+#if NRF_UARTE_HAS_STOP_MODES
 	switch (cfg->stop_bits) {
 	case UART_CFG_STOP_BITS_1:
 		uarte_cfg.stop = NRF_UARTE_STOP_ONE;
@@ -726,7 +726,7 @@ static int uarte_nrfx_configure(const struct device *dev,
 		return -ENOTSUP;
 	}
 
-#if defined(UARTE_CONFIG_PARITYTYPE_Msk)
+#if NRF_UARTE_HAS_PARITY_TYPES
 	uarte_cfg.paritytype = NRF_UARTE_PARITYTYPE_EVEN;
 #endif
 	switch (cfg->parity) {
@@ -736,7 +736,7 @@ static int uarte_nrfx_configure(const struct device *dev,
 	case UART_CFG_PARITY_EVEN:
 		uarte_cfg.parity = NRF_UARTE_PARITY_INCLUDED;
 		break;
-#if defined(UARTE_CONFIG_PARITYTYPE_Msk)
+#if NRF_UARTE_HAS_PARITY_TYPES
 	case UART_CFG_PARITY_ODD:
 		uarte_cfg.parity = NRF_UARTE_PARITY_INCLUDED;
 		uarte_cfg.paritytype = NRF_UARTE_PARITYTYPE_ODD;