drivers: modem: generalize Quectel BG9X support

Replace specific reference for Quectel BG95 in Modem Cellular with
BG9x, since the setup code should apply for other members of this
family.

Rename the 'quectel,bg95' DTS binding to 'quectel,bg9x' and add
optional 'mdm-reset-gpios' property.

To avoid confusion, delete the old 'quectel,bg9x' DTS binding and its
implementation.

Signed-off-by: Guilherme Costa <guilhermecosta@stratioautomotive.com>

Author: guildeol-stra

drivers/modem/Kconfig.cellular

@@ -14,7 +14,7 @@ config MODEM_CELLULAR
 	select NET_L2_PPP_OPTION_MRU
 	select NET_L2_PPP_PAP
 	select NET_L2_PPP_MGMT
-	depends on (DT_HAS_QUECTEL_BG95_ENABLED || DT_HAS_SIMCOM_A76XX_ENABLED || \
+	depends on (DT_HAS_QUECTEL_BG9X_ENABLED || DT_HAS_SIMCOM_A76XX_ENABLED || \
 		    DT_HAS_SIMCOM_SIM7080_ENABLED || DT_HAS_U_BLOX_SARA_R4_ENABLED || \
 		    DT_HAS_U_BLOX_SARA_R5_ENABLED || DT_HAS_SWIR_HL7800_ENABLED || \
 		    DT_HAS_TELIT_ME910G1_ENABLED || DT_HAS_TELIT_ME310G1_ENABLED || \

drivers/modem/modem_cellular.c

@@ -1939,8 +1939,8 @@ static int modem_cellular_init(const struct device *dev)
  * dial out and put the DLCI channel into data mode.
  */
 
-#if DT_HAS_COMPAT_STATUS_OKAY(quectel_bg95)
-MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_init_chat_script_cmds,
+#if DT_HAS_COMPAT_STATUS_OKAY(quectel_bg9x)
+MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg9x_init_chat_script_cmds,
 			      MODEM_CHAT_SCRIPT_CMD_RESP("ATE0", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CFUN=4", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CMEE=1", ok_match),
@@ -1964,27 +1964,27 @@ MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_init_chat_script_cmds,
 			      MODEM_CHAT_SCRIPT_CMD_RESP("", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT+CMUX=0,0,5,127", 300));
 
-MODEM_CHAT_SCRIPT_DEFINE(quectel_bg95_init_chat_script, quectel_bg95_init_chat_script_cmds,
+MODEM_CHAT_SCRIPT_DEFINE(quectel_bg9x_init_chat_script, quectel_bg9x_init_chat_script_cmds,
 			 abort_matches, modem_cellular_chat_callback_handler, 10);
 
-MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_dial_chat_script_cmds,
+MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg9x_dial_chat_script_cmds,
 			      MODEM_CHAT_SCRIPT_CMD_RESP_MULT("AT+CGACT=0,1", allow_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CGDCONT=1,\"IP\","
 							 "\""CONFIG_MODEM_CELLULAR_APN"\"",
 							 ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CFUN=1", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("ATD*99***1#", connect_match));
 
-MODEM_CHAT_SCRIPT_DEFINE(quectel_bg95_dial_chat_script, quectel_bg95_dial_chat_script_cmds,
+MODEM_CHAT_SCRIPT_DEFINE(quectel_bg9x_dial_chat_script, quectel_bg9x_dial_chat_script_cmds,
 			 dial_abort_matches, modem_cellular_chat_callback_handler, 10);
 
-MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_periodic_chat_script_cmds,
+MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg9x_periodic_chat_script_cmds,
 			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CREG?", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CEREG?", ok_match),
 			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CGREG?", ok_match));
 
-MODEM_CHAT_SCRIPT_DEFINE(quectel_bg95_periodic_chat_script,
-			 quectel_bg95_periodic_chat_script_cmds, abort_matches,
+MODEM_CHAT_SCRIPT_DEFINE(quectel_bg9x_periodic_chat_script,
+			 quectel_bg9x_periodic_chat_script_cmds, abort_matches,
 			 modem_cellular_chat_callback_handler, 4);
 #endif
 
@@ -2652,7 +2652,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
 			      &MODEM_CELLULAR_INST_NAME(config, inst), POST_KERNEL, 99,            \
 			      &modem_cellular_api);
 
-#define MODEM_CELLULAR_DEVICE_QUECTEL_BG95(inst)                                                   \
+#define MODEM_CELLULAR_DEVICE_QUECTEL_BG9X(inst)                                                   \
 	MODEM_PPP_DEFINE(MODEM_CELLULAR_INST_NAME(ppp, inst), NULL, 98, 1500, 64);                 \
                                                                                                    \
 	static struct modem_cellular_data MODEM_CELLULAR_INST_NAME(data, inst) = {                 \
@@ -2667,9 +2667,9 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
                                                                                                    \
 	MODEM_CELLULAR_DEFINE_INSTANCE(inst, 1500, 100, 10000, 5000, false,                        \
 				       NULL,                                                       \
-				       &quectel_bg95_init_chat_script,                             \
-				       &quectel_bg95_dial_chat_script,                             \
-				       &quectel_bg95_periodic_chat_script, NULL)
+				       &quectel_bg9x_init_chat_script,                             \
+				       &quectel_bg9x_dial_chat_script,                             \
+				       &quectel_bg9x_periodic_chat_script, NULL)
 
 #define MODEM_CELLULAR_DEVICE_QUECTEL_EG25_G(inst)                                                 \
 	MODEM_PPP_DEFINE(MODEM_CELLULAR_INST_NAME(ppp, inst), NULL, 98, 1500, 64);                 \
@@ -2899,8 +2899,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
 				       &sqn_gm02s_dial_chat_script,                                \
 				       &sqn_gm02s_periodic_chat_script, NULL)
 
-#define DT_DRV_COMPAT quectel_bg95
-DT_INST_FOREACH_STATUS_OKAY(MODEM_CELLULAR_DEVICE_QUECTEL_BG95)
+#define DT_DRV_COMPAT quectel_bg9x
+DT_INST_FOREACH_STATUS_OKAY(MODEM_CELLULAR_DEVICE_QUECTEL_BG9X)
 #undef DT_DRV_COMPAT
 
 #define DT_DRV_COMPAT quectel_eg25_g

drivers/modem/quectel-bg9x.h

@@ -1,7 +1,7 @@
-# Copyright (c) 2020 Analog Life LLC
+# Copyright (c) 2023 Bjarki Arge Andreasen
 # SPDX-License-Identifier: Apache-2.0
 
-description: quectel BG9x modem
+description: Quectel BG9X modems
 
 compatible: "quectel,bg9x"
 
@@ -10,13 +10,6 @@ include: uart-device.yaml
 properties:
   mdm-power-gpios:
     type: phandle-array
-    required: true
 
   mdm-reset-gpios:
     type: phandle-array
-
-  mdm-dtr-gpios:
-    type: phandle-array
-
-  mdm-wdisable-gpios:
-    type: phandle-array