Commit 40a44c21 authored by Bjarki Arge Andreasen's avatar Bjarki Arge Andreasen Committed by Carles Cufi
Browse files

drivers: modem: modem_cellular: Remove support for gsm_ppp 



The new modem_cellular driver had support for the deprecated
generic zephyr,gsm-ppp dts compatible for backwards compatibility.

zephyr,gsm-ppp is being removed, and as such, modem_cellular.c
no longer needs to support it.

Signed-off-by: default avatarBjarki Arge Andreasen <bjarki@arge-andreasen.me>
parent b0a9ae26

drivers/modem/Kconfig.cellular

+2 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ config MODEM_CELLULAR 
	select RING_BUFFER

	select NET_L2_PPP_OPTION_MRU

	select NET_L2_PPP_PAP

	depends on (DT_HAS_QUECTEL_BG95_ENABLED || DT_HAS_ZEPHYR_GSM_PPP_ENABLED || \

	depends on (DT_HAS_QUECTEL_BG95_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_QUECTEL_EG25_G_ENABLED || \
@@ -21,8 +21,7 @@ config MODEM_CELLULAR 
	  This driver uses the generic 3gpp AT commands, along

	  with the standard protocols CMUX and PPP, to configure

	  cellular modems to establish a point-to-point

	  network connection. It is a plug-in replacement for the

	  existing GSM_PPP driver, and a template for tailored

	  network connection. It is a template for tailored

	  drivers for the ublox, quectel and other modems, which

	  include power management and more complex device specific

	  features.

drivers/modem/modem_cellular.c

+0 −84
Original line number Diff line number Diff line
@@ -1698,57 +1698,6 @@ MODEM_CHAT_SCRIPT_DEFINE(quectel_eg25_g_periodic_chat_script, 
			 modem_cellular_chat_callback_handler, 4);

#endif



#if DT_HAS_COMPAT_STATUS_OKAY(zephyr_gsm_ppp)

MODEM_CHAT_SCRIPT_CMDS_DEFINE(zephyr_gsm_ppp_init_chat_script_cmds,

			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),

			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),

			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),

			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),

			      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),

			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CREG=1", ok_match),

			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CGREG=1", ok_match),

			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CEREG=1", ok_match),

			      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_CMD_RESP("AT+CGSN", imei_match),

			      MODEM_CHAT_SCRIPT_CMD_RESP("", ok_match),

			      MODEM_CHAT_SCRIPT_CMD_RESP("AT+CGMM", cgmm_match),

			      MODEM_CHAT_SCRIPT_CMD_RESP("", ok_match),

			      /* The 300ms delay after sending the AT+CMUX command is required

			       * for some modems to ensure they get enough time to enter CMUX

			       * mode before sending the first CMUX command. If this delay is

			       * too short, modems have been observed to simply deadlock,

			       * refusing to respond to any CMUX command.

			       */

			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT+CMUX=0,0,5,127", 300));



MODEM_CHAT_SCRIPT_DEFINE(zephyr_gsm_ppp_init_chat_script, zephyr_gsm_ppp_init_chat_script_cmds,

			 abort_matches, modem_cellular_chat_callback_handler, 10);



MODEM_CHAT_SCRIPT_CMDS_DEFINE(zephyr_gsm_ppp_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_NONE("ATD*99***1#", 0),);



MODEM_CHAT_SCRIPT_DEFINE(zephyr_gsm_ppp_dial_chat_script, zephyr_gsm_ppp_dial_chat_script_cmds,

			 dial_abort_matches, modem_cellular_chat_callback_handler, 10);



MODEM_CHAT_SCRIPT_CMDS_DEFINE(zephyr_gsm_ppp_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(zephyr_gsm_ppp_periodic_chat_script,

			 zephyr_gsm_ppp_periodic_chat_script_cmds, abort_matches,

			 modem_cellular_chat_callback_handler, 4);

#endif



#if DT_HAS_COMPAT_STATUS_OKAY(simcom_sim7080)

MODEM_CHAT_SCRIPT_CMDS_DEFINE(simcom_sim7080_init_chat_script_cmds,

			      MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT", 100),
@@ -2138,35 +2087,6 @@ 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_GSM_PPP(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) = {                 \

		.chat_delimiter = "\r",                                                            \

		.chat_filter = "\n",                                                               \

		.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst),                                       \

	};                                                                                         \

                                                                                                   \

	static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = {       \

		.uart = DEVICE_DT_GET(DT_INST_BUS(inst)),                                          \

		.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}),                 \

		.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}),                 \

		.power_pulse_duration_ms = 1500,                                                   \

		.reset_pulse_duration_ms = 100,                                                    \

		.startup_time_ms = 10000,                                                          \

		.shutdown_time_ms = 5000,                                                          \

		.init_chat_script = &zephyr_gsm_ppp_init_chat_script,                              \

		.dial_chat_script = &zephyr_gsm_ppp_dial_chat_script,                              \

		.periodic_chat_script = &zephyr_gsm_ppp_periodic_chat_script,                      \

	};                                                                                         \

                                                                                                   \

	PM_DEVICE_DT_INST_DEFINE(inst, modem_cellular_pm_action);                                  \

                                                                                                   \

	DEVICE_DT_INST_DEFINE(inst, modem_cellular_init, PM_DEVICE_DT_INST_GET(inst),              \

			      &MODEM_CELLULAR_INST_NAME(data, inst),                               \

			      &MODEM_CELLULAR_INST_NAME(config, inst), POST_KERNEL, 99,            \

			      &modem_cellular_api);



#define MODEM_CELLULAR_DEVICE_SIMCOM_SIM7080(inst)                                                 \

	MODEM_PPP_DEFINE(MODEM_CELLULAR_INST_NAME(ppp, inst), NULL, 98, 1500, 64);                 \

                                                                                                   \
@@ -2379,10 +2299,6 @@ DT_INST_FOREACH_STATUS_OKAY(MODEM_CELLULAR_DEVICE_QUECTEL_BG95) 
DT_INST_FOREACH_STATUS_OKAY(MODEM_CELLULAR_DEVICE_QUECTEL_EG25_G)

#undef DT_DRV_COMPAT



#define DT_DRV_COMPAT zephyr_gsm_ppp

DT_INST_FOREACH_STATUS_OKAY(MODEM_CELLULAR_DEVICE_GSM_PPP)

#undef DT_DRV_COMPAT



#define DT_DRV_COMPAT simcom_sim7080

DT_INST_FOREACH_STATUS_OKAY(MODEM_CELLULAR_DEVICE_SIMCOM_SIM7080)

#undef DT_DRV_COMPAT

CRA Git | Maintained and supported by SUSTech CRA and CCSE